diff options
author | alexst <alexst@chromium.org> | 2015-04-17 12:05:38 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-17 19:06:10 +0000 |
commit | f14b9219b64d5892fc43c45f6baa6e874293cde2 (patch) | |
tree | c8632086e5ad3f877bea316823b859fbff6d8a54 /ui/ozone/platform/drm/gpu/screen_manager.h | |
parent | fc2f13691557ed28e604ad9e628a41d7f73591b7 (diff) | |
download | chromium_src-f14b9219b64d5892fc43c45f6baa6e874293cde2.zip chromium_src-f14b9219b64d5892fc43c45f6baa6e874293cde2.tar.gz chromium_src-f14b9219b64d5892fc43c45f6baa6e874293cde2.tar.bz2 |
[ozone] Keep track of pending frames on drm_window when hardware display controller is disabled or when in headless mode.
When display controller is disabled, it used to stop tracking which buffer was the considered front. Surface would fast ack all incoming buffers without presenting them, which means that any one of them could be getting painted into while display controller is off. Upon wakeup, the controller would grab what it thought was the last front buffer, but in practice it was not because of the fast acks. Net result is that it may try to modeset with the buffer GL is painting into, making it hang on a fence in the driver.
This patch removes all knowledge of front buffers from the display controller and explicitly sets it on the window, which tracks it while the controller is off.
BUG=473831
Committed: https://crrev.com/b47c9f5fb6b669b27e055ab8b305309170849732
Cr-Commit-Position: refs/heads/master@{#325326}
Review URL: https://codereview.chromium.org/1078183003
Cr-Commit-Position: refs/heads/master@{#325692}
Diffstat (limited to 'ui/ozone/platform/drm/gpu/screen_manager.h')
-rw-r--r-- | ui/ozone/platform/drm/gpu/screen_manager.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/ozone/platform/drm/gpu/screen_manager.h b/ui/ozone/platform/drm/gpu/screen_manager.h index 2732769..4e8123d 100644 --- a/ui/ozone/platform/drm/gpu/screen_manager.h +++ b/ui/ozone/platform/drm/gpu/screen_manager.h @@ -104,7 +104,8 @@ class OZONE_EXPORT ScreenManager { // Perform modesetting in |controller| using |origin| and |mode|. bool ModesetDisplayController(HardwareDisplayController* controller, const gfx::Point& origin, - const drmModeModeInfo& mode); + const drmModeModeInfo& mode, + bool fill_mode_set_buffer); // Tries to set the controller identified by (|crtc|, |connector|) to mirror // those in |mirror|. |original| is an iterator to the HDC where the @@ -115,6 +116,9 @@ class OZONE_EXPORT ScreenManager { uint32_t crtc, uint32_t connector); + // Aquire pending frames from the time the controller was disabled. + bool EnableController(HardwareDisplayController* controller); + DrmWindow* FindWindowAt(const gfx::Rect& bounds) const; ScanoutBufferGenerator* buffer_generator_; // Not owned. |