Skip to content

Commit 79a6734

Browse files
committed
drm/i915/ddi: disable trancoder port select for 128b/132b SST
128b/1232b SST will have mst_master_transcoder set and matching cpu_transcoder. Ensure disable also for 128b/132b SST. Reviewed-by: Imre Deak <[email protected]> Co-developed-by: Imre Deak <[email protected]> Signed-off-by: Imre Deak <[email protected]> Signed-off-by: Jani Nikula <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/eaf705b3490d828ba33e85f40a7794d58de7c5ad.1735912293.git.jani.nikula@intel.com
1 parent 40d489f commit 79a6734

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,6 +658,7 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state
658658
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
659659
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
660660
enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
661+
bool is_mst = intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST);
661662
u32 ctl;
662663

663664
if (DISPLAY_VER(dev_priv) >= 11)
@@ -677,7 +678,8 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state
677678
TRANS_DDI_PORT_SYNC_MASTER_SELECT_MASK);
678679

679680
if (DISPLAY_VER(dev_priv) >= 12) {
680-
if (!intel_dp_mst_is_master_trans(crtc_state)) {
681+
if (!intel_dp_mst_is_master_trans(crtc_state) ||
682+
(!is_mst && intel_dp_is_uhbr(crtc_state))) {
681683
ctl &= ~(TGL_TRANS_DDI_PORT_MASK |
682684
TRANS_DDI_MODE_SELECT_MASK);
683685
}

0 commit comments

Comments
 (0)