commit f55e0c26fd321d141489cf646042b79aaa073e94
author Gousemoodhin Nadaf <gnadaf@codeaurora.org> Wed Jul 18 22:21:32 2018 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Aug 07 02:08:53 2018 -0700
tree ff5795525109b6f9c9e4a0a5a06b3c0457277063
parent 5540dbc283f36d817ca50c1245ba9ede3590fdab

sdm: Handle extended range layer.

- Mark extended range layer as skip because it is not supported.
- Remove unused NeedsHdrHandling() and NeedsGpuFallback().

Change-Id: I70132bae87d33f0136ec7ea321215b40e30b8c5d
CRs-Fixed: 2287998

sdm/libs/core/display_base.cpp

diff --git a/sdm/libs/core/display_base.cpp b/sdm/libs/core/display_base.cpp
index 9152616..23fe131 100644
--- a/sdm/libs/core/display_base.cpp
+++ b/sdm/libs/core/display_base.cpp
@@ -204,9 +204,6 @@
       break;
     }
     hw_layers_info.app_layer_count++;
-    if (!gpu_fallback_) {
-      gpu_fallback_ = NeedsGpuFallback(layer);
-    }
     if (IsWideColor(layer->input_buffer.color_metadata.colorPrimaries)) {
       hw_layers_info.wide_color_primaries.push_back(
           layer->input_buffer.color_metadata.colorPrimaries);
@@ -273,7 +270,6 @@
   lock_guard<recursive_mutex> obj(recursive_mutex_);
   DisplayError error = kErrorNone;
   needs_validate_ = true;
-  gpu_fallback_ = false;
 
   if (!active_) {
     return kErrorPermission;
@@ -1640,28 +1636,6 @@
     num_color_modes_ = 0;
 }
 
-bool DisplayBase::NeedsGpuFallback(const Layer *layer) {
-  const LayerBufferFormat &format = layer->input_buffer.format;
-  const ColorRange &range = layer->input_buffer.color_metadata.range;
-
-  if (format == kFormatInvalid || range == Range_Extended) {
-    DLOGV_IF(kTagDisplay, "Format = %d Range = %d", format, range);
-    // when there is invalid format or extended range fall back to GPU
-    return true;
-  }
-
-  return false;
-}
-
-bool DisplayBase::NeedsHdrHandling() {
-  if (display_type_ != kBuiltIn || !num_color_modes_ || gpu_fallback_) {
-    // No HDR Handling for non-primary displays or when color modes are not present or
-    // if frame is falling back to GPU
-    return false;
-  }
-  return true;
-}
-
 void DisplayBase::GetColorPrimaryTransferFromAttributes(const AttrVal &attr,
     std::vector<PrimariesTransfer> *supported_pt) {
   std::string attribute_field = {};

sdm/libs/core/display_base.h

diff --git a/sdm/libs/core/display_base.h b/sdm/libs/core/display_base.h
index d6d5f15..0f77ca5 100644
--- a/sdm/libs/core/display_base.h
+++ b/sdm/libs/core/display_base.h
@@ -153,8 +153,6 @@
   DisplayState GetLastPowerMode();
   void SetPUonDestScaler();
   void ClearColorInfo();
-  bool NeedsGpuFallback(const Layer *layer);
-  bool NeedsHdrHandling();
   void GetColorPrimaryTransferFromAttributes(const AttrVal &attr,
       std::vector<PrimariesTransfer> *supported_pt);
   bool DisplayPowerResetPending();
@@ -207,7 +205,6 @@
   std::string current_color_mode_ = "hal_native";
   int disable_hdr_lut_gen_ = 0;
   DisplayState last_power_mode_ = kStateOff;
-  bool gpu_fallback_ = false;
   bool hw_recovery_logs_captured_ = false;
   int disable_hw_recovery_dump_ = 0;
   HWQosData default_qos_data_;

sdm/libs/hwc2/hwc_layers.cpp

diff --git a/sdm/libs/hwc2/hwc_layers.cpp b/sdm/libs/hwc2/hwc_layers.cpp
index b4b3e34..13c3f8d 100644
--- a/sdm/libs/hwc2/hwc_layers.cpp
+++ b/sdm/libs/hwc2/hwc_layers.cpp
@@ -135,7 +135,7 @@
       break;
     case HAL_DATASPACE_RANGE_EXTENDED:
       *color_range = Range_Extended;
-      break;
+      return false;
     default:
       DLOGW_IF(kTagClient, "Unsupported Range Request = %d", range);
       return false;