Commit 9739e746 authored by Daniel Vetter's avatar Daniel Vetter Committed by Eric Anholt

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: default avatarEric Anholt <eric@anholt.net>
Fixes: 29dc0d1d ("drm: Roll out acquire context for the page_flip ioctl")
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170330204831.8225-1-daniel.vetter@ffwll.chTested-by: default avatarEric Anholt <eric@anholt.net>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
parent bcd2ba02
...@@ -872,7 +872,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, ...@@ -872,7 +872,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
ret = drm_modeset_lock(&crtc->mutex, &ctx); ret = drm_modeset_lock(&crtc->mutex, &ctx);
if (ret) if (ret)
goto out; goto out;
ret = drm_modeset_lock(&crtc->cursor->mutex, &ctx); ret = drm_modeset_lock(&crtc->primary->mutex, &ctx);
if (ret) if (ret)
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment