[PATCH v2 2/2] drm/msm/dpu: use PINGPONG_NONE to unbind WB from PP

[Marijn Suijten]

On 2023-06-04 06:13:08, Dmitry Baryshkov wrote:
> Currently the driver passes the PINGPONG index to
> dpu_hw_wb_ops::bind_pingpong_blk() callback and uses separate boolean
> flag to tell whether WB should be bound or unbound. Simplify this by
> passing PINGPONG_NONE in case of unbinding and drop the flag completely.
> 
> Suggested-by: Marijn Suijten <marijn.suijten at somainline.org>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>

Reviewed-by: Marijn Suijten <marijn.suijten at somainline.org>

> ---
>  drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c         | 3 +--
>  drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 2 +-
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c           | 4 ++--
>  drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.h           | 2 +-
>  4 files changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> index 3e543d664c98..493905a5b63a 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> @@ -2080,8 +2080,7 @@ void dpu_encoder_helper_phys_cleanup(struct dpu_encoder_phys *phys_enc)
>  	if (phys_enc->hw_wb) {
>  		/* disable the PP block */
>  		if (phys_enc->hw_wb->ops.bind_pingpong_blk)
> -			phys_enc->hw_wb->ops.bind_pingpong_blk(phys_enc->hw_wb, false,
> -					phys_enc->hw_pp->idx);
> +			phys_enc->hw_wb->ops.bind_pingpong_blk(phys_enc->hw_wb, PINGPONG_NONE);
>  
>  		/* mark WB flush as pending */
>  		if (phys_enc->hw_ctl->ops.update_pending_flush_wb)
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
> index e9325cafb1a8..a466ff70a4d6 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
> @@ -210,7 +210,7 @@ static void dpu_encoder_phys_wb_setup_cdp(struct dpu_encoder_phys *phys_enc)
>  
>  		/* setup which pp blk will connect to this wb */
>  		if (hw_pp && phys_enc->hw_wb->ops.bind_pingpong_blk)
> -			phys_enc->hw_wb->ops.bind_pingpong_blk(phys_enc->hw_wb, true,
> +			phys_enc->hw_wb->ops.bind_pingpong_blk(phys_enc->hw_wb,
>  					phys_enc->hw_pp->idx);
>  
>  		phys_enc->hw_ctl->ops.setup_intf_cfg(phys_enc->hw_ctl, &intf_cfg);
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
> index dcffd6cc47fc..ebc416400382 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c
> @@ -154,7 +154,7 @@ static void dpu_hw_wb_setup_cdp(struct dpu_hw_wb *ctx,
>  
>  static void dpu_hw_wb_bind_pingpong_blk(
>  		struct dpu_hw_wb *ctx,
> -		bool enable, const enum dpu_pingpong pp)
> +		const enum dpu_pingpong pp)
>  {
>  	struct dpu_hw_blk_reg_map *c;
>  	int mux_cfg;
> @@ -167,7 +167,7 @@ static void dpu_hw_wb_bind_pingpong_blk(
>  	mux_cfg = DPU_REG_READ(c, WB_MUX);
>  	mux_cfg &= ~0xf;
>  
> -	if (enable)
> +	if (pp)
>  		mux_cfg |= (pp - PINGPONG_0) & 0x7;
>  	else
>  		mux_cfg |= 0xf;
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.h
> index c7f792eeb55c..2d7db2efa3d0 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.h
> @@ -49,7 +49,7 @@ struct dpu_hw_wb_ops {
>  			  bool enable);
>  
>  	void (*bind_pingpong_blk)(struct dpu_hw_wb *ctx,
> -			bool enable, const enum dpu_pingpong pp);
> +				  const enum dpu_pingpong pp);
>  };
>  
>  /**
> -- 
> 2.39.2
>