Merge 77244586f135b83ec785f663caf9366f5acf7ca0 on remote branch

Change-Id: Ib9ba03bdeb20d40ea4e2169f205109f20d2c8ee8

1 files changed, 4 insertions, 6 deletions

diff --git a/sdm/libs/core/comp_manager.cpp b/sdm/libs/core/comp_manager.cpp
index c36d88fe..814482e5 100644
--- a/sdm/libs/core/comp_manager.cpp
+++ b/sdm/libs/core/comp_manager.cpp
@@ -344,6 +344,10 @@ DisplayError CompManager::Prepare(Handle display_ctx, HWLayers *hw_layers) {
     return error;
   }
 
+  error = resource_intf_->Stop(display_resource_ctx, hw_layers);
+  if (error != kErrorNone) {
+    DLOGE("Resource stop failed for display = %d", display_comp_ctx->display_type);
+  }
   return error;
 }
 
@@ -405,12 +409,6 @@ DisplayError CompManager::PostCommit(Handle display_ctx, HWLayers *hw_layers) {
   DisplayCompositionContext *display_comp_ctx =
                              reinterpret_cast<DisplayCompositionContext *>(display_ctx);
 
-  Handle &display_resource_ctx = display_comp_ctx->display_resource_ctx;
-  error = resource_intf_->Stop(display_resource_ctx, hw_layers);
-  if (error != kErrorNone) {
-    DLOGE("Resource stop failed for display = %d", display_comp_ctx->display_type);
-  }
-
   error = resource_intf_->PostCommit(display_comp_ctx->display_resource_ctx, hw_layers);
   if (error != kErrorNone) {
     return error;