diff options
| author | Pradosh Das <prados@codeaurora.org> | 2020-11-10 11:50:13 +0530 |
|---|---|---|
| committer | Pradosh Das <prados@codeaurora.org> | 2020-11-10 11:50:13 +0530 |
| commit | ea697e202615e65388ff913138b57138e04f61b2 (patch) | |
| tree | 0937e8cf0952aa16137d4e4574da8c0e91d77e6e | |
| parent | f6295ca4f216a64f7a03a687313a66e71d6093f1 (diff) | |
| parent | 6e63dd4ba77b2dd68f3d0e0217592f29d406a840 (diff) | |
Merge commit '6e63dd4ba77b2dd68f3d0e0217592f29d406a840' into HEAD
Change-Id: I04d8277e8bca0cb6b687114a59976715abfa0047
| -rw-r--r-- | config/display-product.mk | 11 | ||||
| -rw-r--r-- | sdm/libs/core/drm/hw_device_drm.cpp | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/config/display-product.mk b/config/display-product.mk index 6840d77c..7d65408d 100644 --- a/config/display-product.mk +++ b/config/display-product.mk @@ -107,13 +107,20 @@ PRODUCT_PROPERTY_OVERRIDES += \ vendor.display.enable_optimize_refresh=1 \ vendor.display.disable_ui_3d_tonemap=1 -#Set WCG properties ifeq ($(TARGET_BOARD_PLATFORM), msmnile) +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.protected_contents=true +endif + +#Set WCG properties +ifeq ($(TARGET_BOARD_PLATFORM),$(TRINKET)) +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.has_wide_color_display=false +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.has_HDR_display=false +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_color_management=false +else PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.has_wide_color_display=true PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.has_HDR_display=true PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_color_management=true PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.wcg_composition_dataspace=143261696 -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.protected_contents=true endif PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.force_hwc_copy_for_virtual_displays=true diff --git a/sdm/libs/core/drm/hw_device_drm.cpp b/sdm/libs/core/drm/hw_device_drm.cpp index da5c2710..d1b6ae3f 100644 --- a/sdm/libs/core/drm/hw_device_drm.cpp +++ b/sdm/libs/core/drm/hw_device_drm.cpp @@ -350,6 +350,7 @@ int HWDeviceDRM::Registry::CreateFbId(LayerBuffer *buffer, uint32_t *fb_id) { void HWDeviceDRM::Registry::MapBufferToFbId(Layer* layer, LayerBuffer* buffer) { if (buffer->planes[0].fd < 0) { + layer->buffer_map->buffer_map.clear(); return; } |