| Message ID | 20170203133903.23247-1-ander.conselvan.de.oliveira@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 03 Feb 2017, Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> wrote: > This shaves a few lines from intel_dp_init_connector() and will serve as > a good place to add other port specific information in a follow up > patch. > > Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> > --- > drivers/gpu/drm/i915/intel_dp.c | 54 ++++++++++++++++++++++++----------------- > 1 file changed, 32 insertions(+), 22 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 2ab0192..5cac14f 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -5903,6 +5903,37 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, > return false; > } > > +static void > +intel_dp_init_connector_port_info(struct intel_digital_port *intel_dig_port) > +{ > + struct drm_i915_private *dev_priv = > + to_i915(intel_dig_port->base.base.dev); > + struct intel_encoder *encoder = &intel_dig_port->base; > + > + /* Set up the hotplug pin. */ > + switch (intel_dig_port->port) { > + case PORT_A: > + encoder->hpd_pin = HPD_PORT_A; > + break; > + case PORT_B: > + encoder->hpd_pin = HPD_PORT_B; > + if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) > + encoder->hpd_pin = HPD_PORT_A; Please add a patch on top (or first) to remove this BXT w/a. I think it has a counterpart in hdmi code, but didn't check. BR, Jani. > + break; > + case PORT_C: > + encoder->hpd_pin = HPD_PORT_C; > + break; > + case PORT_D: > + encoder->hpd_pin = HPD_PORT_D; > + break; > + case PORT_E: > + encoder->hpd_pin = HPD_PORT_E; > + break; > + default: > + BUG(); > + } > +} > + > bool > intel_dp_init_connector(struct intel_digital_port *intel_dig_port, > struct intel_connector *intel_connector) > @@ -5988,28 +6019,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, > else > intel_connector->get_hw_state = intel_connector_get_hw_state; > > - /* Set up the hotplug pin. */ > - switch (port) { > - case PORT_A: > - intel_encoder->hpd_pin = HPD_PORT_A; > - break; > - case PORT_B: > - intel_encoder->hpd_pin = HPD_PORT_B; > - if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) > - intel_encoder->hpd_pin = HPD_PORT_A; > - break; > - case PORT_C: > - intel_encoder->hpd_pin = HPD_PORT_C; > - break; > - case PORT_D: > - intel_encoder->hpd_pin = HPD_PORT_D; > - break; > - case PORT_E: > - intel_encoder->hpd_pin = HPD_PORT_E; > - break; > - default: > - BUG(); > - } > + intel_dp_init_connector_port_info(intel_dig_port); > > /* init MST on ports that can support it */ > if (HAS_DP_MST(dev_priv) && !is_edp(intel_dp) &&
On Fri, Feb 03, 2017 at 03:39:01PM +0200, Ander Conselvan de Oliveira wrote: > This shaves a few lines from intel_dp_init_connector() and will serve as > a good place to add other port specific information in a follow up > patch. > > Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> > --- > drivers/gpu/drm/i915/intel_dp.c | 54 ++++++++++++++++++++++++----------------- > 1 file changed, 32 insertions(+), 22 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 2ab0192..5cac14f 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -5903,6 +5903,37 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, > return false; > } > > +static void > +intel_dp_init_connector_port_info(struct intel_digital_port *intel_dig_port) > +{ > + struct drm_i915_private *dev_priv = > + to_i915(intel_dig_port->base.base.dev); > + struct intel_encoder *encoder = &intel_dig_port->base; > + > + /* Set up the hotplug pin. */ > + switch (intel_dig_port->port) { > + case PORT_A: > + encoder->hpd_pin = HPD_PORT_A; > + break; > + case PORT_B: > + encoder->hpd_pin = HPD_PORT_B; > + if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) > + encoder->hpd_pin = HPD_PORT_A; > + break; > + case PORT_C: > + encoder->hpd_pin = HPD_PORT_C; > + break; > + case PORT_D: > + encoder->hpd_pin = HPD_PORT_D; > + break; > + case PORT_E: > + encoder->hpd_pin = HPD_PORT_E; > + break; > + default: > + BUG(); MISSING_CASE(intel_dig_port->port); -Chris
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 2ab0192..5cac14f 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -5903,6 +5903,37 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, return false; } +static void +intel_dp_init_connector_port_info(struct intel_digital_port *intel_dig_port) +{ + struct drm_i915_private *dev_priv = + to_i915(intel_dig_port->base.base.dev); + struct intel_encoder *encoder = &intel_dig_port->base; + + /* Set up the hotplug pin. */ + switch (intel_dig_port->port) { + case PORT_A: + encoder->hpd_pin = HPD_PORT_A; + break; + case PORT_B: + encoder->hpd_pin = HPD_PORT_B; + if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) + encoder->hpd_pin = HPD_PORT_A; + break; + case PORT_C: + encoder->hpd_pin = HPD_PORT_C; + break; + case PORT_D: + encoder->hpd_pin = HPD_PORT_D; + break; + case PORT_E: + encoder->hpd_pin = HPD_PORT_E; + break; + default: + BUG(); + } +} + bool intel_dp_init_connector(struct intel_digital_port *intel_dig_port, struct intel_connector *intel_connector) @@ -5988,28 +6019,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, else intel_connector->get_hw_state = intel_connector_get_hw_state; - /* Set up the hotplug pin. */ - switch (port) { - case PORT_A: - intel_encoder->hpd_pin = HPD_PORT_A; - break; - case PORT_B: - intel_encoder->hpd_pin = HPD_PORT_B; - if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) - intel_encoder->hpd_pin = HPD_PORT_A; - break; - case PORT_C: - intel_encoder->hpd_pin = HPD_PORT_C; - break; - case PORT_D: - intel_encoder->hpd_pin = HPD_PORT_D; - break; - case PORT_E: - intel_encoder->hpd_pin = HPD_PORT_E; - break; - default: - BUG(); - } + intel_dp_init_connector_port_info(intel_dig_port); /* init MST on ports that can support it */ if (HAS_DP_MST(dev_priv) && !is_edp(intel_dp) &&
This shaves a few lines from intel_dp_init_connector() and will serve as a good place to add other port specific information in a follow up patch. Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> --- drivers/gpu/drm/i915/intel_dp.c | 54 ++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 22 deletions(-)