On Wed, Jun 19, 2019 at 02:19:47PM -0400, Sean Paul wrote: > From: Sean Paul <[email protected]> > > If state allocation fails, we still try to give back the reference on > it. Also initialize ret in case the crtc is not enabled and we hit the > eject button. > > Fixes: 1452c25b0e60 ("drm: Add helpers to kick off self refresh mode in > drivers") > Cc: Daniel Vetter <[email protected]> > Cc: Jose Souza <[email protected]> > Cc: Zain Wang <[email protected]> > Cc: Tomasz Figa <[email protected]> > Cc: Ville Syrjälä <[email protected]> > Cc: Sam Ravnborg <[email protected]> > Cc: Sean Paul <[email protected]> > Cc: Maarten Lankhorst <[email protected]> > Cc: Maxime Ripard <[email protected]> > Cc: Sean Paul <[email protected]> > Cc: David Airlie <[email protected]> > Cc: [email protected] > Reported-by: Dan Carpenter <[email protected]> > Signed-off-by: Sean Paul <[email protected]>
Reviewed-by: Daniel Vetter <[email protected]> > --- > drivers/gpu/drm/drm_self_refresh_helper.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_self_refresh_helper.c > b/drivers/gpu/drm/drm_self_refresh_helper.c > index e0d2ad1f070cb..4b9424a8f1f1c 100644 > --- a/drivers/gpu/drm/drm_self_refresh_helper.c > +++ b/drivers/gpu/drm/drm_self_refresh_helper.c > @@ -69,14 +69,14 @@ static void drm_self_refresh_helper_entry_work(struct > work_struct *work) > struct drm_connector *conn; > struct drm_connector_state *conn_state; > struct drm_crtc_state *crtc_state; > - int i, ret; > + int i, ret = 0; > > drm_modeset_acquire_init(&ctx, 0); > > state = drm_atomic_state_alloc(dev); > if (!state) { > ret = -ENOMEM; > - goto out; > + goto out_drop_locks; > } > > retry: > @@ -116,6 +116,8 @@ static void drm_self_refresh_helper_entry_work(struct > work_struct *work) > } > > drm_atomic_state_put(state); > + > +out_drop_locks: > drm_modeset_drop_locks(&ctx); > drm_modeset_acquire_fini(&ctx); > } > -- > Sean Paul, Software Engineer, Google / Chromium OS > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
