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

Commit 65f2130c authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Extract intel_crtc_pch_transcoder() 



Extract the code to determine which PCH transcoder we're using to a
small helper.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1476464574-32230-2-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 862372bc

drivers/gpu/drm/i915/intel_display.c

+14 −7
Original line number Diff line number Diff line
@@ -1926,6 +1926,18 @@ void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv) 
	I915_WRITE(TRANS_CHICKEN2(PIPE_A), val);

}



enum transcoder intel_crtc_pch_transcoder(struct intel_crtc *crtc)

{

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



	WARN_ON(!crtc->config->has_pch_encoder);



	if (HAS_PCH_LPT(dev_priv))

		return TRANSCODER_A;

	else

		return (enum transcoder) crtc->pipe;

}



/**

 * intel_enable_pipe - enable a pipe, asserting requirements

 * @crtc: crtc responsible for the pipe
@@ -1939,7 +1951,6 @@ static void intel_enable_pipe(struct intel_crtc *crtc) 
	struct drm_i915_private *dev_priv = to_i915(dev);

	enum pipe pipe = crtc->pipe;

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

	enum pipe pch_transcoder;

	i915_reg_t reg;

	u32 val;
@@ -1949,11 +1960,6 @@ static void intel_enable_pipe(struct intel_crtc *crtc) 
	assert_cursor_disabled(dev_priv, pipe);

	assert_sprites_disabled(dev_priv, pipe);



	if (HAS_PCH_LPT(dev_priv))

		pch_transcoder = TRANSCODER_A;

	else

		pch_transcoder = pipe;



	/*

	 * A pipe without a PLL won't actually be able to drive bits from

	 * a plane.  On ILK+ the pipe PLLs are integrated, so we don't
@@ -1967,7 +1973,8 @@ static void intel_enable_pipe(struct intel_crtc *crtc) 
	} else {

		if (crtc->config->has_pch_encoder) {

			/* if driving the PCH, we need FDI enabled */

			assert_fdi_rx_pll_enabled(dev_priv, pch_transcoder);

			assert_fdi_rx_pll_enabled(dev_priv,

						  (enum pipe) intel_crtc_pch_transcoder(crtc));

			assert_fdi_tx_pll_enabled(dev_priv,

						  (enum pipe) cpu_transcoder);

		}

drivers/gpu/drm/i915/intel_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -1191,6 +1191,7 @@ void i915_audio_component_init(struct drm_i915_private *dev_priv); 
void i915_audio_component_cleanup(struct drm_i915_private *dev_priv);



/* intel_display.c */

enum transcoder intel_crtc_pch_transcoder(struct intel_crtc *crtc);

void skl_set_preferred_cdclk_vco(struct drm_i915_private *dev_priv, int vco);

void intel_update_rawclk(struct drm_i915_private *dev_priv);

int vlv_get_cck_clock(struct drm_i915_private *dev_priv,