Skip to content

Commit 1ec793b

Browse files
lumaggregkh
authored andcommitted
drm/msm/dpu: don't try using 2 LMs if only one DSC is available
[ Upstream commit b9699dd ] Current topology code will try using 2 LMs with just one DSC, which breaks cases like SC7280 / Fairphone5. Forbid using 2 LMs split in such a case. Fixes: 1ce69c2 ("drm/msm/dpu: move resource allocation to CRTC") Reported-by: Luca Weiss <luca.weiss@fairphone.com> Closes: https://lore.kernel.org/r/DH1IKLU0YZYU.2SW4WYO7H3H4R@fairphone.com/ Tested-by: Luca Weiss <luca.weiss@fairphone.com> # qcm6490-fairphone-fp5 Patchwork: https://patchwork.freedesktop.org/patch/712386/ Link: https://lore.kernel.org/r/20260317-fix-3d-dsc-v1-1-88b54f62f659@oss.qualcomm.com Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 79600b5 commit 1ec793b

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1410,7 +1410,8 @@ static struct msm_display_topology dpu_crtc_get_topology(
14101410
topology.num_lm = 2;
14111411
else if (topology.num_dsc == 2)
14121412
topology.num_lm = 2;
1413-
else if (dpu_kms->catalog->caps->has_3d_merge)
1413+
else if (dpu_kms->catalog->caps->has_3d_merge &&
1414+
topology.num_dsc == 0)
14141415
topology.num_lm = (mode->hdisplay > MAX_HDISPLAY_SPLIT) ? 2 : 1;
14151416
else
14161417
topology.num_lm = 1;

0 commit comments

Comments
 (0)