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

Commit 89eff4be authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: fix wrong PLL debug messages. 



LPT does have PCH refclk, but it's different form the IBX/CPT/PPT one
and doesn't use the same structs. It is wrong to have a message saying
that "LPT does not has PCH refclk" (sic). While at it, signal that we
only want this function on IBX/CPT/PPT by renaming it and adding a
WARN.

On HSW we also print "0 shared PLLs initialized", but we *do* have
shared PLLs on HSW (LCPLL, WRPLL, SPLL) and we *do* initialize them.
We just don't use "struct intel_shared_dpll". So remove the debug
message.

In the future we may want to rename all that "intel shared pll" code
to "ibx shared pll", but I'll leave this to another patch.

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e59150dc

drivers/gpu/drm/i915/intel_display.c

+3 −8
Original line number Diff line number Diff line
@@ -1211,15 +1211,12 @@ static void assert_sprites_disabled(struct drm_i915_private *dev_priv, 
	}

}



static void assert_pch_refclk_enabled(struct drm_i915_private *dev_priv)

static void ibx_assert_pch_refclk_enabled(struct drm_i915_private *dev_priv)

{

	u32 val;

	bool enabled;



	if (HAS_PCH_LPT(dev_priv->dev)) {

		DRM_DEBUG_DRIVER("LPT does not has PCH refclk, skipping check\n");

		return;

	}

	WARN_ON(!(HAS_PCH_IBX(dev_priv->dev) || HAS_PCH_CPT(dev_priv->dev)));



	val = I915_READ(PCH_DREF_CONTROL);

	enabled = !!(val & (DREF_SSC_SOURCE_MASK | DREF_NONSPREAD_SOURCE_MASK |
@@ -10077,7 +10074,7 @@ static void ibx_pch_dpll_enable(struct drm_i915_private *dev_priv, 
				struct intel_shared_dpll *pll)

{

	/* PCH refclock must be enabled first */

	assert_pch_refclk_enabled(dev_priv);

	ibx_assert_pch_refclk_enabled(dev_priv);



	I915_WRITE(PCH_DPLL(pll->id), pll->hw_state.dpll);
@@ -10145,8 +10142,6 @@ static void intel_shared_dpll_init(struct drm_device *dev) 
		dev_priv->num_shared_dpll = 0;



	BUG_ON(dev_priv->num_shared_dpll > I915_NUM_PLLS);

	DRM_DEBUG_KMS("%i shared PLLs initialized\n",

		      dev_priv->num_shared_dpll);

}



static void intel_crtc_init(struct drm_device *dev, int pipe)