| Message ID | 20170407164817.28272-1-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* 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>
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 >
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
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; }
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(-)