Commit a2b50bab authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/sti: Use drm_atomic_helper_shutdown 



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.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Vincent Abriou <vincent.abriou@st.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181004202446.22905-13-daniel.vetter@ffwll.ch
parent 3ea4b1e1

drivers/gpu/drm/sti/sti_cursor.c

+0 −1
Original line number Diff line number Diff line
@@ -332,7 +332,6 @@ 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);

}

drivers/gpu/drm/sti/sti_drv.c

+3 −3
Original line number Diff line number Diff line
@@ -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:

drivers/gpu/drm/sti/sti_gdp.c

+0 −1
Original line number Diff line number Diff line
@@ -883,7 +883,6 @@ 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);

}

drivers/gpu/drm/sti/sti_hqvdp.c

+0 −1
Original line number Diff line number Diff line
@@ -1260,7 +1260,6 @@ 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);

}