drm/i915: Make ironlake_pch_transcoder_set_timings take crtc_state (5e1cdf54) · Commits · 戴 / test

drivers/gpu/drm/i915/intel_display.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -4608,12 +4608,12 @@ int lpt_get_iclkip(struct drm_i915_private *dev_priv)
		desired_divisor << auxdiv);
		}

		static void ironlake_pch_transcoder_set_timings(struct intel_crtc *crtc,
		static void ironlake_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_state,
		enum pipe pch_transcoder)
		{
		struct drm_device *dev = crtc->base.dev;
		struct drm_i915_private *dev_priv = to_i915(dev);
		enum transcoder cpu_transcoder = crtc->config->cpu_transcoder;
		struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
		struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
		enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;

		I915_WRITE(PCH_TRANS_HTOTAL(pch_transcoder),
		I915_READ(HTOTAL(cpu_transcoder)));
		@@ -4762,7 +4762,7 @@ static void ironlake_pch_enable(const struct intel_atomic_state *state,

		/* set transcoder timing, panel must allow it */
		assert_panel_unlocked(dev_priv, pipe);
		ironlake_pch_transcoder_set_timings(crtc, pipe);
		ironlake_pch_transcoder_set_timings(crtc_state, pipe);

		intel_fdi_normal_train(crtc);

		@@ -4809,7 +4809,7 @@ static void lpt_pch_enable(const struct intel_atomic_state *state,
		lpt_program_iclkip(crtc);

		/* Set transcoder timing. */
		ironlake_pch_transcoder_set_timings(crtc, PIPE_A);
		ironlake_pch_transcoder_set_timings(crtc_state, PIPE_A);

		lpt_enable_pch_transcoder(dev_priv, cpu_transcoder);
		}