diff options
| author |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-05-04 15:40:52 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-05-04 15:40:52 +0200 |
| commit | 3671c580e55955e61072a6e6d0d9567abdd80b5c (patch) | |
| tree | 7c9f752531aba3d6c146b8606f3de8a07f96c218 /drivers/gpu/drm/drm_atomic_helper.c | |
| parent | drm/qxl: Fix qxl_noop_get_vblank_counter() (diff) | |
| download | linux-dev-3671c580e55955e61072a6e6d0d9567abdd80b5c.tar.xz linux-dev-3671c580e55955e61072a6e6d0d9567abdd80b5c.zip | |
drm/atomic-helper: Really recover pre-atomic plane/cursor behavior
I've fumbled this in
commit f02ad907cd9e7fe3a6405d2d005840912f1ed258
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Thu Jan 22 16:36:23 2015 +0100
drm/atomic-helpers: Recover full cursor plane behaviour
and accidentally put the assignment for legacy_cursor_upate after the
atomic commit, where it is pretty useless.
Reported-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index d536817699c1..9f216ff61af3 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1310,13 +1310,13 @@ retry: plane_state->src_h = src_h; plane_state->src_w = src_w; + if (plane == crtc->cursor) + state->legacy_cursor_update = true; + ret = drm_atomic_commit(state); if (ret != 0) goto fail; - if (plane == crtc->cursor) - state->legacy_cursor_update = true; - /* Driver takes ownership of state on successful commit. */ return 0; fail: |