* [PATCH] drm: Only take cursor locks when the cursor plane exists
@ 2017-04-07 16:48 Daniel Vetter
2017-04-07 17:02 ` Tony Lindgren
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Daniel Vetter @ 2017-04-07 16:48 UTC (permalink / raw)
To: Intel Graphics Development
Cc: Tony Lindgren, Daniel Vetter, DRI Development, Daniel Vetter
I thought I've fixed this, but maybe not. Anyway, clearly broken, and
easy fix.
Cc: Tony Lindgren <tony@atomide.com>
Reported-by: Tony Lindgren <tony@atomide.com>
Fixes: b95ff0319a82 ("drm: Remove drm_modeset_(un)lock_crtc")
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: David Airlie <airlied@linux.ie>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
drivers/gpu/drm/drm_plane.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
index 838ca742a28b..fedd4d60d9cd 100644
--- a/drivers/gpu/drm/drm_plane.c
+++ b/drivers/gpu/drm/drm_plane.c
@@ -720,15 +720,15 @@ static int drm_mode_cursor_common(struct drm_device *dev,
ret = drm_modeset_lock(&crtc->mutex, &ctx);
if (ret)
goto out;
- ret = drm_modeset_lock(&crtc->cursor->mutex, &ctx);
- if (ret)
- goto out;
-
/*
* If this crtc has a universal cursor plane, call that plane's update
* handler rather than using legacy cursor handlers.
*/
if (crtc->cursor) {
+ ret = drm_modeset_lock(&crtc->cursor->mutex, &ctx);
+ if (ret)
+ goto out;
+
ret = drm_mode_cursor_universal(crtc, req, file_priv, &ctx);
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] 4+ messages in thread* Re: [PATCH] drm: Only take cursor locks when the cursor plane exists
2017-04-07 16:48 [PATCH] drm: Only take cursor locks when the cursor plane exists Daniel Vetter
@ 2017-04-07 17:02 ` Tony Lindgren
2017-04-07 17:05 ` [Intel-gfx] " Daniel Stone
2017-04-07 17:33 ` Sean Paul
2 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2017-04-07 17:02 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Intel Graphics Development, DRI Development, Daniel Vetter
* Daniel Vetter <daniel.vetter@ffwll.ch> [170407 09:50]:
> I thought I've fixed this, but maybe not. Anyway, clearly broken, and
> easy fix.
>
> Cc: Tony Lindgren <tony@atomide.com>
> Reported-by: Tony Lindgren <tony@atomide.com>
> Fixes: b95ff0319a82 ("drm: Remove drm_modeset_(un)lock_crtc")
> Cc: Harry Wentland <harry.wentland@amd.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Sean Paul <seanpaul@chromium.org>
> Cc: David Airlie <airlied@linux.ie>
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Thanks this fixes the issue with starting X with Linux next
for me:
Tested-by: Tony Lindgren <tony@atomide.com>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Intel-gfx] [PATCH] drm: Only take cursor locks when the cursor plane exists
2017-04-07 16:48 [PATCH] drm: Only take cursor locks when the cursor plane exists Daniel Vetter
2017-04-07 17:02 ` Tony Lindgren
@ 2017-04-07 17:05 ` Daniel Stone
2017-04-07 17:33 ` Sean Paul
2 siblings, 0 replies; 4+ messages in thread
From: Daniel Stone @ 2017-04-07 17:05 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics Development
Cc: Daniel Vetter, Tony Lindgren, DRI Development
[-- Attachment #1.1: Type: text/plain, Size: 2014 bytes --]
Reviewed-by: Daniel Stone <daniels@collabora.com>
[mobile email formatting apology here]
On Fri, 7 Apr 2017 at 5:48 pm, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> I thought I've fixed this, but maybe not. Anyway, clearly broken, and
> easy fix.
>
> Cc: Tony Lindgren <tony@atomide.com>
> Reported-by: Tony Lindgren <tony@atomide.com>
> Fixes: b95ff0319a82 ("drm: Remove drm_modeset_(un)lock_crtc")
> Cc: Harry Wentland <harry.wentland@amd.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Sean Paul <seanpaul@chromium.org>
> Cc: David Airlie <airlied@linux.ie>
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
> drivers/gpu/drm/drm_plane.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
> index 838ca742a28b..fedd4d60d9cd 100644
> --- a/drivers/gpu/drm/drm_plane.c
> +++ b/drivers/gpu/drm/drm_plane.c
> @@ -720,15 +720,15 @@ static int drm_mode_cursor_common(struct drm_device
> *dev,
> ret = drm_modeset_lock(&crtc->mutex, &ctx);
> if (ret)
> goto out;
> - ret = drm_modeset_lock(&crtc->cursor->mutex, &ctx);
> - if (ret)
> - goto out;
> -
> /*
> * If this crtc has a universal cursor plane, call that plane's
> update
> * handler rather than using legacy cursor handlers.
> */
> if (crtc->cursor) {
> + ret = drm_modeset_lock(&crtc->cursor->mutex, &ctx);
> + if (ret)
> + goto out;
> +
> ret = drm_mode_cursor_universal(crtc, req, file_priv,
> &ctx);
> goto out;
> }
> --
> 2.11.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
[-- Attachment #1.2: Type: text/html, Size: 3470 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm: Only take cursor locks when the cursor plane exists
2017-04-07 16:48 [PATCH] drm: Only take cursor locks when the cursor plane exists Daniel Vetter
2017-04-07 17:02 ` Tony Lindgren
2017-04-07 17:05 ` [Intel-gfx] " Daniel Stone
@ 2017-04-07 17:33 ` Sean Paul
2 siblings, 0 replies; 4+ messages in thread
From: Sean Paul @ 2017-04-07 17:33 UTC (permalink / raw)
To: Daniel Vetter
Cc: Tony Lindgren, Intel Graphics Development, DRI Development,
David Airlie, Daniel Vetter, Harry Wentland
On Fri, Apr 07, 2017 at 06:48:17PM +0200, Daniel Vetter wrote:
> I thought I've fixed this, but maybe not. Anyway, clearly broken, and
> easy fix.
>
> Cc: Tony Lindgren <tony@atomide.com>
> Reported-by: Tony Lindgren <tony@atomide.com>
> Fixes: b95ff0319a82 ("drm: Remove drm_modeset_(un)lock_crtc")
> Cc: Harry Wentland <harry.wentland@amd.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Sean Paul <seanpaul@chromium.org>
> Cc: David Airlie <airlied@linux.ie>
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
Applied to drm-misc
Thanks,
Sean
> drivers/gpu/drm/drm_plane.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
> index 838ca742a28b..fedd4d60d9cd 100644
> --- a/drivers/gpu/drm/drm_plane.c
> +++ b/drivers/gpu/drm/drm_plane.c
> @@ -720,15 +720,15 @@ static int drm_mode_cursor_common(struct drm_device *dev,
> ret = drm_modeset_lock(&crtc->mutex, &ctx);
> if (ret)
> goto out;
> - ret = drm_modeset_lock(&crtc->cursor->mutex, &ctx);
> - if (ret)
> - goto out;
> -
> /*
> * If this crtc has a universal cursor plane, call that plane's update
> * handler rather than using legacy cursor handlers.
> */
> if (crtc->cursor) {
> + ret = drm_modeset_lock(&crtc->cursor->mutex, &ctx);
> + if (ret)
> + goto out;
> +
> ret = drm_mode_cursor_universal(crtc, req, file_priv, &ctx);
> goto out;
> }
> --
> 2.11.0
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-04-07 17:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-07 16:48 [PATCH] drm: Only take cursor locks when the cursor plane exists Daniel Vetter
2017-04-07 17:02 ` Tony Lindgren
2017-04-07 17:05 ` [Intel-gfx] " Daniel Stone
2017-04-07 17:33 ` Sean Paul
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.