[Intel-gfx] [PATCH RESEND 5/6] drm/msm: remove mdp5_cursor_plane_funcs

[Archit Taneja]

On 05/26/2017 01:21 AM, Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan at collabora.com>
>
> After converting legacy cursor updates to atomic async commits
> mdp5_cursor_plane_funcs just duplicates mdp5_plane_funcs now.
>

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

> Cc: Rob Clark <robdclark at gmail.com>
> Cc: Archit Taneja <architt at codeaurora.org>
> Signed-off-by: Gustavo Padovan <gustavo.padovan at collabora.com>
> ---
>  drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 26 +++-----------------------
>  1 file changed, 3 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> index 07106c1..794ca07 100644
> --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> @@ -247,19 +247,6 @@ static const struct drm_plane_funcs mdp5_plane_funcs = {
>  		.atomic_print_state = mdp5_plane_atomic_print_state,
>  };
>
> -static const struct drm_plane_funcs mdp5_cursor_plane_funcs = {
> -		.update_plane = drm_atomic_helper_update_plane,
> -		.disable_plane = drm_atomic_helper_disable_plane,
> -		.destroy = mdp5_plane_destroy,
> -		.set_property = drm_atomic_helper_plane_set_property,
> -		.atomic_set_property = mdp5_plane_atomic_set_property,
> -		.atomic_get_property = mdp5_plane_atomic_get_property,
> -		.reset = mdp5_plane_reset,
> -		.atomic_duplicate_state = mdp5_plane_duplicate_state,
> -		.atomic_destroy_state = mdp5_plane_destroy_state,
> -		.atomic_print_state = mdp5_plane_atomic_print_state,
> -};
> -
>  static int mdp5_plane_prepare_fb(struct drm_plane *plane,
>  				 struct drm_plane_state *new_state)
>  {
> @@ -1111,16 +1098,9 @@ struct drm_plane *mdp5_plane_init(struct drm_device *dev,
>
>  	spin_lock_init(&mdp5_plane->pipe_lock);
>
> -	if (type == DRM_PLANE_TYPE_CURSOR)
> -		ret = drm_universal_plane_init(dev, plane, 0xff,
> -				&mdp5_cursor_plane_funcs,
> -				mdp5_plane->formats, mdp5_plane->nformats,
> -				type, NULL);
> -	else
> -		ret = drm_universal_plane_init(dev, plane, 0xff,
> -				&mdp5_plane_funcs,
> -				mdp5_plane->formats, mdp5_plane->nformats,
> -				type, NULL);
> +	ret = drm_universal_plane_init(dev, plane, 0xff, &mdp5_plane_funcs,
> +				       mdp5_plane->formats,
> +				       mdp5_plane->nformats, type, NULL);
>  	if (ret)
>  		goto fail;
>
>

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