Skip to content

Commit 51bc633

Browse files
vsyrjalarodrigovivi
authored andcommitted
drm/i915/mst: Limit MST+DSC to TGL+
The MST code currently assumes that glk+ already supports MST+DSC, which is incorrect. We need to check for TGL+ actually. ICL does support SST+DSC, but supposedly it can't do MST+FEC which will also rule out MST+DSC. Note that a straight TGL+ check doesn't work here because DSC support can get fused out, so we do need to also check 'has_dsc'. Cc: [email protected] Fixes: d51f25e ("drm/i915: Add DSC support to MST path") Reviewed-by: Uma Shankar <[email protected]> Signed-off-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit c9c92f2) Signed-off-by: Rodrigo Vivi <[email protected]>
1 parent f7caddf commit 51bc633

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

drivers/gpu/drm/i915/display/intel_display_device.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ struct drm_printer;
4747
#define HAS_DPT(i915) (DISPLAY_VER(i915) >= 13)
4848
#define HAS_DSB(i915) (DISPLAY_INFO(i915)->has_dsb)
4949
#define HAS_DSC(__i915) (DISPLAY_RUNTIME_INFO(__i915)->has_dsc)
50+
#define HAS_DSC_MST(__i915) (DISPLAY_VER(__i915) >= 12 && HAS_DSC(__i915))
5051
#define HAS_FBC(i915) (DISPLAY_RUNTIME_INFO(i915)->fbc_mask != 0)
5152
#define HAS_FPGA_DBG_UNCLAIMED(i915) (DISPLAY_INFO(i915)->has_fpga_dbg)
5253
#define HAS_FW_BLC(i915) (DISPLAY_VER(i915) >= 3)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1355,7 +1355,7 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector,
13551355
return 0;
13561356
}
13571357

1358-
if (DISPLAY_VER(dev_priv) >= 10 &&
1358+
if (HAS_DSC_MST(dev_priv) &&
13591359
drm_dp_sink_supports_dsc(intel_connector->dp.dsc_dpcd)) {
13601360
/*
13611361
* TBD pass the connector BPC,

0 commit comments

Comments
 (0)