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

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.orgSigned-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent a03b7c46
...@@ -2080,8 +2080,7 @@ void dpu_encoder_helper_phys_cleanup(struct dpu_encoder_phys *phys_enc) ...@@ -2080,8 +2080,7 @@ void dpu_encoder_helper_phys_cleanup(struct dpu_encoder_phys *phys_enc)
if (phys_enc->hw_wb) { if (phys_enc->hw_wb) {
/* disable the PP block */ /* disable the PP block */
if (phys_enc->hw_wb->ops.bind_pingpong_blk) 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_wb->ops.bind_pingpong_blk(phys_enc->hw_wb, PINGPONG_NONE);
phys_enc->hw_pp->idx);
/* mark WB flush as pending */ /* mark WB flush as pending */
if (phys_enc->hw_ctl->ops.update_pending_flush_wb) if (phys_enc->hw_ctl->ops.update_pending_flush_wb)
......
...@@ -210,7 +210,7 @@ static void dpu_encoder_phys_wb_setup_cdp(struct dpu_encoder_phys *phys_enc) ...@@ -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 */ /* setup which pp blk will connect to this wb */
if (hw_pp && phys_enc->hw_wb->ops.bind_pingpong_blk) 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_pp->idx);
phys_enc->hw_ctl->ops.setup_intf_cfg(phys_enc->hw_ctl, &intf_cfg); phys_enc->hw_ctl->ops.setup_intf_cfg(phys_enc->hw_ctl, &intf_cfg);
......
...@@ -154,7 +154,7 @@ static void dpu_hw_wb_setup_cdp(struct dpu_hw_wb *ctx, ...@@ -154,7 +154,7 @@ static void dpu_hw_wb_setup_cdp(struct dpu_hw_wb *ctx,
static void dpu_hw_wb_bind_pingpong_blk( static void dpu_hw_wb_bind_pingpong_blk(
struct dpu_hw_wb *ctx, struct dpu_hw_wb *ctx,
bool enable, const enum dpu_pingpong pp) const enum dpu_pingpong pp)
{ {
struct dpu_hw_blk_reg_map *c; struct dpu_hw_blk_reg_map *c;
int mux_cfg; int mux_cfg;
...@@ -167,7 +167,7 @@ static void dpu_hw_wb_bind_pingpong_blk( ...@@ -167,7 +167,7 @@ static void dpu_hw_wb_bind_pingpong_blk(
mux_cfg = DPU_REG_READ(c, WB_MUX); mux_cfg = DPU_REG_READ(c, WB_MUX);
mux_cfg &= ~0xf; mux_cfg &= ~0xf;
if (enable) if (pp)
mux_cfg |= (pp - PINGPONG_0) & 0x7; mux_cfg |= (pp - PINGPONG_0) & 0x7;
else else
mux_cfg |= 0xf; mux_cfg |= 0xf;
......
...@@ -49,7 +49,7 @@ struct dpu_hw_wb_ops { ...@@ -49,7 +49,7 @@ struct dpu_hw_wb_ops {
bool enable); bool enable);
void (*bind_pingpong_blk)(struct dpu_hw_wb *ctx, void (*bind_pingpong_blk)(struct dpu_hw_wb *ctx,
bool enable, const enum dpu_pingpong pp); const enum dpu_pingpong pp);
}; };
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment