Merge "sdm: Set connector mode on power off"

This commit is contained in:
Linux Build Service Account
2018-04-18 10:52:44 -07:00
committed by Gerrit - the friendly Code Review server
2 changed files with 6 additions and 0 deletions

View File

@@ -740,6 +740,8 @@ DisplayError HWDeviceDRM::PowerOff() {
}
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 */);

View File

@@ -1993,6 +1993,10 @@ int HWCDisplay::SetActiveDisplayConfig(uint32_t config) {
}
int HWCDisplay::GetActiveDisplayConfig(uint32_t *config) {
if (config_pending_) {
*config = display_config_;
return 0;
}
return display_intf_->GetActiveConfig(config) == kErrorNone ? 0 : -1;
}