* [PATCH] drm: Fix locking gotcha in page_flip ioctl
@ 2017-03-30 20:48 Daniel Vetter
2017-03-30 21:26 ` Harry Wentland
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Vetter @ 2017-03-30 20:48 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter, DRI Development, Daniel Vetter
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.
Cc: Eric Anholt <eric@anholt.net>
Reported-by: Eric Anholt <eric@anholt.net>
Fixes: 29dc0d1de182 ("drm: Roll out acquire context for the page_flip ioctl")
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
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 3a6de27bafed..838ca742a28b 100644
--- a/drivers/gpu/drm/drm_plane.c
+++ b/drivers/gpu/drm/drm_plane.c
@@ -871,7 +871,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
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;
--
2.11.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm: Fix locking gotcha in page_flip ioctl
2017-03-30 20:48 [PATCH] drm: Fix locking gotcha in page_flip ioctl Daniel Vetter
@ 2017-03-30 21:26 ` Harry Wentland
0 siblings, 0 replies; 2+ messages in thread
From: Harry Wentland @ 2017-03-30 21:26 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics Development; +Cc: DRI Development, Daniel Vetter
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Harry
On 2017-03-30 04:48 PM, Daniel Vetter wrote:
> 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.
>
> Cc: Eric Anholt <eric@anholt.net>
> Reported-by: Eric Anholt <eric@anholt.net>
> Fixes: 29dc0d1de182 ("drm: Roll out acquire context for the page_flip ioctl")
> Cc: Harry Wentland <harry.wentland@amd.com>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Sean Paul <seanpaul@chromium.org>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
> 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 3a6de27bafed..838ca742a28b 100644
> --- a/drivers/gpu/drm/drm_plane.c
> +++ b/drivers/gpu/drm/drm_plane.c
> @@ -871,7 +871,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
> 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;
>
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-30 21:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-30 20:48 [PATCH] drm: Fix locking gotcha in page_flip ioctl Daniel Vetter
2017-03-30 21:26 ` Harry Wentland
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).