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

drm/zte: 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.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Cc: Shawn Guo <shawnguo@kernel.org>
Acked-by: default avatarShawn Guo <shawnguo@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20181004202446.22905-15-daniel.vetter@ffwll.ch
parent 9bac4a01

drivers/gpu/drm/zte/zx_drm_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ static void zx_drm_unbind(struct device *dev) 


	drm_dev_unregister(drm);

	drm_kms_helper_poll_fini(drm);

	drm_atomic_helper_shutdown(drm);

	drm_mode_config_cleanup(drm);

	component_unbind_all(dev, drm);

	dev_set_drvdata(dev, NULL);

drivers/gpu/drm/zte/zx_plane.c

+0 −1
Original line number Diff line number Diff line
@@ -446,7 +446,6 @@ static const struct drm_plane_helper_funcs zx_gl_plane_helper_funcs = { 


static void zx_plane_destroy(struct drm_plane *plane)

{

	drm_plane_helper_disable(plane, NULL);

	drm_plane_cleanup(plane);

}