File tree Expand file tree Collapse file tree 1 file changed +3
-1
lines changed
drivers/gpu/drm/i915/display Expand file tree Collapse file tree 1 file changed +3
-1
lines changed Original file line number Diff line number Diff line change @@ -658,6 +658,7 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state
658
658
struct intel_crtc * crtc = to_intel_crtc (crtc_state -> uapi .crtc );
659
659
struct drm_i915_private * dev_priv = to_i915 (crtc -> base .dev );
660
660
enum transcoder cpu_transcoder = crtc_state -> cpu_transcoder ;
661
+ bool is_mst = intel_crtc_has_type (crtc_state , INTEL_OUTPUT_DP_MST );
661
662
u32 ctl ;
662
663
663
664
if (DISPLAY_VER (dev_priv ) >= 11 )
@@ -677,7 +678,8 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state
677
678
TRANS_DDI_PORT_SYNC_MASTER_SELECT_MASK );
678
679
679
680
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 ))) {
681
683
ctl &= ~(TGL_TRANS_DDI_PORT_MASK |
682
684
TRANS_DDI_MODE_SELECT_MASK );
683
685
}
You can’t perform that action at this time.
0 commit comments