[Freedreno] [PATCH 07/25] drm/msm/dpu: drop dpu_plane_pipe function

[Abhinav Kumar]

On 2/9/2022 9:25 AM, Dmitry Baryshkov wrote:
> There no more need for the dpu_plane_pipe() function, crtc code can
> access pstate->pipe_hw.idx directly.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>

Perhaps this can be squashed with the previous change.

Otherwise,

Reviewed-by: Abhinav Kumar <quic_abhinavk at quicinc.com>
> ---
>   drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c  | 4 ++--
>   drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 5 -----
>   drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 7 -------
>   3 files changed, 2 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> index 5fc338ef3460..d21791db6ab1 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> @@ -364,7 +364,7 @@ static void _dpu_crtc_blend_setup_mixer(struct drm_crtc *crtc,
>   		pstate = to_dpu_plane_state(state);
>   		fb = state->fb;
>   
> -		sspp_idx = dpu_plane_pipe(plane);
> +		sspp_idx = pstate->pipe_hw->idx;
>   		set_bit(sspp_idx, fetch_active);
>   
>   		DRM_DEBUG_ATOMIC("crtc %d stage:%d - plane %d sspp %d fb %d\n",
> @@ -1112,7 +1112,7 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
>   		pstates[cnt].dpu_pstate = to_dpu_plane_state(pstate);
>   		pstates[cnt].drm_pstate = pstate;
>   		pstates[cnt].stage = pstate->normalized_zpos;
> -		pstates[cnt].pipe_id = dpu_plane_pipe(plane);
> +		pstates[cnt].pipe_id = to_dpu_plane_state(pstate)->pipe_hw->idx;
>   
>   		if (pipe_staged[pstates[cnt].pipe_id]) {
>   			multirect_plane[multirect_count].r0 =
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> index ca194cd83cd0..d1f9b4bc10ac 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> @@ -1391,11 +1391,6 @@ static const struct drm_plane_helper_funcs dpu_plane_helper_funcs = {
>   		.atomic_update = dpu_plane_atomic_update,
>   };
>   
> -enum dpu_sspp dpu_plane_pipe(struct drm_plane *plane)
> -{
> -	return plane ? to_dpu_plane(plane)->pipe : SSPP_NONE;
> -}
> -
>   /* initialize plane */
>   struct drm_plane *dpu_plane_init(struct drm_device *dev,
>   		uint32_t pipe, enum drm_plane_type type,
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h
> index aa9478b475d4..d745cde4ea77 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h
> @@ -54,13 +54,6 @@ struct dpu_multirect_plane_states {
>   #define to_dpu_plane_state(x) \
>   	container_of(x, struct dpu_plane_state, base)
>   
> -/**
> - * dpu_plane_pipe - return sspp identifier for the given plane
> - * @plane:   Pointer to DRM plane object
> - * Returns: sspp identifier of the given plane
> - */
> -enum dpu_sspp dpu_plane_pipe(struct drm_plane *plane);
> -
>   /**
>    * dpu_plane_flush - final plane operations before commit flush
>    * @plane: Pointer to drm plane structure