Skip to content

Commit 3a47280

Browse files
aknautiyaljnikula
authored andcommitted
drm/i915/dp: Check for HAS_DSC_3ENGINES while configuring DSC slices
DSC 12 slices configuration is used for some specific cases with Ultrajoiner. This can be supported only when each of the 4 joined pipes have 3 DSC engines each. Add the missing check for 3 DSC engines support before using 3 DSC slices per pipe. Fixes: be7f5fc ("drm/i915/dp: Enable 3 DSC engines for 12 slices") Cc: Ankit Nautiyal <[email protected]> Cc: Suraj Kandpal <[email protected]> Cc: <[email protected]> # v6.14+ Signed-off-by: Ankit Nautiyal <[email protected]> Reviewed-by: Suraj Kandpal <[email protected]> Link: https://lore.kernel.org/r/[email protected] (cherry picked from commit da9b1c6) Signed-off-by: Jani Nikula <[email protected]>
1 parent ec0c7af commit 3a47280

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/gpu/drm/i915/display/intel_dp.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,10 +1050,11 @@ u8 intel_dp_dsc_get_slice_count(const struct intel_connector *connector,
10501050
u8 test_slice_count = valid_dsc_slicecount[i] * num_joined_pipes;
10511051

10521052
/*
1053-
* 3 DSC Slices per pipe need 3 DSC engines,
1054-
* which is supported only with Ultrajoiner.
1053+
* 3 DSC Slices per pipe need 3 DSC engines, which is supported only
1054+
* with Ultrajoiner only for some platforms.
10551055
*/
1056-
if (valid_dsc_slicecount[i] == 3 && num_joined_pipes != 4)
1056+
if (valid_dsc_slicecount[i] == 3 &&
1057+
(!HAS_DSC_3ENGINES(display) || num_joined_pipes != 4))
10571058
continue;
10581059

10591060
if (test_slice_count >

0 commit comments

Comments
 (0)