From: Ville Syrjälä Date: Thu, 22 Feb 2018 18:10:29 +0000 (+0200) Subject: drm/i915: Use the correct power domain for aux ch X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ff63861c15ecf451db34a47daa75b463ed4293f8;p=openwrt%2Fstaging%2Fblogic.git 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 #v1 Reviewed-by: Chris Wilson #v1 Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20180222181036.15251-1-ville.syrjala@linux.intel.com --- diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 1868f73f730c..388184bb9f3d 100644 --- 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;