commit 6942695deae96fb9c2b6caee657fdf892132f6ad
author qctecmdr <qctecmdr@localhost> Wed Dec 04 01:38:42 2019 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Dec 04 01:38:42 2019 -0800
tree f2e8a44472c602957846d50d8d52b610fd33325b
parent 7ea010a6bf76659e8e3614dc7290ddcbbb79a25c
parent b4963c3fb1db70e0afe332e4efef1746cd78af0c

Merge " sdm: do resource_impl stop before resource_impl postcommit"

sdm/libs/core/comp_manager.cpp

diff --git a/sdm/libs/core/comp_manager.cpp b/sdm/libs/core/comp_manager.cpp
index 1bd6862..694bdc5 100644
--- a/sdm/libs/core/comp_manager.cpp
+++ b/sdm/libs/core/comp_manager.cpp
@@ -411,6 +411,12 @@
   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;
@@ -419,14 +425,11 @@
   display_comp_ctx->idle_fallback = false;
   display_comp_ctx->first_cycle_ = false;
 
-  Handle &display_resource_ctx = display_comp_ctx->display_resource_ctx;
-  error = resource_intf_->Stop(display_resource_ctx, hw_layers);
-
   DLOGV_IF(kTagCompManager, "Registered displays [%s], display %d-%d",
            StringDisplayList(registered_displays_), display_comp_ctx->display_id,
            display_comp_ctx->display_type);
 
-  return error;
+  return kErrorNone;
 }
 
 void CompManager::Purge(Handle display_ctx) {