Reviewed-by: Daniel Stone <[email protected]> [mobile email formatting apology here]
On Fri, 7 Apr 2017 at 5:48 pm, Daniel Vetter <[email protected]> wrote: > I thought I've fixed this, but maybe not. Anyway, clearly broken, and > easy fix. > > Cc: Tony Lindgren <[email protected]> > Reported-by: Tony Lindgren <[email protected]> > Fixes: b95ff0319a82 ("drm: Remove drm_modeset_(un)lock_crtc") > Cc: Harry Wentland <[email protected]> > Cc: Maarten Lankhorst <[email protected]> > Cc: Daniel Vetter <[email protected]> > Cc: Jani Nikula <[email protected]> > Cc: Sean Paul <[email protected]> > Cc: David Airlie <[email protected]> > Cc: [email protected] > Signed-off-by: Daniel Vetter <[email protected]> > --- > 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 > [email protected] > https://lists.freedesktop.org/mailman/listinfo/intel-gfx >
_______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
