Commit 124abe07 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Always call the adjusted mode 'adjusted_mode' 



Always name any variable pointing at the adjusted mode as
'adjustead_mode'. This will make it much easier to identify
when we should use the crtc_ timings and when we shoudln't.

Conversion was performed with coccinelle:
@@
expression E;
identifier I;
@@
- struct drm_display_mode *I = &E.adjusted_mode;
+ struct drm_display_mode *adjusted_mode = &E.adjusted_mode;
<...
- I
+ adjusted_mode
...>

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarMika Kahola <mika.kahola@intel.com>
[danvet: Fixup conflicts.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 28694070

drivers/gpu/drm/i915/intel_audio.c

+4 −3
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder) 
{

	struct drm_encoder *encoder = &intel_encoder->base;

	struct intel_crtc *crtc = to_intel_crtc(encoder->crtc);

	struct drm_display_mode *mode = &crtc->config->base.adjusted_mode;

	struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;

	struct drm_connector *connector;

	struct drm_device *dev = encoder->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -419,10 +419,11 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder) 
	if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT))

		connector->eld[5] |= (1 << 2);



	connector->eld[6] = drm_av_sync_delay(connector, mode) / 2;

	connector->eld[6] = drm_av_sync_delay(connector, adjusted_mode) / 2;



	if (dev_priv->display.audio_codec_enable)

		dev_priv->display.audio_codec_enable(connector, intel_encoder, mode);

		dev_priv->display.audio_codec_enable(connector, intel_encoder,

						     adjusted_mode);



	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)

		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr, (int) port);

drivers/gpu/drm/i915/intel_display.c

+5 −7
Original line number Diff line number Diff line
@@ -4392,8 +4392,7 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach, 
int skl_update_scaler_crtc(struct intel_crtc_state *state)

{

	struct intel_crtc *intel_crtc = to_intel_crtc(state->base.crtc);

	struct drm_display_mode *adjusted_mode =

		&state->base.adjusted_mode;

	struct drm_display_mode *adjusted_mode = &state->base.adjusted_mode;



	DRM_DEBUG_KMS("Updating scaler for [CRTC:%i] scaler_user index %u.%u\n",

		      intel_crtc->base.base.id, intel_crtc->pipe, SKL_CRTC_INDEX);
@@ -7625,8 +7624,7 @@ static void intel_set_pipe_timings(struct intel_crtc *intel_crtc) 
	struct drm_i915_private *dev_priv = dev->dev_private;

	enum pipe pipe = intel_crtc->pipe;

	enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;

	struct drm_display_mode *adjusted_mode =

		&intel_crtc->config->base.adjusted_mode;

	struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;

	uint32_t crtc_vtotal, crtc_vblank_end;

	int vsyncshift = 0;
@@ -12821,11 +12819,11 @@ static void update_scanline_offset(struct intel_crtc *crtc) 
	 * one to the value.

	 */

	if (IS_GEN2(dev)) {

		const struct drm_display_mode *mode = &crtc->config->base.adjusted_mode;

		const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;

		int vtotal;



		vtotal = mode->crtc_vtotal;

		if (mode->flags & DRM_MODE_FLAG_INTERLACE)

		vtotal = adjusted_mode->crtc_vtotal;

		if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE)

			vtotal /= 2;



		crtc->scanline_offset = vtotal - 1;

drivers/gpu/drm/i915/intel_dsi.c

+6 −7
Original line number Diff line number Diff line
@@ -774,8 +774,7 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder) 
	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);

	struct drm_display_mode *adjusted_mode =

		&intel_crtc->config->base.adjusted_mode;

	struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;

	enum port port;

	unsigned int bpp = intel_crtc->config->pipe_bpp;

	u32 val, tmp;

drivers/gpu/drm/i915/intel_hdmi.c

+3 −6
Original line number Diff line number Diff line
@@ -1537,8 +1537,7 @@ static void intel_hdmi_pre_enable(struct intel_encoder *encoder) 
{

	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);

	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);

	struct drm_display_mode *adjusted_mode =

		&intel_crtc->config->base.adjusted_mode;

	struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;



	intel_hdmi_prepare(encoder);
@@ -1555,8 +1554,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder) 
	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc =

		to_intel_crtc(encoder->base.crtc);

	struct drm_display_mode *adjusted_mode =

		&intel_crtc->config->base.adjusted_mode;

	struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;

	enum dpio_channel port = vlv_dport_to_channel(dport);

	int pipe = intel_crtc->pipe;

	u32 val;
@@ -1822,8 +1820,7 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder) 
	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc =

		to_intel_crtc(encoder->base.crtc);

	struct drm_display_mode *adjusted_mode =

		&intel_crtc->config->base.adjusted_mode;

	struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;

	enum dpio_channel ch = vlv_dport_to_channel(dport);

	int pipe = intel_crtc->pipe;

	int data, i, stagger;

drivers/gpu/drm/i915/intel_lvds.c

+1 −2
Original line number Diff line number Diff line
@@ -139,8 +139,7 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder) 
	struct drm_device *dev = encoder->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);

	const struct drm_display_mode *adjusted_mode =

		&crtc->config->base.adjusted_mode;

	const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;

	int pipe = crtc->pipe;

	u32 temp;

CRA Git | Maintained and supported by SUSTech CRA and CCSE