summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/sti/sti_cursor.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2018-10-04 23:24:37 +0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2018-10-05 19:04:09 +0300
commita2b50babc74394c99638a37a3d48adeb03ddc248 (patch)
tree4a2a79e5d10c0f864a971dfe6bd498fcc29aa9a0 /drivers/gpu/drm/sti/sti_cursor.c
parent3ea4b1e1b814384a59f2adf0e24fb108084ddab6 (diff)
downloadlinux-a2b50babc74394c99638a37a3d48adeb03ddc248.tar.xz
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: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel 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
Diffstat (limited to 'drivers/gpu/drm/sti/sti_cursor.c')
-rw-r--r--drivers/gpu/drm/sti/sti_cursor.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/sti/sti_cursor.c b/drivers/gpu/drm/sti/sti_cursor.c
index 57b870e1e696..bc908453ffb3 100644
--- a/drivers/gpu/drm/sti/sti_cursor.c
+++ b/drivers/gpu/drm/sti/sti_cursor.c
@@ -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);
}