commit 2e1a9c5913862e0bcafa54e6dcd90003504141a3
author android-build-team Robot <android-build-team-robot@google.com> Sat Aug 03 23:19:18 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Aug 03 23:19:18 2019 +0000
tree 0e214f737b08402b703c61b423c4cba9932ba991
parent b593d86604ad5f5b7f3793d3ad968578f665d8ee
parent c694da71c6c916c354bbea888f08a339d553f5e4

Snap for 5778794 from c694da71c6c916c354bbea888f08a339d553f5e4 to qt-qpr1-release

Change-Id: I88cba41df6b503ad4413c8b0bb2af554b44db9cf

sdm/libs/core/display_base.cpp

diff --git a/sdm/libs/core/display_base.cpp b/sdm/libs/core/display_base.cpp
index e6e936b..0c7830b 100755
--- a/sdm/libs/core/display_base.cpp
+++ b/sdm/libs/core/display_base.cpp
@@ -1749,7 +1749,7 @@
         pt.transfer = Transfer_sRGB;
         supported_pt->push_back(pt);
       } else if (pt.primaries == ColorPrimaries_DCIP3) {
-        pt.transfer = Transfer_Gamma2_2;
+        pt.transfer = Transfer_sRGB;
         supported_pt->push_back(pt);
       } else if (pt.primaries == ColorPrimaries_BT2020) {
         pt.transfer = Transfer_SMPTE_ST2084;
@@ -1851,7 +1851,7 @@
     }
   } else if (color_gamut == kDcip3) {
     pt.primaries = GetColorPrimariesFromAttribute(color_gamut);
-    pt.transfer = Transfer_Gamma2_2;
+    pt.transfer = Transfer_sRGB;
   }
 
   return pt;

sdm/libs/core/display_builtin.cpp

diff --git a/sdm/libs/core/display_builtin.cpp b/sdm/libs/core/display_builtin.cpp
index 26f336b..6802d8d 100644
--- a/sdm/libs/core/display_builtin.cpp
+++ b/sdm/libs/core/display_builtin.cpp
@@ -320,6 +320,15 @@
   return DisplayBase::SetActiveConfig(index);
 }
 
+DisplayError DisplayBuiltIn::GetActiveConfig(uint32_t *index) {
+  lock_guard<recursive_mutex> obj(recursive_mutex_);
+  if (index && pendingActiveConfig != UINT_MAX) {
+    *index = pendingActiveConfig;
+    return kErrorNone;
+  }
+  return DisplayBase::GetActiveConfig(index);
+}
+
 void DisplayBuiltIn::SetIdleTimeoutMs(uint32_t active_ms) {
   lock_guard<recursive_mutex> obj(recursive_mutex_);
   comp_manager_->SetIdleTimeoutMs(display_comp_ctx_, active_ms);

sdm/libs/core/display_builtin.h

diff --git a/sdm/libs/core/display_builtin.h b/sdm/libs/core/display_builtin.h
index 65d72c1..7647eb7 100644
--- a/sdm/libs/core/display_builtin.h
+++ b/sdm/libs/core/display_builtin.h
@@ -106,6 +106,7 @@
   virtual DisplayError SetDisplayState(DisplayState state, bool teardown,
                                        int *release_fence);
   virtual DisplayError SetActiveConfig(uint32_t index) override;
+  virtual DisplayError GetActiveConfig(uint32_t *index) override;
   virtual void SetIdleTimeoutMs(uint32_t active_ms);
   virtual DisplayError SetDisplayMode(uint32_t mode);
   virtual DisplayError GetRefreshRateRange(uint32_t *min_refresh_rate, uint32_t *max_refresh_rate);