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

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

drm/i915: Disable cdclk changes for chv until Punit is ready 



Punit seems a bit WIP still. Disable cdclk changes until we have
hardware where it works.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 383c5a6a

drivers/gpu/drm/i915/intel_display.c

+8 −0
Original line number Diff line number Diff line
@@ -4548,6 +4548,10 @@ static int valleyview_calc_cdclk(struct drm_i915_private *dev_priv, 
	int vco = valleyview_get_vco(dev_priv);

	int freq_320 = (vco <<  1) % 320000 != 0 ? 333333 : 320000;



	/* FIXME: Punit isn't quite ready yet */

	if (IS_CHERRYVIEW(dev_priv->dev))

		return 400000;



	/*

	 * Really only a few cases to deal with, as only 4 CDclks are supported:

	 *   200MHz
@@ -5283,6 +5287,10 @@ static int valleyview_get_display_clock_speed(struct drm_device *dev) 
	u32 val;

	int divider;



	/* FIXME: Punit isn't quite ready yet */

	if (IS_CHERRYVIEW(dev))

		return 400000;



	mutex_lock(&dev_priv->dpio_lock);

	val = vlv_cck_read(dev_priv, CCK_DISPLAY_CLOCK_CONTROL);

	mutex_unlock(&dev_priv->dpio_lock);