From 9739e7464691456dd7c297b92ef0783fe13f6ba5 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Thu, 30 Mar 2017 22:48:31 +0200 Subject: [PATCH] drm: Fix locking gotcha in page_flip ioctl We want to lock the primary plane, not the cursor (which might be optional). Real bad case of copy-paste fail, unfortunately our CI didn't catch that because i915 does have a cursor plane. Reported-by: Eric Anholt Fixes: 29dc0d1de182 ("drm: Roll out acquire context for the page_flip ioctl") Cc: Jani Nikula Cc: Sean Paul Signed-off-by: Daniel Vetter Link: http://patchwork.freedesktop.org/patch/msgid/20170330204831.8225-1-daniel.vetter@ffwll.ch Tested-by: Eric Anholt Reviewed-by: Harry Wentland --- drivers/gpu/drm/drm_plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index 5eca3184a747..bc71aa2b7872 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -872,7 +872,7 @@ retry: ret = drm_modeset_lock(&crtc->mutex, &ctx); if (ret) goto out; - ret = drm_modeset_lock(&crtc->cursor->mutex, &ctx); + ret = drm_modeset_lock(&crtc->primary->mutex, &ctx); if (ret) goto out;