diff options
| author | dnicoara <dnicoara@chromium.org> | 2015-01-17 11:01:20 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-17 19:02:16 +0000 |
| commit | 03afd7132ccf176297ce5110bc28667025409f67 (patch) | |
| tree | 2f4a4e76a1632e95fc8eef04da4bb34ecde5af42 /ui/ozone | |
| parent | 4cd6e60d57c83b5f7b3a6de4497329de7822e316 (diff) | |
| download | chromium_src-03afd7132ccf176297ce5110bc28667025409f67.zip chromium_src-03afd7132ccf176297ce5110bc28667025409f67.tar.gz chromium_src-03afd7132ccf176297ce5110bc28667025409f67.tar.bz2 | |
[Ozone-Dri] Force DPMS on after configuring the display
The correct order is to first configure the display and then set its properties,
otherwise the DPMS configuration may be ignored by the kernel if the display is disabled.
BUG=425718
NOTRY=true
Review URL: https://codereview.chromium.org/851353002
Cr-Commit-Position: refs/heads/master@{#312043}
Diffstat (limited to 'ui/ozone')
| -rw-r--r-- | ui/ozone/platform/dri/screen_manager.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ui/ozone/platform/dri/screen_manager.cc b/ui/ozone/platform/dri/screen_manager.cc index bb5833b..d7d52a9 100644 --- a/ui/ozone/platform/dri/screen_manager.cc +++ b/ui/ozone/platform/dri/screen_manager.cc @@ -224,17 +224,16 @@ void ScreenManager::ForceInitializationOfPrimaryDisplay() { ScopedDrmPropertyPtr dpms( dri_->GetProperty(displays[0]->connector(), "DPMS")); - if (dpms) - dri_->SetProperty(displays[0]->connector()->connector_id, - dpms->prop_id, - DRM_MODE_DPMS_ON); AddDisplayController(dri_, displays[0]->crtc()->crtc_id, displays[0]->connector()->connector_id); - ConfigureDisplayController(displays[0]->crtc()->crtc_id, - displays[0]->connector()->connector_id, - gfx::Point(), - displays[0]->connector()->modes[0]); + if (ConfigureDisplayController( + displays[0]->crtc()->crtc_id, displays[0]->connector()->connector_id, + gfx::Point(), displays[0]->connector()->modes[0])) { + if (dpms) + dri_->SetProperty(displays[0]->connector()->connector_id, dpms->prop_id, + DRM_MODE_DPMS_ON); + } } bool ScreenManager::ModesetDisplayController( |