Skip to content

Commit 896bcee

Browse files
Jessica Zhanggregkh
authored andcommitted
drm/msm/dpu: Fix adjusted mode clock check for 3d merge
commit f5d0795 upstream. Since 3D merge allows for larger modes to be supported across 2 layer mixers, filter modes based on adjusted mode clock / 2 when 3d merge is supported. Reported-by: Abel Vesa <abel.vesa@linaro.org> Fixes: 62b7d68 ("drm/msm/dpu: Filter modes based on adjusted mode clock") Signed-off-by: Jessica Zhang <jessica.zhang@oss.qualcomm.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Reviewed-by: Abel Vesa <abel.vesa@linaro.org> Tested-by: Abel Vesa <abel.vesa@linaro.org> Tested-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/676353/ Link: https://lore.kernel.org/r/20250923-modeclk-fix-v2-1-01fcd0b2465a@oss.qualcomm.com Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent b993999 commit 896bcee

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1546,6 +1546,9 @@ static enum drm_mode_status dpu_crtc_mode_valid(struct drm_crtc *crtc,
15461546
adjusted_mode_clk = dpu_core_perf_adjusted_mode_clk(mode->clock,
15471547
dpu_kms->perf.perf_cfg);
15481548

1549+
if (dpu_kms->catalog->caps->has_3d_merge)
1550+
adjusted_mode_clk /= 2;
1551+
15491552
/*
15501553
* The given mode, adjusted for the perf clock factor, should not exceed
15511554
* the max core clock rate

0 commit comments

Comments
 (0)