drm/i915: Use the correct power domain for aux ch

Select the aux power domain based on the aux ch rather than based on
the port. Now we can rid ourselves of the port E FIXME as well.

v2: Split from the enum aux_ch patch (Rodrigo)

Reviewed-by: Rodrigo Vivi <[email protected]> #v1
Reviewed-by: Chris Wilson <[email protected]> #v1
Signed-off-by: Ville Syrjälä <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 1868f73f730c9c151e050befff3e5f0506b9ed8d..388184bb9f3db5d8dad719c1f02364d4f6e442c2 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -6020,7 +6020,7 @@ intel_dp_init_connector_port_info(struct intel_digital_port *intel_dig_port)
 
        encoder->hpd_pin = intel_hpd_pin_default(dev_priv, encoder->port);
 
-       switch (encoder->port) {
+       switch (intel_aux_port(dev_priv, encoder->port)) {
        case PORT_A:
                intel_dp->aux_power_domain = POWER_DOMAIN_AUX_A;
                break;
@@ -6033,10 +6033,6 @@ intel_dp_init_connector_port_info(struct intel_digital_port *intel_dig_port)
        case PORT_D:
                intel_dp->aux_power_domain = POWER_DOMAIN_AUX_D;
                break;
-       case PORT_E:
-               /* FIXME: Check VBT for actual wiring of PORT E */
-               intel_dp->aux_power_domain = POWER_DOMAIN_AUX_D;
-               break;
        case PORT_F:
                intel_dp->aux_power_domain = POWER_DOMAIN_AUX_F;
                break;