| Message ID | 20200622232821.3093-2-lucas.demarchi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Variable renames | expand |
On Mon, Jun 22, 2020 at 04:28:20PM -0700, Lucas De Marchi wrote: > We don't need intel_dig_port and dig_port to refer to the same thing. > Prefer the latter. > > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> > Reviewed-by: Matt Roper <matthew.d.roper@intel.com> > --- > drivers/gpu/drm/i915/display/intel_ddi.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index ca7bb2294d2b..58c9f3d3e7ce 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -3382,11 +3382,10 @@ static void intel_ddi_pre_enable_hdmi(struct intel_atomic_state *state, > const struct intel_crtc_state *crtc_state, > const struct drm_connector_state *conn_state) > { > - struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder); > - struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi; > + struct intel_digital_port *dig_port = enc_to_dig_port(encoder); > + struct intel_hdmi *intel_hdmi = &dig_port->hdmi; > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > int level = intel_ddi_hdmi_level(encoder); > - struct intel_digital_port *dig_port = enc_to_dig_port(encoder); > > intel_dp_dual_mode_set_tmds_output(intel_hdmi, true); > intel_ddi_clk_select(encoder, crtc_state); > @@ -3413,7 +3412,7 @@ static void intel_ddi_pre_enable_hdmi(struct intel_atomic_state *state, > > intel_ddi_enable_pipe_clock(encoder, crtc_state); > > - intel_dig_port->set_infoframes(encoder, > + dig_port->set_infoframes(encoder, > crtc_state->has_infoframe, > crtc_state, conn_state); Misalinged parameters staring me in the face here. Didn't trawl the other patch for similar since it's so big. > } > -- > 2.26.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Tue, Jun 23, 2020 at 05:16:06PM +0300, Ville Syrjälä wrote: >On Mon, Jun 22, 2020 at 04:28:20PM -0700, Lucas De Marchi wrote: >> We don't need intel_dig_port and dig_port to refer to the same thing. >> Prefer the latter. >> >> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> >> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> >> --- >> drivers/gpu/drm/i915/display/intel_ddi.c | 7 +++---- >> 1 file changed, 3 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c >> index ca7bb2294d2b..58c9f3d3e7ce 100644 >> --- a/drivers/gpu/drm/i915/display/intel_ddi.c >> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c >> @@ -3382,11 +3382,10 @@ static void intel_ddi_pre_enable_hdmi(struct intel_atomic_state *state, >> const struct intel_crtc_state *crtc_state, >> const struct drm_connector_state *conn_state) >> { >> - struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder); >> - struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi; >> + struct intel_digital_port *dig_port = enc_to_dig_port(encoder); >> + struct intel_hdmi *intel_hdmi = &dig_port->hdmi; >> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); >> int level = intel_ddi_hdmi_level(encoder); >> - struct intel_digital_port *dig_port = enc_to_dig_port(encoder); >> >> intel_dp_dual_mode_set_tmds_output(intel_hdmi, true); >> intel_ddi_clk_select(encoder, crtc_state); >> @@ -3413,7 +3412,7 @@ static void intel_ddi_pre_enable_hdmi(struct intel_atomic_state *state, >> >> intel_ddi_enable_pipe_clock(encoder, crtc_state); >> >> - intel_dig_port->set_infoframes(encoder, >> + dig_port->set_infoframes(encoder, >> crtc_state->has_infoframe, >> crtc_state, conn_state); > >Misalinged parameters staring me in the face here. Didn't trawl the >other patch for similar since it's so big. I did review the second one for misaligned things. I think I forgot to go back to this one because only after some review I noticed checkpatch was not failing for me for these misaligned parameters, not sure why. Lucas De Marchi > >> } >> -- >> 2.26.2 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx > >-- >Ville Syrjälä >Intel
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index ca7bb2294d2b..58c9f3d3e7ce 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -3382,11 +3382,10 @@ static void intel_ddi_pre_enable_hdmi(struct intel_atomic_state *state, const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { - struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder); - struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi; + struct intel_digital_port *dig_port = enc_to_dig_port(encoder); + struct intel_hdmi *intel_hdmi = &dig_port->hdmi; struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); int level = intel_ddi_hdmi_level(encoder); - struct intel_digital_port *dig_port = enc_to_dig_port(encoder); intel_dp_dual_mode_set_tmds_output(intel_hdmi, true); intel_ddi_clk_select(encoder, crtc_state); @@ -3413,7 +3412,7 @@ static void intel_ddi_pre_enable_hdmi(struct intel_atomic_state *state, intel_ddi_enable_pipe_clock(encoder, crtc_state); - intel_dig_port->set_infoframes(encoder, + dig_port->set_infoframes(encoder, crtc_state->has_infoframe, crtc_state, conn_state); }