]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/msm/dpu: Disable dither in phys encoder cleanup
authorJessica Zhang <quic_jesszhan@quicinc.com>
Wed, 12 Feb 2025 03:59:19 +0000 (19:59 -0800)
committerAbhinav Kumar <quic_abhinavk@quicinc.com>
Sat, 15 Feb 2025 19:46:42 +0000 (11:46 -0800)
Disable pingpong dither in dpu_encoder_helper_phys_cleanup().

This avoids the issue where an encoder unknowingly uses dither after
reserving a pingpong block that was previously bound to an encoder that
had enabled dither.

Cc: stable@vger.kernel.org
Reported-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Closes: https://lore.kernel.org/all/jr7zbj5w7iq4apg3gofuvcwf4r2swzqjk7sshwcdjll4mn6ctt@l2n3qfpujg3q/
Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Fixes: 3c128638a07d ("drm/msm/dpu: add support for dither block in display")
Patchwork: https://patchwork.freedesktop.org/patch/636517/
Link: https://lore.kernel.org/r/20250211-dither-disable-v1-1-ac2cb455f6b9@quicinc.com
Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c

index 5172ab4dea995a154cd88d05c3842d7425fc34ce..48e6e8d74c855b1fcf13c8f42516437039fc27da 100644 (file)
@@ -2281,6 +2281,9 @@ void dpu_encoder_helper_phys_cleanup(struct dpu_encoder_phys *phys_enc)
                }
        }
 
+       if (phys_enc->hw_pp && phys_enc->hw_pp->ops.setup_dither)
+               phys_enc->hw_pp->ops.setup_dither(phys_enc->hw_pp, NULL);
+
        /* reset the merge 3D HW block */
        if (phys_enc->hw_pp && phys_enc->hw_pp->merge_3d) {
                phys_enc->hw_pp->merge_3d->ops.setup_3d_mode(phys_enc->hw_pp->merge_3d,