drm/msm/dpu: fix/enable 6bpc dither with split-lm

If split-lm is used (for ex, on sdm845), we can have multiple ping-
pongs, but only a single phys encoder.  We need to configure dithering
on each of them.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Tested-by: Steev Klimaszewski <steev@kali.org>
Reviewed-by: Kalyan Thota <kalyan_t@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 6f1e2b1891260dc342eca6c805a849e69f3bd9d1..d7b2b0daed6884f01ad9127a269d2740457ca086 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -212,14 +212,14 @@ static u32 dither_matrix[DITHER_MATRIX_SZ] = {
        15, 7, 13, 5, 3, 11, 1, 9, 12, 4, 14, 6, 0, 8, 2, 10
 };
 
-static void _dpu_encoder_setup_dither(struct dpu_encoder_phys *phys)
+static void _dpu_encoder_setup_dither(struct dpu_hw_pingpong *hw_pp, unsigned bpc)
 {
        struct dpu_hw_dither_cfg dither_cfg = { 0 };
 
-       if (!phys->hw_pp || !phys->hw_pp->ops.setup_dither)
+       if (!hw_pp->ops.setup_dither)
                return;
 
-       switch (phys->connector->display_info.bpc) {
+       switch (bpc) {
        case 6:
                dither_cfg.c0_bitdepth = 6;
                dither_cfg.c1_bitdepth = 6;
@@ -228,14 +228,14 @@ static void _dpu_encoder_setup_dither(struct dpu_encoder_phys *phys)
                dither_cfg.temporal_en = 0;
                break;
        default:
-               phys->hw_pp->ops.setup_dither(phys->hw_pp, NULL);
+               hw_pp->ops.setup_dither(hw_pp, NULL);
                return;
        }
 
        memcpy(&dither_cfg.matrix, dither_matrix,
                        sizeof(u32) * DITHER_MATRIX_SZ);
 
-       phys->hw_pp->ops.setup_dither(phys->hw_pp, &dither_cfg);
+       hw_pp->ops.setup_dither(hw_pp, &dither_cfg);
 }
 
 void dpu_encoder_helper_report_irq_timeout(struct dpu_encoder_phys *phys_enc,
@@ -1113,11 +1113,13 @@ static void _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc)
 
        _dpu_encoder_update_vsync_source(dpu_enc, &dpu_enc->disp_info);
 
-       if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI) {
-               for (i = 0; i < dpu_enc->num_phys_encs; i++) {
-                       struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];
-
-                       _dpu_encoder_setup_dither(phys);
+       if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI &&
+                       !WARN_ON(dpu_enc->num_phys_encs == 0)) {
+               unsigned bpc = dpu_enc->phys_encs[0]->connector->display_info.bpc;
+               for (i = 0; i < MAX_CHANNELS_PER_ENC; i++) {
+                       if (!dpu_enc->hw_pp[i])
+                               continue;
+                       _dpu_encoder_setup_dither(dpu_enc->hw_pp[i], bpc);
                }
        }
 }

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
index 7411ab6bf6af692d4297d184cf535296618ea9bf..bea4ab5c58c5ddc5abb367704eb69c7c6ef84a5e 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
@@ -231,8 +231,7 @@ static void _setup_pingpong_ops(struct dpu_hw_pingpong *c,
        c->ops.poll_timeout_wr_ptr = dpu_hw_pp_poll_timeout_wr_ptr;
        c->ops.get_line_count = dpu_hw_pp_get_line_count;
 
-       if (test_bit(DPU_PINGPONG_DITHER, &features) &&
-               IS_SC7180_TARGET(c->hw.hwversion))
+       if (test_bit(DPU_PINGPONG_DITHER, &features))
                c->ops.setup_dither = dpu_hw_pp_setup_dither;
 };