Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge tag 'drm-intel-fixes-2025-04-17' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes
drm/i915 fixes for v6.15-rc3:
- Fix DP DSC configurations that require 3 DSC engines per pipe
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/87fri7p8tp.fsf@intel.com
+1
drivers/gpu/drm/i915/display/intel_display_device.h
+1
drivers/gpu/drm/i915/display/intel_display_device.h
···
161
161
#define HAS_DPT(__display) (DISPLAY_VER(__display) >= 13)
162
162
#define HAS_DSB(__display) (DISPLAY_INFO(__display)->has_dsb)
163
163
#define HAS_DSC(__display) (DISPLAY_RUNTIME_INFO(__display)->has_dsc)
164
+
#define HAS_DSC_3ENGINES(__display) (DISPLAY_VERx100(__display) == 1401 && HAS_DSC(__display))
164
165
#define HAS_DSC_MST(__display) (DISPLAY_VER(__display) >= 12 && HAS_DSC(__display))
165
166
#define HAS_FBC(__display) (DISPLAY_RUNTIME_INFO(__display)->fbc_mask != 0)
166
167
#define HAS_FBC_DIRTY_RECT(__display) (DISPLAY_VER(__display) >= 30)
+4
-3
drivers/gpu/drm/i915/display/intel_dp.c
+4
-3
drivers/gpu/drm/i915/display/intel_dp.c
···
1050
1050
u8 test_slice_count = valid_dsc_slicecount[i] * num_joined_pipes;
1051
1051
1052
1052
/*
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.
1055
1055
*/
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))
1057
1058
continue;
1058
1059
1059
1060
if (test_slice_count >