Commit 4931c01b authored by Simona Vetter's avatar Simona Vetter
Browse files

Merge tag 'drm-intel-fixes-2024-07-02' of... 

Merge tag 'drm-intel-fixes-2024-07-02' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-fixes

drm/i915 fixes for v6.10-rc7:
- Skip unnecessary MG programming, avoiding warnings (Imre)

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87frss9ozs.fsf@intel.com
parents 22a40d14 f7238337

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

+3 −0
Original line number Diff line number Diff line
@@ -2088,6 +2088,9 @@ icl_program_mg_dp_mode(struct intel_digital_port *dig_port, 
	u32 ln0, ln1, pin_assignment;

	u8 width;



	if (DISPLAY_VER(dev_priv) >= 14)

		return;



	if (!intel_encoder_is_tc(&dig_port->base) ||

	    intel_tc_port_in_tbt_alt_mode(dig_port))

		return;