提交 44913155 编写于 作者: V Ville Syrjälä 提交者: Jani Nikula

drm/i915: Store max cdclk value in dev_priv

Keep the cdclk maximum supported frequency around in dev_priv so that we
can verify certain things against it before actually changing the cdclk
frequency.

For now only VLV/CHV have support changing cdclk frequency, so other
plarforms get to assume cdclk is fixed.

v2: Rebased to the latest
v3: Rebased to the latest
v4: Fix for patch style problems
Signed-off-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: NMika Kahola <mika.kahola@intel.com>
Reviewed-by: NDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: NJani Nikula <jani.nikula@intel.com>
上级 05024da3
...@@ -1743,7 +1743,7 @@ struct drm_i915_private { ...@@ -1743,7 +1743,7 @@ struct drm_i915_private {
unsigned int fsb_freq, mem_freq, is_ddr3; unsigned int fsb_freq, mem_freq, is_ddr3;
unsigned int skl_boot_cdclk; unsigned int skl_boot_cdclk;
unsigned int cdclk_freq; unsigned int cdclk_freq, max_cdclk_freq;
unsigned int hpll_freq; unsigned int hpll_freq;
/** /**
......
...@@ -5747,6 +5747,21 @@ static int valleyview_get_vco(struct drm_i915_private *dev_priv) ...@@ -5747,6 +5747,21 @@ static int valleyview_get_vco(struct drm_i915_private *dev_priv)
return vco_freq[hpll_freq] * 1000; return vco_freq[hpll_freq] * 1000;
} }
static void intel_update_max_cdclk(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = dev->dev_private;
if (IS_VALLEYVIEW(dev)) {
dev_priv->max_cdclk_freq = 400000;
} else {
/* otherwise assume cdclk is fixed */
dev_priv->max_cdclk_freq = dev_priv->cdclk_freq;
}
DRM_DEBUG_DRIVER("Max CD clock rate: %d kHz\n",
dev_priv->max_cdclk_freq);
}
static void intel_update_cdclk(struct drm_device *dev) static void intel_update_cdclk(struct drm_device *dev)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
...@@ -5768,6 +5783,9 @@ static void intel_update_cdclk(struct drm_device *dev) ...@@ -5768,6 +5783,9 @@ static void intel_update_cdclk(struct drm_device *dev)
*/ */
I915_WRITE(GMBUSFREQ_VLV, DIV_ROUND_UP(dev_priv->cdclk_freq, 1000)); I915_WRITE(GMBUSFREQ_VLV, DIV_ROUND_UP(dev_priv->cdclk_freq, 1000));
} }
if (dev_priv->max_cdclk_freq == 0)
intel_update_max_cdclk(dev);
} }
/* Adjust CDclk dividers to allow high res or save power if possible */ /* Adjust CDclk dividers to allow high res or save power if possible */
...@@ -6610,7 +6628,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc, ...@@ -6610,7 +6628,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,
/* FIXME should check pixel clock limits on all platforms */ /* FIXME should check pixel clock limits on all platforms */
if (INTEL_INFO(dev)->gen < 4) { if (INTEL_INFO(dev)->gen < 4) {
int clock_limit = dev_priv->cdclk_freq; int clock_limit = dev_priv->max_cdclk_freq;
/* /*
* Enable pixel doubling when the dot clock * Enable pixel doubling when the dot clock
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册