Commit 0f86d9c9 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: use PINGPONG_NONE to unbind WB from PP 



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: default avatarMarijn Suijten <marijn.suijten@somainline.org>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarMarijn Suijten <marijn.suijten@somainline.org>
Patchwork: https://patchwork.freedesktop.org/patch/540969/
Link: https://lore.kernel.org/r/20230604031308.894274-2-dmitry.baryshkov@linaro.org


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent a03b7c46

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

};



/**