summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_plane.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2017-03-22 22:50:51 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2017-03-29 09:50:52 +0200
commit043e7fb6e6c3a3fc6d5a3a434ad555e5ff79da3b (patch)
treedf711e673f683ab5a12d5f973df620e0028314b8 /drivers/gpu/drm/drm_plane.c
parent41292b1fa13a894c1108d4a1c7f8a59fbb307aa6 (diff)
downloadlinux-043e7fb6e6c3a3fc6d5a3a434ad555e5ff79da3b.tar.bz2
drm/atomic-helper: remove backoff hack from page_flip
Yay, we can now properly retry in case of deadlocks or whatever! Also don't forget to remove the transitional crtc->acquire_ctx assignment again. Reviewed-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170322215058.8671-13-daniel.vetter@ffwll.ch
Diffstat (limited to 'drivers/gpu/drm/drm_plane.c')
-rw-r--r--drivers/gpu/drm/drm_plane.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
index 373e980d698d..ec3e2e757800 100644
--- a/drivers/gpu/drm/drm_plane.c
+++ b/drivers/gpu/drm/drm_plane.c
@@ -875,7 +875,6 @@ retry:
ret = drm_modeset_lock(&crtc->cursor->mutex, &ctx);
if (ret)
goto out;
- crtc->acquire_ctx = &ctx;
if (crtc->primary->fb == NULL) {
/* The framebuffer is currently unbound, presumably