[PATCH 08/12] drm: msm: Use drm_atomic_helper_shutdown() to disable planes on removal

[Archit Taneja]

On 01/18/2018 03:25 AM, Laurent Pinchart wrote:
> 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.

Reviewed-by: Archit Taneja <architt at codeaurora.org>

> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas at ideasonboard.com>
> ---
>   drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 1 -
>   drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 1 -
>   drivers/gpu/drm/msm/msm_drv.c             | 1 +
>   3 files changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c
> index 7a1ad3af08e3..db356d22ef15 100644
> --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c
> +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c
> @@ -68,7 +68,6 @@ static void mdp4_plane_destroy(struct drm_plane *plane)
>   {
>   	struct mdp4_plane *mdp4_plane = to_mdp4_plane(plane);
>   
> -	drm_plane_helper_disable(plane);
>   	drm_plane_cleanup(plane);
>   
>   	kfree(mdp4_plane);
> diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> index 29678876fc09..986684e33a03 100644
> --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> @@ -46,7 +46,6 @@ static void mdp5_plane_destroy(struct drm_plane *plane)
>   {
>   	struct mdp5_plane *mdp5_plane = to_mdp5_plane(plane);
>   
> -	drm_plane_helper_disable(plane);
>   	drm_plane_cleanup(plane);
>   
>   	kfree(mdp5_plane);
> diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
> index d90ef1d78a1b..4ba48e5acbe9 100644
> --- a/drivers/gpu/drm/msm/msm_drv.c
> +++ b/drivers/gpu/drm/msm/msm_drv.c
> @@ -233,6 +233,7 @@ static int msm_drm_uninit(struct device *dev)
>   	if (fbdev && priv->fbdev)
>   		msm_fbdev_free(ddev);
>   #endif
> +	drm_atomic_helper_shutdown(ddev);
>   	drm_mode_config_cleanup(ddev);
>   
>   	pm_runtime_get_sync(dev);
> 

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project