commit fce408e4f8e38a613fb57c9526b75fdb5dd8f2d2
author Linux Build Service Account <lnxbuild@localhost> Wed Apr 18 10:52:44 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Apr 18 10:52:44 2018 -0700
tree fa7cf5d4c61d8aa3ceec7179ee62a0eeadd007a5
parent 3019f2409d1c944d8b340a95eb81aee14cd8fabc
parent b8cce97295e4bfb36b3e1805cac872004d47217e

Merge "sdm: Set connector mode on power off"

sdm/libs/core/drm/hw_device_drm.cpp

diff --git a/sdm/libs/core/drm/hw_device_drm.cpp b/sdm/libs/core/drm/hw_device_drm.cpp
index 14d0064..e90a782 100644
--- a/sdm/libs/core/drm/hw_device_drm.cpp
+++ b/sdm/libs/core/drm/hw_device_drm.cpp
@@ -740,6 +740,8 @@
   }
 
   SetFullROI();
+  drmModeModeInfo current_mode = connector_info_.modes[current_mode_index_].mode;
+  drm_atomic_intf_->Perform(DRMOps::CRTC_SET_MODE, token_.crtc_id, &current_mode);
   drm_atomic_intf_->Perform(DRMOps::CONNECTOR_SET_POWER_MODE, token_.conn_id, DRMPowerMode::OFF);
   drm_atomic_intf_->Perform(DRMOps::CRTC_SET_ACTIVE, token_.crtc_id, 0);
   int ret = drm_atomic_intf_->Commit(true /* synchronous */, false /* retain_planes */);

sdm/libs/hwc2/hwc_display.cpp

diff --git a/sdm/libs/hwc2/hwc_display.cpp b/sdm/libs/hwc2/hwc_display.cpp
index d54d898..dd049de 100644
--- a/sdm/libs/hwc2/hwc_display.cpp
+++ b/sdm/libs/hwc2/hwc_display.cpp
@@ -1993,6 +1993,10 @@
 }
 
 int HWCDisplay::GetActiveDisplayConfig(uint32_t *config) {
+  if (config_pending_) {
+    *config = display_config_;
+    return 0;
+  }
   return display_intf_->GetActiveConfig(config) == kErrorNone ? 0 : -1;
 }