[PATCH 07/13] drm/msm: Stop updating plane->fb/crtc

[Daniel Vetter]

On Thu, Apr 05, 2018 at 06:13:54PM +0300, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> We want to get rid of plane->fb/crtc on atomic drivers. Stop setting
> them.
> 
> v2: Catch a few more cases
> 
> Cc: Rob Clark <robdclark at gmail.com>
> Cc: linux-arm-msm at vger.kernel.org
> Cc: freedreno at lists.freedesktop.org
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Reviewed-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com> #v1

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

> ---
>  drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c  | 1 -
>  drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 2 --
>  drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c  | 1 -
>  drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 2 --
>  4 files changed, 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c
> index 99ead8e37c72..13f3f155dc67 100644
> --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c
> +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c
> @@ -664,7 +664,6 @@ struct drm_crtc *mdp4_crtc_init(struct drm_device *dev,
>  	drm_crtc_init_with_planes(dev, crtc, plane, NULL, &mdp4_crtc_funcs,
>  				  NULL);
>  	drm_crtc_helper_add(crtc, &mdp4_crtc_helper_funcs);
> -	plane->crtc = crtc;
>  
>  	return crtc;
>  }
> diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c
> index 7a1ad3af08e3..782b1e27f040 100644
> --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c
> +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c
> @@ -182,8 +182,6 @@ static void mdp4_plane_set_scanout(struct drm_plane *plane,
>  			msm_framebuffer_iova(fb, kms->aspace, 2));
>  	mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRCP3_BASE(pipe),
>  			msm_framebuffer_iova(fb, kms->aspace, 3));
> -
> -	plane->fb = fb;
>  }
>  
>  static void mdp4_write_csc_config(struct mdp4_kms *mdp4_kms,
> diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
> index 9893e43ba6c5..4cd884164b78 100644
> --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
> +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
> @@ -1197,7 +1197,6 @@ struct drm_crtc *mdp5_crtc_init(struct drm_device *dev,
>  			"unref cursor", unref_cursor_worker);
>  
>  	drm_crtc_helper_add(crtc, &mdp5_crtc_helper_funcs);
> -	plane->crtc = crtc;
>  
>  	return crtc;
>  }
> diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
> index f2361f79fdce..6826aa10f3ac 100644
> --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
> +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
> @@ -1043,8 +1043,6 @@ static int mdp5_plane_mode_set(struct drm_plane *plane,
>  				     src_img_w, src_img_h,
>  				     src_x + src_w, src_y, src_w, src_h);
>  
> -	plane->fb = fb;
> -
>  	return ret;
>  }
>  
> -- 
> 2.16.1
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch