commit a594adf428f4e5fed4f785935c5ae857c99e841a
author qctecmdr <qctecmdr@localhost> Sun Nov 24 17:40:36 2019 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Nov 24 17:40:36 2019 -0800
tree 772c5db822e000a652e44e539833ec6cb1dd928d
parent ceb6ff430e64b30f3d3c3c4b0f23846ecb6096ba
parent 2ebb5290f558e35d717e78d47730c60e0abd1ba8

Merge "sdm: Move resource_impl stop from prepare to postcommit"

sdm/libs/core/comp_manager.cpp

diff --git a/sdm/libs/core/comp_manager.cpp b/sdm/libs/core/comp_manager.cpp
index 45afb9c..1bd6862 100644
--- a/sdm/libs/core/comp_manager.cpp
+++ b/sdm/libs/core/comp_manager.cpp
@@ -350,8 +350,6 @@
     return error;
   }
 
-  error = resource_intf_->Stop(display_resource_ctx, hw_layers);
-
   return error;
 }
 
@@ -421,11 +419,14 @@
   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 kErrorNone;
+  return error;
 }
 
 void CompManager::Purge(Handle display_ctx) {