commit 42505b8808ceabdd7e0e2ef35599353ae6943c47
author Linux Build Service Account <lnxbuild@localhost> Mon Nov 21 08:10:02 2022 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Nov 21 08:10:02 2022 -0800
tree 0923cb7aa8247395715d46dd8a533aa75389e276
parent 7ab8663fecb3bea5f52805f934c62cafae04224b
parent 24b386de79270504467a721ee6da46daac591eb4

Merge "sdm: Teardown CWB during power off sequence for external display" into display.lnx.9.0.r1-rel

sdm/libs/dal/hw_tv_drm.cpp

diff --git a/sdm/libs/dal/hw_tv_drm.cpp b/sdm/libs/dal/hw_tv_drm.cpp
index ccafa85..7cc72da 100644
--- a/sdm/libs/dal/hw_tv_drm.cpp
+++ b/sdm/libs/dal/hw_tv_drm.cpp
@@ -257,6 +257,12 @@
     // LP connecter prop N/A for External
     drm_atomic_intf_->Perform(DRMOps::CRTC_SET_ACTIVE, token_.crtc_id, 0);
   }
+
+  if (cwb_config_.cwb_disp_id == display_id_ && cwb_config_.enabled) {
+    drm_atomic_intf_->Perform(DRMOps::CONNECTOR_SET_CRTC, cwb_config_.token.conn_id, 0);
+    DLOGI("Teardown CWB on %d-%d", display_id_, disp_type_);
+  }
+
   ClearSolidfillStages();
   int ret = drm_atomic_intf_->Commit(true /* synchronous */, false /* retain_planes*/);
   if (ret) {