From: Laurent Pinchart Date: Wed, 17 Jan 2018 21:55:30 +0000 (+0200) Subject: drm: arm: malidp: Use drm_atomic_helper_shutdown() to disable planes on removal X-Git-Tag: v4.17-rc1~185^2~12^2~2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=828f207077c699a8363415efbcb2a6d8a11bb100;p=linux.git drm: arm: malidp: Use drm_atomic_helper_shutdown() to disable planes on removal The plane cleanup handler currently calls drm_plane_helper_disable(), which is a legacy helper function. Replace it with a call to drm_atomic_helper_shutdown() at removal time. Signed-off-by: Laurent Pinchart Signed-off-by: Liviu Dudau --- diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c index 2b26f40a9786..274db28c0648 100644 --- a/drivers/gpu/drm/arm/malidp_drv.c +++ b/drivers/gpu/drm/arm/malidp_drv.c @@ -278,6 +278,7 @@ static int malidp_init(struct drm_device *drm) static void malidp_fini(struct drm_device *drm) { + drm_atomic_helper_shutdown(drm); drm_mode_config_cleanup(drm); } diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c index 648e97693df9..5e64060cc8fc 100644 --- a/drivers/gpu/drm/arm/malidp_planes.c +++ b/drivers/gpu/drm/arm/malidp_planes.c @@ -59,10 +59,6 @@ static void malidp_de_plane_destroy(struct drm_plane *plane) { struct malidp_plane *mp = to_malidp_plane(plane); - if (mp->base.fb) - drm_framebuffer_put(mp->base.fb); - - drm_plane_helper_disable(plane); drm_plane_cleanup(plane); kfree(mp); }