| Message ID | b3ee81c448f012424f0507b3ab41142d6f73251f.1394808141.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
I would prefer an else instead of unecessary comparisons and assignment that will be override.. But anyway it works, so feel free to use: Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> On Fri, Mar 14, 2014 at 11:51 AM, Jani Nikula <jani.nikula@intel.com> wrote: > Do a slight rearrangement of the switch to prep for follow-up. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/intel_dp.c | 42 ++++++++++++++++++++------------------- > 1 file changed, 22 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 24cbf4bd36c4..71a76d00d634 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -643,6 +643,28 @@ static void > intel_dp_aux_init(struct intel_dp *intel_dp, struct intel_connector *connector) > { > struct drm_device *dev = intel_dp_to_dev(intel_dp); > + struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); > + enum port port = intel_dig_port->port; > + > + switch (port) { > + case PORT_A: > + intel_dp->aux_ch_ctl_reg = DPA_AUX_CH_CTL; > + break; > + case PORT_B: > + intel_dp->aux_ch_ctl_reg = PCH_DPB_AUX_CH_CTL; > + break; > + case PORT_C: > + intel_dp->aux_ch_ctl_reg = PCH_DPC_AUX_CH_CTL; > + break; > + case PORT_D: > + intel_dp->aux_ch_ctl_reg = PCH_DPD_AUX_CH_CTL; > + break; > + default: > + BUG(); > + } > + > + if (!HAS_DDI(dev)) > + intel_dp->aux_ch_ctl_reg = intel_dp->output_reg + 0x10; > > intel_dp->aux.dev = dev->dev; > intel_dp->aux.transfer = intel_dp_aux_transfer; > @@ -3849,26 +3871,6 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, > intel_connector->get_hw_state = intel_connector_get_hw_state; > intel_connector->unregister = intel_dp_connector_unregister; > > - intel_dp->aux_ch_ctl_reg = intel_dp->output_reg + 0x10; > - if (HAS_DDI(dev)) { > - switch (intel_dig_port->port) { > - case PORT_A: > - intel_dp->aux_ch_ctl_reg = DPA_AUX_CH_CTL; > - break; > - case PORT_B: > - intel_dp->aux_ch_ctl_reg = PCH_DPB_AUX_CH_CTL; > - break; > - case PORT_C: > - intel_dp->aux_ch_ctl_reg = PCH_DPC_AUX_CH_CTL; > - break; > - case PORT_D: > - intel_dp->aux_ch_ctl_reg = PCH_DPD_AUX_CH_CTL; > - break; > - default: > - BUG(); > - } > - } > - > /* Set up the DDC bus. */ > switch (port) { > case PORT_A: > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Mon, 17 Mar 2014, Rodrigo Vivi <rodrigo.vivi@gmail.com> wrote: > I would prefer an else instead of unecessary comparisons and > assignment that will be override.. In general I agree, but see next patch. ;) BR, Jani. > > But anyway it works, so feel free to use: > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> > > On Fri, Mar 14, 2014 at 11:51 AM, Jani Nikula <jani.nikula@intel.com> wrote: >> Do a slight rearrangement of the switch to prep for follow-up. >> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> >> --- >> drivers/gpu/drm/i915/intel_dp.c | 42 ++++++++++++++++++++------------------- >> 1 file changed, 22 insertions(+), 20 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c >> index 24cbf4bd36c4..71a76d00d634 100644 >> --- a/drivers/gpu/drm/i915/intel_dp.c >> +++ b/drivers/gpu/drm/i915/intel_dp.c >> @@ -643,6 +643,28 @@ static void >> intel_dp_aux_init(struct intel_dp *intel_dp, struct intel_connector *connector) >> { >> struct drm_device *dev = intel_dp_to_dev(intel_dp); >> + struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); >> + enum port port = intel_dig_port->port; >> + >> + switch (port) { >> + case PORT_A: >> + intel_dp->aux_ch_ctl_reg = DPA_AUX_CH_CTL; >> + break; >> + case PORT_B: >> + intel_dp->aux_ch_ctl_reg = PCH_DPB_AUX_CH_CTL; >> + break; >> + case PORT_C: >> + intel_dp->aux_ch_ctl_reg = PCH_DPC_AUX_CH_CTL; >> + break; >> + case PORT_D: >> + intel_dp->aux_ch_ctl_reg = PCH_DPD_AUX_CH_CTL; >> + break; >> + default: >> + BUG(); >> + } >> + >> + if (!HAS_DDI(dev)) >> + intel_dp->aux_ch_ctl_reg = intel_dp->output_reg + 0x10; >> >> intel_dp->aux.dev = dev->dev; >> intel_dp->aux.transfer = intel_dp_aux_transfer; >> @@ -3849,26 +3871,6 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, >> intel_connector->get_hw_state = intel_connector_get_hw_state; >> intel_connector->unregister = intel_dp_connector_unregister; >> >> - intel_dp->aux_ch_ctl_reg = intel_dp->output_reg + 0x10; >> - if (HAS_DDI(dev)) { >> - switch (intel_dig_port->port) { >> - case PORT_A: >> - intel_dp->aux_ch_ctl_reg = DPA_AUX_CH_CTL; >> - break; >> - case PORT_B: >> - intel_dp->aux_ch_ctl_reg = PCH_DPB_AUX_CH_CTL; >> - break; >> - case PORT_C: >> - intel_dp->aux_ch_ctl_reg = PCH_DPC_AUX_CH_CTL; >> - break; >> - case PORT_D: >> - intel_dp->aux_ch_ctl_reg = PCH_DPD_AUX_CH_CTL; >> - break; >> - default: >> - BUG(); >> - } >> - } >> - >> /* Set up the DDC bus. */ >> switch (port) { >> case PORT_A: >> -- >> 1.7.9.5 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > > > -- > Rodrigo Vivi > Blog: http://blog.vivi.eng.br
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 24cbf4bd36c4..71a76d00d634 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -643,6 +643,28 @@ static void intel_dp_aux_init(struct intel_dp *intel_dp, struct intel_connector *connector) { struct drm_device *dev = intel_dp_to_dev(intel_dp); + struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); + enum port port = intel_dig_port->port; + + switch (port) { + case PORT_A: + intel_dp->aux_ch_ctl_reg = DPA_AUX_CH_CTL; + break; + case PORT_B: + intel_dp->aux_ch_ctl_reg = PCH_DPB_AUX_CH_CTL; + break; + case PORT_C: + intel_dp->aux_ch_ctl_reg = PCH_DPC_AUX_CH_CTL; + break; + case PORT_D: + intel_dp->aux_ch_ctl_reg = PCH_DPD_AUX_CH_CTL; + break; + default: + BUG(); + } + + if (!HAS_DDI(dev)) + intel_dp->aux_ch_ctl_reg = intel_dp->output_reg + 0x10; intel_dp->aux.dev = dev->dev; intel_dp->aux.transfer = intel_dp_aux_transfer; @@ -3849,26 +3871,6 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, intel_connector->get_hw_state = intel_connector_get_hw_state; intel_connector->unregister = intel_dp_connector_unregister; - intel_dp->aux_ch_ctl_reg = intel_dp->output_reg + 0x10; - if (HAS_DDI(dev)) { - switch (intel_dig_port->port) { - case PORT_A: - intel_dp->aux_ch_ctl_reg = DPA_AUX_CH_CTL; - break; - case PORT_B: - intel_dp->aux_ch_ctl_reg = PCH_DPB_AUX_CH_CTL; - break; - case PORT_C: - intel_dp->aux_ch_ctl_reg = PCH_DPC_AUX_CH_CTL; - break; - case PORT_D: - intel_dp->aux_ch_ctl_reg = PCH_DPD_AUX_CH_CTL; - break; - default: - BUG(); - } - } - /* Set up the DDC bus. */ switch (port) { case PORT_A:
Do a slight rearrangement of the switch to prep for follow-up. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/intel_dp.c | 42 ++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 20 deletions(-)