Commit a03b7c46 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

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



Currently the driver passes the PINGPONG index to
dpu_hw_intf_ops::bind_pingpong_blk() callback and uses separate boolean
flag to tell whether INTF should be bound or unbound. Simplify this by
passing PINGPONG_NONE in case of unbinding and drop the flag completely.

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/540968/
Link: https://lore.kernel.org/r/20230604031308.894274-1-dmitry.baryshkov@linaro.org


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

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

+2 −2
Original line number Diff line number Diff line
@@ -2090,8 +2090,8 @@ void dpu_encoder_helper_phys_cleanup(struct dpu_encoder_phys *phys_enc) 
		for (i = 0; i < dpu_enc->num_phys_encs; i++) {

			if (dpu_enc->phys_encs[i] && phys_enc->hw_intf->ops.bind_pingpong_blk)

				phys_enc->hw_intf->ops.bind_pingpong_blk(

						dpu_enc->phys_encs[i]->hw_intf, false,

						dpu_enc->phys_encs[i]->hw_pp->idx);

						dpu_enc->phys_encs[i]->hw_intf,

						PINGPONG_NONE);



			/* mark INTF flush as pending */

			if (phys_enc->hw_ctl->ops.update_pending_flush_intf)

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

+1 −3
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ static void _dpu_encoder_phys_cmd_update_intf_cfg( 
	if (test_bit(DPU_CTL_ACTIVE_CFG, &ctl->caps->features) && phys_enc->hw_intf->ops.bind_pingpong_blk)

		phys_enc->hw_intf->ops.bind_pingpong_blk(

				phys_enc->hw_intf,

				true,

				phys_enc->hw_pp->idx);

}
@@ -553,8 +552,7 @@ static void dpu_encoder_phys_cmd_disable(struct dpu_encoder_phys *phys_enc) 
	if (phys_enc->hw_intf->ops.bind_pingpong_blk) {

		phys_enc->hw_intf->ops.bind_pingpong_blk(

				phys_enc->hw_intf,

				false,

				phys_enc->hw_pp->idx);

				PINGPONG_NONE);



		ctl = phys_enc->hw_ctl;

		ctl->ops.update_pending_flush_intf(ctl, phys_enc->hw_intf->idx);

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

+0 −1
Original line number Diff line number Diff line
@@ -287,7 +287,6 @@ static void dpu_encoder_phys_vid_setup_timing_engine( 
	if (phys_enc->hw_intf->ops.bind_pingpong_blk)

		phys_enc->hw_intf->ops.bind_pingpong_blk(

				phys_enc->hw_intf,

				true,

				phys_enc->hw_pp->idx);



	if (phys_enc->hw_pp->merge_3d)

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

+1 −2
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ static void dpu_hw_intf_setup_prg_fetch( 


static void dpu_hw_intf_bind_pingpong_blk(

		struct dpu_hw_intf *intf,

		bool enable,

		const enum dpu_pingpong pp)

{

	struct dpu_hw_blk_reg_map *c = &intf->hw;
@@ -276,7 +275,7 @@ static void dpu_hw_intf_bind_pingpong_blk( 
	mux_cfg = DPU_REG_READ(c, INTF_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_intf.h

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ struct dpu_hw_intf_ops { 
	u32 (*get_line_count)(struct dpu_hw_intf *intf);



	void (*bind_pingpong_blk)(struct dpu_hw_intf *intf,

			bool enable,

			const enum dpu_pingpong pp);

	void (*setup_misr)(struct dpu_hw_intf *intf, bool enable, u32 frame_count);

	int (*collect_misr)(struct dpu_hw_intf *intf, u32 *misr_value);