Commit 9bac4a01 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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

v2: Rebase.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Cc: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20181004202446.22905-14-daniel.vetter@ffwll.ch
parent a2b50bab

drivers/gpu/drm/vc4/vc4_drv.c

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/pm_runtime.h>

#include <drm/drm_fb_cma_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_atomic_helper.h>



#include "uapi/drm/vc4_drm.h"

#include "vc4_drv.h"
@@ -308,6 +309,8 @@ static void vc4_drm_unbind(struct device *dev) 


	drm_dev_unregister(drm);



	drm_atomic_helper_shutdown(drm);



	drm_mode_config_cleanup(drm);



	drm_atomic_private_obj_fini(&vc4->ctm_manager);

drivers/gpu/drm/vc4/vc4_plane.c

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


static void vc4_plane_destroy(struct drm_plane *plane)

{

	drm_plane_helper_disable(plane, NULL);

	drm_plane_cleanup(plane);

}