diff options
| -rw-r--r-- | ui/ozone/platform/drm/gpu/drm_display_snapshot.cc | 7 | ||||
| -rw-r--r-- | ui/ozone/platform/drm/gpu/drm_display_snapshot.h | 2 | ||||
| -rw-r--r-- | ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc | 12 | ||||
| -rw-r--r-- | ui/ozone/platform/drm/gpu/drm_util.cc | 13 |
4 files changed, 4 insertions, 30 deletions
diff --git a/ui/ozone/platform/drm/gpu/drm_display_snapshot.cc b/ui/ozone/platform/drm/gpu/drm_display_snapshot.cc index 96e0a2f..4c90654 100644 --- a/ui/ozone/platform/drm/gpu/drm_display_snapshot.cc +++ b/ui/ozone/platform/drm/gpu/drm_display_snapshot.cc @@ -83,12 +83,7 @@ DrmDisplaySnapshot::DrmDisplaySnapshot(const scoped_refptr<DrmDevice>& drm, nullptr), drm_(drm), connector_(connector->connector_id), - crtc_(crtc->crtc_id), - dpms_property_(drm->GetProperty(connector, "DPMS")) { - if (!dpms_property_) - VLOG(1) << "Failed to find the DPMS property for connector " - << connector->connector_id; - + crtc_(crtc->crtc_id) { ScopedDrmPropertyBlobPtr edid_blob(drm->GetPropertyBlob(connector, "EDID")); if (edid_blob) { diff --git a/ui/ozone/platform/drm/gpu/drm_display_snapshot.h b/ui/ozone/platform/drm/gpu/drm_display_snapshot.h index 62ad1fe..e79f9a4 100644 --- a/ui/ozone/platform/drm/gpu/drm_display_snapshot.h +++ b/ui/ozone/platform/drm/gpu/drm_display_snapshot.h @@ -26,7 +26,6 @@ class DrmDisplaySnapshot : public DisplaySnapshot { // configuring this display. uint32_t connector() const { return connector_; } uint32_t crtc() const { return crtc_; } - drmModePropertyRes* dpms_property() const { return dpms_property_.get(); } // DisplaySnapshot overrides: std::string ToString() const override; @@ -35,7 +34,6 @@ class DrmDisplaySnapshot : public DisplaySnapshot { scoped_refptr<DrmDevice> drm_; uint32_t connector_; uint32_t crtc_; - ScopedDrmPropertyPtr dpms_property_; std::string name_; bool overscan_flag_; diff --git a/ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc b/ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc index 60b335b..9a1d7cc 100644 --- a/ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc +++ b/ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc @@ -306,19 +306,7 @@ bool DrmGpuDisplayManager::Configure(const DrmDisplaySnapshot& output, << " connector=" << output.connector(); return false; } - - if (output.dpms_property()) { - output.drm()->SetProperty(output.connector(), - output.dpms_property()->prop_id, - DRM_MODE_DPMS_ON); - } } else { - if (output.dpms_property()) { - output.drm()->SetProperty(output.connector(), - output.dpms_property()->prop_id, - DRM_MODE_DPMS_OFF); - } - if (!screen_manager_->DisableDisplayController(output.drm(), output.crtc())) { VLOG(1) << "Failed to disable device=" diff --git a/ui/ozone/platform/drm/gpu/drm_util.cc b/ui/ozone/platform/drm/gpu/drm_util.cc index 01b82a2..517a58c 100644 --- a/ui/ozone/platform/drm/gpu/drm_util.cc +++ b/ui/ozone/platform/drm/gpu/drm_util.cc @@ -136,18 +136,11 @@ void ForceInitializationOfPrimaryDisplay(const scoped_refptr<DrmDevice>& drm, if (displays.empty()) return; - ScopedDrmPropertyPtr dpms(drm->GetProperty(displays[0]->connector(), "DPMS")); - screen_manager->AddDisplayController(drm, displays[0]->crtc()->crtc_id, displays[0]->connector()->connector_id); - if (screen_manager->ConfigureDisplayController( - drm, displays[0]->crtc()->crtc_id, - displays[0]->connector()->connector_id, gfx::Point(), - displays[0]->connector()->modes[0])) { - if (dpms) - drm->SetProperty(displays[0]->connector()->connector_id, dpms->prop_id, - DRM_MODE_DPMS_ON); - } + screen_manager->ConfigureDisplayController( + drm, displays[0]->crtc()->crtc_id, displays[0]->connector()->connector_id, + gfx::Point(), displays[0]->connector()->modes[0]); } base::FilePath GetPrimaryDisplayCardPath() { |