Re: [PATCH 07/40] drm/i915: Disable cdclk changes for chv until Punit is ready

Jesse Barnes
2014-07-29T16:51:17Z

On Sat, 28 Jun 2014 02:03:58 +0300
ville.syrjala@linux.intel.com wrote:

> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Punit seems a bit WIP still. Disable cdclk changes until we have
> hardware where it works.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 9af1d13..4abf8b6f 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4576,6 +4576,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
> @@ -5297,6 +5301,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);

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>

--
Jesse Barnes, Intel Open Source Technology Center