Skip to content

Commit

Permalink
Merge tag 'drm-intel-fixes-2024-07-02' of https://gitlab.freedesktop.…
Browse files Browse the repository at this point in the history
…org/drm/i915/kernel into drm-fixes

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

Signed-off-by: Daniel Vetter <[email protected]>
From: Jani Nikula <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
  • Loading branch information
danvet committed Jul 4, 2024
2 parents 22a40d1 + f723833 commit 4931c01
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/gpu/drm/i915/display/intel_ddi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 4931c01

Please sign in to comment.