diff options
| author | Ville Syrjälä <[email protected]> | 2023-02-17 01:13:11 +0200 |
|---|---|---|
| committer | Ville Syrjälä <[email protected]> | 2023-02-17 23:17:10 +0200 |
| commit | 01a789fa45bb0802cb396f4f30b1351840ce0c09 (patch) | |
| tree | 37fcde122fb194d900e22e1275e29b805e06797f | |
| parent | fce187ca0cdd6dc707db2c7c22b863cd8bb91ef8 (diff) | |
drm/i915: Fix platform default aux ch for skl
SKL/derivatives have DDI E but no AUX E, so we need to pick
another aux ch as the platform default. DDI E is more or less
the other half of DDI A, so we pick AUX A.
In all other cases we should have a corresponding aux ch for
each DDI.
Signed-off-by: Ville Syrjälä <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: Ankit Nautiyal <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_aux.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux.c b/drivers/gpu/drm/i915/display/intel_dp_aux.c index 57eb3ff187fa..96967e21c94c 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_aux.c +++ b/drivers/gpu/drm/i915/display/intel_dp_aux.c @@ -739,10 +739,20 @@ void intel_dp_aux_init(struct intel_dp *intel_dp) cpu_latency_qos_add_request(&intel_dp->pm_qos, PM_QOS_DEFAULT_VALUE); } +static enum aux_ch default_aux_ch(struct intel_encoder *encoder) +{ + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + + /* SKL has DDI E but no AUX E */ + if (DISPLAY_VER(i915) == 9 && encoder->port == PORT_E) + return AUX_CH_A; + + return (enum aux_ch)encoder->port; +} + enum aux_ch intel_dp_aux_ch(struct intel_encoder *encoder) { struct drm_i915_private *i915 = to_i915(encoder->base.dev); - enum port port = encoder->port; enum aux_ch aux_ch; aux_ch = intel_bios_dp_aux_ch(encoder->devdata); @@ -753,7 +763,7 @@ enum aux_ch intel_dp_aux_ch(struct intel_encoder *encoder) return aux_ch; } - aux_ch = (enum aux_ch)port; + aux_ch = default_aux_ch(encoder); drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s] using AUX %c (platform default)\n", |