commit 93e85d4eb4581711174844d96d3b7d66728a8b41
author Ramkumar Radhakrishnan <ramkumar@codeaurora.org> Mon Sep 30 20:24:58 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jun 17 11:48:58 2020 -0700
tree eb884951ed7fb8efd89d22455da68545aec86bc2
parent fd3f462d0c5dc7ad31cda7090398c55a800d4c73

sdm: Handle vsync enable after resetting pending doze

Change-Id: I3a3fda820d25758b0dabf1cc1b621ff1d336a4d1

sdm/libs/core/display_base.cpp

diff --git a/sdm/libs/core/display_base.cpp b/sdm/libs/core/display_base.cpp
index 4284f2e..bbc7fd5 100755
--- a/sdm/libs/core/display_base.cpp
+++ b/sdm/libs/core/display_base.cpp
@@ -433,7 +433,11 @@
     safe_mode_in_fast_path_ = false;
   }
 
-  DLOGI_IF(kTagDisplay, "Exiting commit for display: %d-%d", display_id_, display_type_);
+  // Reset pending doze if any after the commit
+  error = ResetPendingDoze(layer_stack->retire_fence_fd);
+  if (error != kErrorNone) {
+    return error;
+  }
 
   // Handle pending vsync enable if any after the commit
   error = HandlePendingVSyncEnable(layer_stack->retire_fence_fd);
@@ -441,11 +445,6 @@
     return error;
   }
 
-  // Reset pending vsync enable if any after the commit
-  error = ResetPendingDoze(layer_stack->retire_fence_fd);
-  if (error != kErrorNone) {
-    return error;
-  }
 
   DLOGI_IF(kTagDisplay, "Exiting commit for display: %d-%d", display_id_, display_type_);