| Message ID | 20170203140316.20792-2-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. > > While at it, convert BUG() to MISSING_CASE() in the default case. > > v2: s/BUG/MISSING_CASE. (Chris) > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Jani Nikula <jani.nikula@linux.intel.com> > Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/intel_dp.c | 48 ++++++++++++++++++++++++----------------- > 1 file changed, 28 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 1a07072..5231965 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -5903,6 +5903,33 @@ 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 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; > + 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: > + MISSING_CASE(intel_dig_port->port); > + } > +} > + > bool > intel_dp_init_connector(struct intel_digital_port *intel_dig_port, > struct intel_connector *intel_connector) > @@ -5988,26 +6015,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; > - 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, 2017-02-03 at 16:22 +0200, Jani Nikula wrote: > 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. > > > > While at it, convert BUG() to MISSING_CASE() in the default case. > > > > v2: s/BUG/MISSING_CASE. (Chris) > > Cc: Chris Wilson <chris@chris-wilson.co.uk> > > Cc: Jani Nikula <jani.nikula@linux.intel.com> > > Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@inte > > l.com> > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> Merged up to here. Thanks for reviewing. Ander > > > > --- > > drivers/gpu/drm/i915/intel_dp.c | 48 ++++++++++++++++++++++++------------ > > ----- > > 1 file changed, 28 insertions(+), 20 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_dp.c > > b/drivers/gpu/drm/i915/intel_dp.c > > index 1a07072..5231965 100644 > > --- a/drivers/gpu/drm/i915/intel_dp.c > > +++ b/drivers/gpu/drm/i915/intel_dp.c > > @@ -5903,6 +5903,33 @@ 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 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; > > + 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: > > + MISSING_CASE(intel_dig_port->port); > > + } > > +} > > + > > bool > > intel_dp_init_connector(struct intel_digital_port *intel_dig_port, > > struct intel_connector *intel_connector) > > @@ -5988,26 +6015,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; > > - 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) && > >
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 1a07072..5231965 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -5903,6 +5903,33 @@ 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 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; + 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: + MISSING_CASE(intel_dig_port->port); + } +} + bool intel_dp_init_connector(struct intel_digital_port *intel_dig_port, struct intel_connector *intel_connector) @@ -5988,26 +6015,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; - 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. While at it, convert BUG() to MISSING_CASE() in the default case. v2: s/BUG/MISSING_CASE. (Chris) Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Jani Nikula <jani.nikula@linux.intel.com> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> --- drivers/gpu/drm/i915/intel_dp.c | 48 ++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 20 deletions(-)