On Mon, Oct 08, 2018 at 10:08:06AM +0200, Benjamin Gaignard wrote:
> Le ven. 5 oct. 2018 à 16:25, Daniel Vetter <daniel.vetter@xxxxxxxx> a écrit :
> >
> > On Fri, Oct 5, 2018 at 12:14 PM Benjamin Gaignard
> > <benjamin.gaignard@xxxxxxxxxx> wrote:
> > >
> > > From: Daniel Vetter <daniel.vetter@xxxxxxxx>
> > >
> > > drm_plane_helper_disable is a non-atomic drivers only function, and
> > > will blow up (since no one passes the locking context it needs).
> > >
> > > Atomic drivers which want to quiescent their hw on unload should
> > > use drm_atomic_helper_shutdown() instead.
> > >
> > > The sti cleanup code seems supremely confused:
> > > - In the load error path it calls drm_mode_config_cleanup before it
> > > stops various kms services like poll worker or fbdev emulation.
> > > That's going to oops.
> > > - The actual unload code doesn't even bother with the cleanup and just
> > > leaks.
> > >
> > > Try to fix this while at it.
> > >
> > > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
> > >
> > > Complements original patch after testing on board.
> >
> > I think it's better to split out your fixup and cc: stable it, since I
> > think you'll hit the same error also just when shutting down a CRTC at
> > runtime. Which is something compositors and fbcon tends to do. Then we
> > could put your patch into -fixes, and my cleanup (which really isn't a
> > fix) into -next. Sounds good?
>
> I have added more than drm_crtc_wait_one_vblank(), I also change the
> clean up for encoders and remove functions that becomes unneeded.
> sti driver is used on setup-box platform where nobody load/unload the driver.
> I could do a patch to use drm_crtc_wait_one_vblank(), wait for you patch to be
> apply and then do the additional clean up or merge everything in one
> shot with this version.
> What do you prefer ?
In the end up to you (but I think I pushed the _shutdown refactor
already), but in general I think splitting the cleanup from the bugfixes
is good practice.
Also note that just doing a CRTC dpms off will hit this already, not just
module unload. At least I'm pretty sure of that. That looks like something
worth of backporting to stable kernels.
-Daniel
>
> >
> > Adding the drm_crtc_wait_one_vblank has my r-b (if it's just the
> > bugfix patch only).
> > -Daniel
> >
> > > Signed-off-by: Benjamin Gaignard <benjamin.gaignard@xxxxxxxxxx>
> > > Cc: Vincent Abriou <vincent.abriou@xxxxxx>
> > > Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> > > ---
> > > drivers/gpu/drm/sti/sti_crtc.c | 2 ++
> > > drivers/gpu/drm/sti/sti_cursor.c | 10 +---------
> > > drivers/gpu/drm/sti/sti_drv.c | 6 +++---
> > > drivers/gpu/drm/sti/sti_gdp.c | 10 +---------
> > > drivers/gpu/drm/sti/sti_hqvdp.c | 10 +---------
> > > drivers/gpu/drm/sti/sti_tvout.c | 24 ------------------------
> > > 6 files changed, 8 insertions(+), 54 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/sti/sti_crtc.c b/drivers/gpu/drm/sti/sti_crtc.c
> > > index 5824e6aca8f4..61c2379fba87 100644
> > > --- a/drivers/gpu/drm/sti/sti_crtc.c
> > > +++ b/drivers/gpu/drm/sti/sti_crtc.c
> > > @@ -40,6 +40,8 @@ static void sti_crtc_atomic_disable(struct drm_crtc *crtc,
> > > DRM_DEBUG_DRIVER("\n");
> > >
> > > mixer->status = STI_MIXER_DISABLING;
> > > +
> > > + drm_crtc_wait_one_vblank(crtc);
> > > }
> > >
> > > static int
> > > diff --git a/drivers/gpu/drm/sti/sti_cursor.c b/drivers/gpu/drm/sti/sti_cursor.c
> > > index 57b870e1e696..e1ba253055c7 100644
> > > --- a/drivers/gpu/drm/sti/sti_cursor.c
> > > +++ b/drivers/gpu/drm/sti/sti_cursor.c
> > > @@ -328,14 +328,6 @@ static const struct drm_plane_helper_funcs sti_cursor_helpers_funcs = {
> > > .atomic_disable = sti_cursor_atomic_disable,
> > > };
> > >
> > > -static void sti_cursor_destroy(struct drm_plane *drm_plane)
> > > -{
> > > - DRM_DEBUG_DRIVER("\n");
> > > -
> > > - drm_plane_helper_disable(drm_plane, NULL);
> > > - drm_plane_cleanup(drm_plane);
> > > -}
> > > -
> > > static int sti_cursor_late_register(struct drm_plane *drm_plane)
> > > {
> > > struct sti_plane *plane = to_sti_plane(drm_plane);
> > > @@ -347,7 +339,7 @@ static int sti_cursor_late_register(struct drm_plane *drm_plane)
> > > static const struct drm_plane_funcs sti_cursor_plane_helpers_funcs = {
> > > .update_plane = drm_atomic_helper_update_plane,
> > > .disable_plane = drm_atomic_helper_disable_plane,
> > > - .destroy = sti_cursor_destroy,
> > > + .destroy = drm_plane_cleanup,
> > > .reset = sti_plane_reset,
> > > .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
> > > .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
> > > diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c
> > > index 6dced8abcf16..ac54e0f9caea 100644
> > > --- a/drivers/gpu/drm/sti/sti_drv.c
> > > +++ b/drivers/gpu/drm/sti/sti_drv.c
> > > @@ -206,6 +206,8 @@ static void sti_cleanup(struct drm_device *ddev)
> > > struct sti_private *private = ddev->dev_private;
> > >
> > > drm_kms_helper_poll_fini(ddev);
> > > + drm_atomic_helper_shutdown(ddev);
> > > + drm_mode_config_cleanup(ddev);
> > > component_unbind_all(ddev->dev, ddev);
> > > kfree(private);
> > > ddev->dev_private = NULL;
> > > @@ -230,7 +232,7 @@ static int sti_bind(struct device *dev)
> > >
> > > ret = drm_dev_register(ddev, 0);
> > > if (ret)
> > > - goto err_register;
> > > + goto err_cleanup;
> > >
> > > drm_mode_config_reset(ddev);
> > >
> > > @@ -238,8 +240,6 @@ static int sti_bind(struct device *dev)
> > >
> > > return 0;
> > >
> > > -err_register:
> > > - drm_mode_config_cleanup(ddev);
> > > err_cleanup:
> > > sti_cleanup(ddev);
> > > err_drm_dev_put:
> > > diff --git a/drivers/gpu/drm/sti/sti_gdp.c b/drivers/gpu/drm/sti/sti_gdp.c
> > > index c32de6cbf061..87b50451afd7 100644
> > > --- a/drivers/gpu/drm/sti/sti_gdp.c
> > > +++ b/drivers/gpu/drm/sti/sti_gdp.c
> > > @@ -879,14 +879,6 @@ static const struct drm_plane_helper_funcs sti_gdp_helpers_funcs = {
> > > .atomic_disable = sti_gdp_atomic_disable,
> > > };
> > >
> > > -static void sti_gdp_destroy(struct drm_plane *drm_plane)
> > > -{
> > > - DRM_DEBUG_DRIVER("\n");
> > > -
> > > - drm_plane_helper_disable(drm_plane, NULL);
> > > - drm_plane_cleanup(drm_plane);
> > > -}
> > > -
> > > static int sti_gdp_late_register(struct drm_plane *drm_plane)
> > > {
> > > struct sti_plane *plane = to_sti_plane(drm_plane);
> > > @@ -898,7 +890,7 @@ static int sti_gdp_late_register(struct drm_plane *drm_plane)
> > > static const struct drm_plane_funcs sti_gdp_plane_helpers_funcs = {
> > > .update_plane = drm_atomic_helper_update_plane,
> > > .disable_plane = drm_atomic_helper_disable_plane,
> > > - .destroy = sti_gdp_destroy,
> > > + .destroy = drm_plane_cleanup,
> > > .reset = sti_plane_reset,
> > > .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
> > > .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
> > > diff --git a/drivers/gpu/drm/sti/sti_hqvdp.c b/drivers/gpu/drm/sti/sti_hqvdp.c
> > > index 03ac3b4a4469..065a5b08a702 100644
> > > --- a/drivers/gpu/drm/sti/sti_hqvdp.c
> > > +++ b/drivers/gpu/drm/sti/sti_hqvdp.c
> > > @@ -1256,14 +1256,6 @@ static const struct drm_plane_helper_funcs sti_hqvdp_helpers_funcs = {
> > > .atomic_disable = sti_hqvdp_atomic_disable,
> > > };
> > >
> > > -static void sti_hqvdp_destroy(struct drm_plane *drm_plane)
> > > -{
> > > - DRM_DEBUG_DRIVER("\n");
> > > -
> > > - drm_plane_helper_disable(drm_plane, NULL);
> > > - drm_plane_cleanup(drm_plane);
> > > -}
> > > -
> > > static int sti_hqvdp_late_register(struct drm_plane *drm_plane)
> > > {
> > > struct sti_plane *plane = to_sti_plane(drm_plane);
> > > @@ -1275,7 +1267,7 @@ static int sti_hqvdp_late_register(struct drm_plane *drm_plane)
> > > static const struct drm_plane_funcs sti_hqvdp_plane_helpers_funcs = {
> > > .update_plane = drm_atomic_helper_update_plane,
> > > .disable_plane = drm_atomic_helper_disable_plane,
> > > - .destroy = sti_hqvdp_destroy,
> > > + .destroy = drm_plane_cleanup,
> > > .reset = sti_plane_reset,
> > > .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
> > > .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
> > > diff --git a/drivers/gpu/drm/sti/sti_tvout.c b/drivers/gpu/drm/sti/sti_tvout.c
> > > index ea4a3b87fa55..4dc3b2ec40eb 100644
> > > --- a/drivers/gpu/drm/sti/sti_tvout.c
> > > +++ b/drivers/gpu/drm/sti/sti_tvout.c
> > > @@ -788,21 +788,6 @@ static void sti_tvout_create_encoders(struct drm_device *dev,
> > > tvout->dvo = sti_tvout_create_dvo_encoder(dev, tvout);
> > > }
> > >
> > > -static void sti_tvout_destroy_encoders(struct sti_tvout *tvout)
> > > -{
> > > - if (tvout->hdmi)
> > > - drm_encoder_cleanup(tvout->hdmi);
> > > - tvout->hdmi = NULL;
> > > -
> > > - if (tvout->hda)
> > > - drm_encoder_cleanup(tvout->hda);
> > > - tvout->hda = NULL;
> > > -
> > > - if (tvout->dvo)
> > > - drm_encoder_cleanup(tvout->dvo);
> > > - tvout->dvo = NULL;
> > > -}
> > > -
> > > static int sti_tvout_bind(struct device *dev, struct device *master, void *data)
> > > {
> > > struct sti_tvout *tvout = dev_get_drvdata(dev);
> > > @@ -815,17 +800,8 @@ static int sti_tvout_bind(struct device *dev, struct device *master, void *data)
> > > return 0;
> > > }
> > >
> > > -static void sti_tvout_unbind(struct device *dev, struct device *master,
> > > - void *data)
> > > -{
> > > - struct sti_tvout *tvout = dev_get_drvdata(dev);
> > > -
> > > - sti_tvout_destroy_encoders(tvout);
> > > -}
> > > -
> > > static const struct component_ops sti_tvout_ops = {
> > > .bind = sti_tvout_bind,
> > > - .unbind = sti_tvout_unbind,
> > > };
> > >
> > > static int sti_tvout_probe(struct platform_device *pdev)
> > > --
> > > 2.15.0
> > >
> >
> >
> > --
> > Daniel Vetter
> > Software Engineer, Intel Corporation
> > +41 (0) 79 365 57 48 - http://blog.ffwll.ch
>
>
>
> --
> Benjamin Gaignard
>
> Graphic Study Group
>
> Linaro.org │ Open source software for ARM SoCs
>
> Follow Linaro: Facebook | Twitter | Blog
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
