]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
drm/msm/dpu: Only enable DSC_MODE_MULTIPLEX if dsc_merge is enabled
authorMarijn Suijten <marijn.suijten@somainline.org>
Sun, 4 Feb 2024 17:45:27 +0000 (18:45 +0100)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:19:47 +0000 (18:19 -0400)
commitfd0ce43cbde387bfdc66f4d919ea11992ab3ca40
treeed9aceb634fc6e67e21215d943d0ecf1efb0fcad
parent3bb4f4b162760536287eee298810bb5b89512f36
drm/msm/dpu: Only enable DSC_MODE_MULTIPLEX if dsc_merge is enabled

[ Upstream commit 06267d22f9ee6fd34150b6dcdb2fa6983e1a85bc ]

When the topology calls for two interfaces on the current fixed topology
of 2 DSC blocks, or uses 1 DSC block for a single interface (e.g. SC7280
with only one DSC block), there should be no merging of DSC output.

This is already represented by the return value of
dpu_encoder_use_dsc_merge(), but not yet used to correctly configure
this flag.

Fixes: 58dca9810749 ("drm/msm/disp/dpu1: Add support for DSC in encoder")
Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/577067/
Link: https://lore.kernel.org/r/20240204-dpu-dsc-multiplex-v1-1-080963233c52@somainline.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c