Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0dcdc382 authored by Ander Conselvan de Oliveira's avatar Ander Conselvan de Oliveira
Browse files

drm/i915: Pass intel_crtc to intel_lpt_pch_enable() 



The function intel_lpt_pch_enable() needs an intel_crtc so pass that
instead of the generic crtc type.

Signed-off-by: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170302125857.14665-3-ander.conselvan.de.oliveira@intel.com
parent 4cbe4b2b

drivers/gpu/drm/i915/intel_display.c

+8 −10
Original line number Diff line number Diff line
@@ -4249,10 +4249,10 @@ void lpt_disable_iclkip(struct drm_i915_private *dev_priv) 
}



/* Program iCLKIP clock to the desired frequency */

static void lpt_program_iclkip(struct drm_crtc *crtc)

static void lpt_program_iclkip(struct intel_crtc *crtc)

{

	struct drm_i915_private *dev_priv = to_i915(crtc->dev);

	int clock = to_intel_crtc(crtc)->config->base.adjusted_mode.crtc_clock;

	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);

	int clock = crtc->config->base.adjusted_mode.crtc_clock;

	u32 divsel, phaseinc, auxdiv, phasedir = 0;

	u32 temp;
@@ -4545,19 +4545,17 @@ static void ironlake_pch_enable(struct intel_crtc *crtc) 
	ironlake_enable_pch_transcoder(dev_priv, pipe);

}



static void lpt_pch_enable(struct drm_crtc *crtc)

static void lpt_pch_enable(struct intel_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

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

	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);

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



	assert_pch_transcoder_disabled(dev_priv, TRANSCODER_A);



	lpt_program_iclkip(crtc);



	/* Set transcoder timing. */

	ironlake_pch_transcoder_set_timings(intel_crtc, PIPE_A);

	ironlake_pch_transcoder_set_timings(crtc, PIPE_A);



	lpt_enable_pch_transcoder(dev_priv, cpu_transcoder);

}
@@ -5394,7 +5392,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config, 
		intel_enable_pipe(intel_crtc);



	if (intel_crtc->config->has_pch_encoder)

		lpt_pch_enable(crtc);

		lpt_pch_enable(intel_crtc);



	if (intel_crtc_has_type(intel_crtc->config, INTEL_OUTPUT_DP_MST))

		intel_ddi_set_vc_payload_alloc(crtc, true);