[PATCH 19/35] ilk-gt-freq
Chris Wilson
chris at chris-wilson.co.uk
Sat Dec 2 18:34:56 UTC 2017
---
drivers/gpu/drm/i915/intel_gt_pm.c | 16 ++++++++++++++++
drivers/gpu/drm/i915/intel_pm.c | 10 ----------
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_gt_pm.c b/drivers/gpu/drm/i915/intel_gt_pm.c
index 51e14d833b13..c5611745b366 100644
--- a/drivers/gpu/drm/i915/intel_gt_pm.c
+++ b/drivers/gpu/drm/i915/intel_gt_pm.c
@@ -1373,8 +1373,24 @@ static void ilk_init_emon(struct drm_i915_private *dev_priv)
dev_priv->gt_pm.ips.corr = (lcfuse & LCFUSE_HIV_MASK);
}
+
+static void ilk_init_frequencies(struct drm_i915_private *i915)
+{
+ struct intel_ips *ips = &i915->gt_pm.ips;
+
+ ips->r_t = i915->mem_freq;
+
+ if (i915->fsb_freq <= 3200)
+ ips->c_m = 0;
+ else if (i915->fsb_freq <= 4800)
+ ips->c_m = 1;
+ else
+ ips->c_m = 2;
+}
+
static void gen5_init_gt_powersave(struct drm_i915_private *i915)
{
+ ilk_init_frequencies(i915);
ilk_init_emon(i915);
ironlake_init_drps(i915);
}
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index baab07c2ae4b..29babcd58713 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -183,8 +183,6 @@ static void i915_ironlake_get_mem_freq(struct drm_i915_private *dev_priv)
break;
}
- dev_priv->gt_pm.ips.r_t = dev_priv->mem_freq;
-
switch (csipll & 0x3ff) {
case 0x00c:
dev_priv->fsb_freq = 3200;
@@ -213,14 +211,6 @@ static void i915_ironlake_get_mem_freq(struct drm_i915_private *dev_priv)
dev_priv->fsb_freq = 0;
break;
}
-
- if (dev_priv->fsb_freq == 3200) {
- dev_priv->gt_pm.ips.c_m = 0;
- } else if (dev_priv->fsb_freq > 3200 && dev_priv->fsb_freq <= 4800) {
- dev_priv->gt_pm.ips.c_m = 1;
- } else {
- dev_priv->gt_pm.ips.c_m = 2;
- }
}
static const struct cxsr_latency cxsr_latency_table[] = {
--
2.15.1
More information about the Intel-gfx-trybot
mailing list