Browse Source

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 <rodrigo.vivi@intel.com> #v1
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> #v1
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180222181036.15251-1-ville.syrjala@linux.intel.com
Ville Syrjälä 7 years ago
parent
commit
ff63861c15
1 changed files with 1 additions and 5 deletions
  1. 1 5
      drivers/gpu/drm/i915/intel_dp.c

+ 1 - 5
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);
 	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:
 	case PORT_A:
 		intel_dp->aux_power_domain = POWER_DOMAIN_AUX_A;
 		intel_dp->aux_power_domain = POWER_DOMAIN_AUX_A;
 		break;
 		break;
@@ -6033,10 +6033,6 @@ intel_dp_init_connector_port_info(struct intel_digital_port *intel_dig_port)
 	case PORT_D:
 	case PORT_D:
 		intel_dp->aux_power_domain = POWER_DOMAIN_AUX_D;
 		intel_dp->aux_power_domain = POWER_DOMAIN_AUX_D;
 		break;
 		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:
 	case PORT_F:
 		intel_dp->aux_power_domain = POWER_DOMAIN_AUX_F;
 		intel_dp->aux_power_domain = POWER_DOMAIN_AUX_F;
 		break;
 		break;