Merge "sdm: Set connector mode on power off"
This commit is contained in:
committed by
Gerrit - the friendly Code Review server
commit
fce408e4f8
@@ -740,6 +740,8 @@ DisplayError HWDeviceDRM::PowerOff() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
SetFullROI();
|
SetFullROI();
|
||||||
|
drmModeModeInfo current_mode = connector_info_.modes[current_mode_index_].mode;
|
||||||
|
drm_atomic_intf_->Perform(DRMOps::CRTC_SET_MODE, token_.crtc_id, ¤t_mode);
|
||||||
drm_atomic_intf_->Perform(DRMOps::CONNECTOR_SET_POWER_MODE, token_.conn_id, DRMPowerMode::OFF);
|
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);
|
drm_atomic_intf_->Perform(DRMOps::CRTC_SET_ACTIVE, token_.crtc_id, 0);
|
||||||
int ret = drm_atomic_intf_->Commit(true /* synchronous */, false /* retain_planes */);
|
int ret = drm_atomic_intf_->Commit(true /* synchronous */, false /* retain_planes */);
|
||||||
|
|||||||
@@ -1993,6 +1993,10 @@ int HWCDisplay::SetActiveDisplayConfig(uint32_t config) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
int HWCDisplay::GetActiveDisplayConfig(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;
|
return display_intf_->GetActiveConfig(config) == kErrorNone ? 0 : -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user