<div>Reviewed-by: Daniel Stone <<a href="mailto:daniels@collabora.com">daniels@collabora.com</a>></div><div><br></div><div>[mobile email formatting apology here] </div><div><br><div class="gmail_quote"><div>On Fri, 7 Apr 2017 at 5:48 pm, Daniel Vetter <<a href="mailto:daniel.vetter@ffwll.ch">daniel.vetter@ffwll.ch</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I thought I've fixed this, but maybe not. Anyway, clearly broken, and<br>
easy fix.<br>
<br>
Cc: Tony Lindgren <<a href="mailto:tony@atomide.com" target="_blank">tony@atomide.com</a>><br>
Reported-by: Tony Lindgren <<a href="mailto:tony@atomide.com" target="_blank">tony@atomide.com</a>><br>
Fixes: b95ff0319a82 ("drm: Remove drm_modeset_(un)lock_crtc")<br>
Cc: Harry Wentland <<a href="mailto:harry.wentland@amd.com" target="_blank">harry.wentland@amd.com</a>><br>
Cc: Maarten Lankhorst <<a href="mailto:maarten.lankhorst@linux.intel.com" target="_blank">maarten.lankhorst@linux.intel.com</a>><br>
Cc: Daniel Vetter <<a href="mailto:daniel.vetter@intel.com" target="_blank">daniel.vetter@intel.com</a>><br>
Cc: Jani Nikula <<a href="mailto:jani.nikula@linux.intel.com" target="_blank">jani.nikula@linux.intel.com</a>><br>
Cc: Sean Paul <<a href="mailto:seanpaul@chromium.org" target="_blank">seanpaul@chromium.org</a>><br>
Cc: David Airlie <<a href="mailto:airlied@linux.ie" target="_blank">airlied@linux.ie</a>><br>
Cc: <a href="mailto:dri-devel@lists.freedesktop.org" target="_blank">dri-devel@lists.freedesktop.org</a><br>
Signed-off-by: Daniel Vetter <<a href="mailto:daniel.vetter@intel.com" target="_blank">daniel.vetter@intel.com</a>><br>
---<br>
 drivers/gpu/drm/drm_plane.c | 8 ++++----<br>
 1 file changed, 4 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c<br>
index 838ca742a28b..fedd4d60d9cd 100644<br>
--- a/drivers/gpu/drm/drm_plane.c<br>
+++ b/drivers/gpu/drm/drm_plane.c<br>
@@ -720,15 +720,15 @@ static int drm_mode_cursor_common(struct drm_device *dev,<br>
        ret = drm_modeset_lock(&crtc->mutex, &ctx);<br>
        if (ret)<br>
                goto out;<br>
-       ret = drm_modeset_lock(&crtc->cursor->mutex, &ctx);<br>
-       if (ret)<br>
-               goto out;<br>
-<br>
        /*<br>
         * If this crtc has a universal cursor plane, call that plane's update<br>
         * handler rather than using legacy cursor handlers.<br>
         */<br>
        if (crtc->cursor) {<br>
+               ret = drm_modeset_lock(&crtc->cursor->mutex, &ctx);<br>
+               if (ret)<br>
+                       goto out;<br>
+<br>
                ret = drm_mode_cursor_universal(crtc, req, file_priv, &ctx);<br>
                goto out;<br>
        }<br>
--<br>
2.11.0<br>
<br>
_______________________________________________<br>
Intel-gfx mailing list<br>
<a href="mailto:Intel-gfx@lists.freedesktop.org" target="_blank">Intel-gfx@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/intel-gfx" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/intel-gfx</a><br>
</blockquote></div></div>