commit 5107d2b2b82489fdf44b2511815de211cea5dd55
author qctecmdr <qctecmdr@localhost> Sat Oct 22 17:38:33 2022 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Oct 22 17:38:33 2022 -0700
tree 908fa7cb3b3af76db94eb43065f0d5e3dd664b99
parent 55a8b7ed004da493db1c9713da4d1921e2214bde
parent f358be4333394e153dd9bbf9f6076f9dfe1d7278

Merge "config: Treat SMPTE_170M as SRGB"

sdm/libs/core/display_base.cpp

diff --git a/sdm/libs/core/display_base.cpp b/sdm/libs/core/display_base.cpp
index 0d182fe..6cc9c55 100644
--- a/sdm/libs/core/display_base.cpp
+++ b/sdm/libs/core/display_base.cpp
@@ -1796,6 +1796,7 @@
   if (state == state_) {
     if (pending_power_state_ != kPowerStateNone) {
       hw_intf_->CancelDeferredPowerMode();
+      pending_power_state_ = kPowerStateNone;
     }
     DLOGI("Same state transition is requested.");
     return kErrorNone;
@@ -1835,6 +1836,8 @@
       hw_events_intf_->SetEventState(HWEvent::POWER_EVENT, true);
     }
 
+    cached_qos_data_.clock_hz =
+      std::max(cached_qos_data_.clock_hz, disp_layer_stack_.info.qos_data.clock_hz);
     error = hw_intf_->PowerOn(cached_qos_data_, &sync_points);
     if (error != kErrorNone) {
       if (error == kErrorDeferred) {