Reviewed-by: Mika Kahola <mika.kahola@xxxxxxxxx> On Fri, 2015-09-25 at 16:37 +0300, ville.syrjala@xxxxxxxxxxxxxxx wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Rename the function argument to 'adjusted_mode' whenever the function > only ever gets passed the adjusted_mode. > > v2: Update due to intel_dsi.c changes > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/i915_drv.h | 2 +- > drivers/gpu/drm/i915/intel_audio.c | 17 +++++++++-------- > drivers/gpu/drm/i915/intel_dsi.c | 22 +++++++++++----------- > drivers/gpu/drm/i915/intel_panel.c | 36 ++++++++++++++++++------------------ > drivers/gpu/drm/i915/intel_sdvo.c | 6 +++--- > drivers/gpu/drm/i915/intel_sprite.c | 8 +++++--- > 6 files changed, 47 insertions(+), 44 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 2b5d587..d1e800a 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -646,7 +646,7 @@ struct drm_i915_display_funcs { > void (*crtc_disable)(struct drm_crtc *crtc); > void (*audio_codec_enable)(struct drm_connector *connector, > struct intel_encoder *encoder, > - struct drm_display_mode *mode); > + const struct drm_display_mode *adjusted_mode); > void (*audio_codec_disable)(struct intel_encoder *encoder); > void (*fdi_link_train)(struct drm_crtc *crtc); > void (*init_clock_gating)(struct drm_device *dev); > diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c > index d9876c5..779f90c 100644 > --- a/drivers/gpu/drm/i915/intel_audio.c > +++ b/drivers/gpu/drm/i915/intel_audio.c > @@ -69,17 +69,18 @@ static const struct { > }; > > /* get AUD_CONFIG_PIXEL_CLOCK_HDMI_* value for mode */ > -static u32 audio_config_hdmi_pixel_clock(struct drm_display_mode *mode) > +static u32 audio_config_hdmi_pixel_clock(const struct drm_display_mode *adjusted_mode) > { > int i; > > for (i = 0; i < ARRAY_SIZE(hdmi_audio_clock); i++) { > - if (mode->clock == hdmi_audio_clock[i].clock) > + if (adjusted_mode->clock == hdmi_audio_clock[i].clock) > break; > } > > if (i == ARRAY_SIZE(hdmi_audio_clock)) { > - DRM_DEBUG_KMS("HDMI audio pixel clock setting for %d not found, falling back to defaults\n", mode->clock); > + DRM_DEBUG_KMS("HDMI audio pixel clock setting for %d not found, falling back to defaults\n", > + adjusted_mode->clock); > i = 1; > } > > @@ -138,7 +139,7 @@ static void g4x_audio_codec_disable(struct intel_encoder *encoder) > > static void g4x_audio_codec_enable(struct drm_connector *connector, > struct intel_encoder *encoder, > - struct drm_display_mode *mode) > + const struct drm_display_mode *adjusted_mode) > { > struct drm_i915_private *dev_priv = connector->dev->dev_private; > uint8_t *eld = connector->eld; > @@ -203,7 +204,7 @@ static void hsw_audio_codec_disable(struct intel_encoder *encoder) > > static void hsw_audio_codec_enable(struct drm_connector *connector, > struct intel_encoder *encoder, > - struct drm_display_mode *mode) > + const struct drm_display_mode *adjusted_mode) > { > struct drm_i915_private *dev_priv = connector->dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); > @@ -251,7 +252,7 @@ static void hsw_audio_codec_enable(struct drm_connector *connector, > if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT)) > tmp |= AUD_CONFIG_N_VALUE_INDEX; > else > - tmp |= audio_config_hdmi_pixel_clock(mode); > + tmp |= audio_config_hdmi_pixel_clock(adjusted_mode); > I915_WRITE(HSW_AUD_CFG(pipe), tmp); > } > > @@ -304,7 +305,7 @@ static void ilk_audio_codec_disable(struct intel_encoder *encoder) > > static void ilk_audio_codec_enable(struct drm_connector *connector, > struct intel_encoder *encoder, > - struct drm_display_mode *mode) > + const struct drm_display_mode *adjusted_mode) > { > struct drm_i915_private *dev_priv = connector->dev->dev_private; > struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); > @@ -381,7 +382,7 @@ static void ilk_audio_codec_enable(struct drm_connector *connector, > if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT)) > tmp |= AUD_CONFIG_N_VALUE_INDEX; > else > - tmp |= audio_config_hdmi_pixel_clock(mode); > + tmp |= audio_config_hdmi_pixel_clock(adjusted_mode); > I915_WRITE(aud_config, tmp); > } > > diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c > index 23b7fc5..b4d5213 100644 > --- a/drivers/gpu/drm/i915/intel_dsi.c > +++ b/drivers/gpu/drm/i915/intel_dsi.c > @@ -698,7 +698,7 @@ static u16 txbyteclkhs(u16 pixels, int bpp, int lane_count, > } > > static void set_dsi_timings(struct drm_encoder *encoder, > - const struct drm_display_mode *mode) > + const struct drm_display_mode *adjusted_mode) > { > struct drm_device *dev = encoder->dev; > struct drm_i915_private *dev_priv = dev->dev_private; > @@ -710,10 +710,10 @@ static void set_dsi_timings(struct drm_encoder *encoder, > > u16 hactive, hfp, hsync, hbp, vfp, vsync, vbp; > > - hactive = mode->hdisplay; > - hfp = mode->hsync_start - mode->hdisplay; > - hsync = mode->hsync_end - mode->hsync_start; > - hbp = mode->htotal - mode->hsync_end; > + hactive = adjusted_mode->hdisplay; > + hfp = adjusted_mode->hsync_start - adjusted_mode->hdisplay; > + hsync = adjusted_mode->hsync_end - adjusted_mode->hsync_start; > + hbp = adjusted_mode->htotal - adjusted_mode->hsync_end; > > if (intel_dsi->dual_link) { > hactive /= 2; > @@ -724,9 +724,9 @@ static void set_dsi_timings(struct drm_encoder *encoder, > hbp /= 2; > } > > - vfp = mode->vsync_start - mode->vdisplay; > - vsync = mode->vsync_end - mode->vsync_start; > - vbp = mode->vtotal - mode->vsync_end; > + vfp = adjusted_mode->vsync_start - adjusted_mode->vdisplay; > + vsync = adjusted_mode->vsync_end - adjusted_mode->vsync_start; > + vbp = adjusted_mode->vtotal - adjusted_mode->vsync_end; > > /* horizontal values are in terms of high speed byte clock */ > hactive = txbyteclkhs(hactive, bpp, lane_count, > @@ -745,11 +745,11 @@ static void set_dsi_timings(struct drm_encoder *encoder, > * whereas these values should be based on resolution. > */ > I915_WRITE(BXT_MIPI_TRANS_HACTIVE(port), > - mode->hdisplay); > + adjusted_mode->hdisplay); > I915_WRITE(BXT_MIPI_TRANS_VACTIVE(port), > - mode->vdisplay); > + adjusted_mode->vdisplay); > I915_WRITE(BXT_MIPI_TRANS_VTOTAL(port), > - mode->vtotal); > + adjusted_mode->vtotal); > } > > I915_WRITE(MIPI_HACTIVE_AREA_COUNT(port), hactive); > diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c > index 2c11b4e..4294f605 100644 > --- a/drivers/gpu/drm/i915/intel_panel.c > +++ b/drivers/gpu/drm/i915/intel_panel.c > @@ -172,46 +172,46 @@ done: > } > > static void > -centre_horizontally(struct drm_display_mode *mode, > +centre_horizontally(struct drm_display_mode *adjusted_mode, > int width) > { > u32 border, sync_pos, blank_width, sync_width; > > /* keep the hsync and hblank widths constant */ > - sync_width = mode->crtc_hsync_end - mode->crtc_hsync_start; > - blank_width = mode->crtc_hblank_end - mode->crtc_hblank_start; > + sync_width = adjusted_mode->crtc_hsync_end - adjusted_mode->crtc_hsync_start; > + blank_width = adjusted_mode->crtc_hblank_end - adjusted_mode->crtc_hblank_start; > sync_pos = (blank_width - sync_width + 1) / 2; > > - border = (mode->hdisplay - width + 1) / 2; > + border = (adjusted_mode->hdisplay - width + 1) / 2; > border += border & 1; /* make the border even */ > > - mode->crtc_hdisplay = width; > - mode->crtc_hblank_start = width + border; > - mode->crtc_hblank_end = mode->crtc_hblank_start + blank_width; > + adjusted_mode->crtc_hdisplay = width; > + adjusted_mode->crtc_hblank_start = width + border; > + adjusted_mode->crtc_hblank_end = adjusted_mode->crtc_hblank_start + blank_width; > > - mode->crtc_hsync_start = mode->crtc_hblank_start + sync_pos; > - mode->crtc_hsync_end = mode->crtc_hsync_start + sync_width; > + adjusted_mode->crtc_hsync_start = adjusted_mode->crtc_hblank_start + sync_pos; > + adjusted_mode->crtc_hsync_end = adjusted_mode->crtc_hsync_start + sync_width; > } > > static void > -centre_vertically(struct drm_display_mode *mode, > +centre_vertically(struct drm_display_mode *adjusted_mode, > int height) > { > u32 border, sync_pos, blank_width, sync_width; > > /* keep the vsync and vblank widths constant */ > - sync_width = mode->crtc_vsync_end - mode->crtc_vsync_start; > - blank_width = mode->crtc_vblank_end - mode->crtc_vblank_start; > + sync_width = adjusted_mode->crtc_vsync_end - adjusted_mode->crtc_vsync_start; > + blank_width = adjusted_mode->crtc_vblank_end - adjusted_mode->crtc_vblank_start; > sync_pos = (blank_width - sync_width + 1) / 2; > > - border = (mode->vdisplay - height + 1) / 2; > + border = (adjusted_mode->vdisplay - height + 1) / 2; > > - mode->crtc_vdisplay = height; > - mode->crtc_vblank_start = height + border; > - mode->crtc_vblank_end = mode->crtc_vblank_start + blank_width; > + adjusted_mode->crtc_vdisplay = height; > + adjusted_mode->crtc_vblank_start = height + border; > + adjusted_mode->crtc_vblank_end = adjusted_mode->crtc_vblank_start + blank_width; > > - mode->crtc_vsync_start = mode->crtc_vblank_start + sync_pos; > - mode->crtc_vsync_end = mode->crtc_vsync_start + sync_width; > + adjusted_mode->crtc_vsync_start = adjusted_mode->crtc_vblank_start + sync_pos; > + adjusted_mode->crtc_vsync_end = adjusted_mode->crtc_vsync_start + sync_width; > } > > static inline u32 panel_fitter_scaling(u32 source, u32 target) > diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c > index b0b96fd..ab75b61 100644 > --- a/drivers/gpu/drm/i915/intel_sdvo.c > +++ b/drivers/gpu/drm/i915/intel_sdvo.c > @@ -603,11 +603,11 @@ log_fail: > return false; > } > > -static int intel_sdvo_get_pixel_multiplier(struct drm_display_mode *mode) > +static int intel_sdvo_get_pixel_multiplier(const struct drm_display_mode *adjusted_mode) > { > - if (mode->clock >= 100000) > + if (adjusted_mode->clock >= 100000) > return 1; > - else if (mode->clock >= 50000) > + else if (adjusted_mode->clock >= 50000) > return 2; > else > return 4; > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c > index 8218040..b229c67 100644 > --- a/drivers/gpu/drm/i915/intel_sprite.c > +++ b/drivers/gpu/drm/i915/intel_sprite.c > @@ -53,13 +53,15 @@ format_is_yuv(uint32_t format) > } > } > > -static int usecs_to_scanlines(const struct drm_display_mode *mode, int usecs) > +static int usecs_to_scanlines(const struct drm_display_mode *adjusted_mode, > + int usecs) > { > /* paranoia */ > - if (!mode->crtc_htotal) > + if (!adjusted_mode->crtc_htotal) > return 1; > > - return DIV_ROUND_UP(usecs * mode->crtc_clock, 1000 * mode->crtc_htotal); > + return DIV_ROUND_UP(usecs * adjusted_mode->crtc_clock, > + 1000 * adjusted_mode->crtc_htotal); > } > > /** _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx