Merge "sdm: Avoid Connector and CRTC settings"

This commit is contained in:
Linux Build Service Account
2017-05-22 11:47:01 -07:00
committed by Gerrit - the friendly Code Review server

View File

@@ -562,14 +562,18 @@ DisplayError HWDeviceDRM::GetConfigIndex(uint32_t mode, uint32_t *index) {
DisplayError HWDeviceDRM::PowerOn() { DisplayError HWDeviceDRM::PowerOn() {
DTRACE_SCOPED(); DTRACE_SCOPED();
/*
drm_atomic_intf_->Perform(DRMOps::CRTC_SET_ACTIVE, token_.crtc_id, 1); drm_atomic_intf_->Perform(DRMOps::CRTC_SET_ACTIVE, token_.crtc_id, 1);
drm_atomic_intf_->Perform(DRMOps::CONNECTOR_SET_POWER_MODE, token_.conn_id, DRMPowerMode::ON); drm_atomic_intf_->Perform(DRMOps::CONNECTOR_SET_POWER_MODE, token_.conn_id, DRMPowerMode::ON);
*/
return kErrorNone; return kErrorNone;
} }
DisplayError HWDeviceDRM::PowerOff() { DisplayError HWDeviceDRM::PowerOff() {
/*
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(false /* synchronous */); int ret = drm_atomic_intf_->Commit(false /* synchronous */);
if (ret) { if (ret) {
DLOGE("%s failed with error %d", __FUNCTION__, ret); DLOGE("%s failed with error %d", __FUNCTION__, ret);