[PATCH 7/8] drm/msm/dpu: ignore merge_3d flush bit for non-CWB INTF
From: Jun Nie
Date: Thu Nov 12 2026 - 03:03:08 EST
merge_3d flush bit is always asserted for DSI interface vblank
wait in CWB case, while there is no visual defect actually.
Ignore the bit for now.
Signed-off-by: Jun Nie <jun.nie@xxxxxxxxxx>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 7 +++++++
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 2 ++
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 17 +++++++++++++++--
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 2f19ecfb6020..1a294f817972 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -3050,6 +3050,13 @@ unsigned int dpu_encoder_helper_get_dsc(struct dpu_encoder_phys *phys_enc)
return dpu_enc->dsc_mask;
}
+bool dpu_encoder_in_clone_mode(struct dpu_encoder_phys *phys_enc)
+{
+ struct drm_encoder *encoder = phys_enc->parent;
+
+ return drm_crtc_in_clone_mode(encoder->crtc->state);
+}
+
void dpu_encoder_phys_init(struct dpu_encoder_phys *phys_enc,
struct dpu_enc_phys_init_params *p)
{
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
index b8c8222a03b2..34cde9a64d25 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
@@ -354,4 +354,6 @@ void dpu_encoder_phys_init(struct dpu_encoder_phys *phys,
void dpu_encoder_phys_wb_deinit(struct drm_device *dev,
struct dpu_encoder_phys *phys_enc);
+
+bool dpu_encoder_in_clone_mode(struct dpu_encoder_phys *phys_enc);
#endif /* __dpu_encoder_phys_H__ */
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
index 2ac517db50fc..7b310fd5db34 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
@@ -534,15 +534,28 @@ static int dpu_encoder_phys_vid_wait_for_commit_done(
{
struct dpu_hw_ctl *hw_ctl = phys_enc->hw_ctl;
int ret;
+ u32 mask;
if (!hw_ctl)
return 0;
+ /*
+ * For CWB case, DSI path always report timeout. Workaround it for now.
+ */
+#define MERGE_3D_IDX 23
+ if (dpu_encoder_in_clone_mode(phys_enc))
+ mask = ~BIT(MERGE_3D_IDX);
+ else
+ mask = 0xffffffff;
+
ret = wait_event_timeout(phys_enc->pending_kickoff_wq,
- (hw_ctl->ops.get_flush_register(hw_ctl) == 0),
+ ((hw_ctl->ops.get_flush_register(hw_ctl) & mask) == 0),
msecs_to_jiffies(50));
if (ret <= 0) {
- DPU_ERROR("vblank timeout: %x\n", hw_ctl->ops.get_flush_register(hw_ctl));
+ DPU_ERROR("%s phys.split_role %d vblank timeout: %x\n",
+ phys_enc->parent->name,
+ phys_enc->split_role,
+ hw_ctl->ops.get_flush_register(hw_ctl));
return -ETIMEDOUT;
}
--
2.53.0