[PATCH] drm/i915: Don't use GEN6_RC_VIDEO_FREQ on gen10+

From: David Weinehall <david.weinehall@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: rodrigo.vivi@intel.com
Subject: [PATCH] drm/i915: Don't use GEN6_RC_VIDEO_FREQ on gen10+
Date: Fri, 10 Nov 2017 16:29:29 +0200	[thread overview]
Message-ID: <20171110142929.5993-1-david.weinehall@linux.intel.com> (raw)

GEN6_RC_VIDEO_FREQ is deprecated for >= gen10;
don't try to program it.

Signed-off-by: David Weinehall <david.weinehall@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 07118c0b69d3..9f0ca3ae28f8 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -6568,11 +6568,14 @@ static void gen9_enable_rps(struct drm_i915_private *dev_priv)
 {
 	intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
 
-	/* Program defaults and thresholds for RPS*/
-	I915_WRITE(GEN6_RC_VIDEO_FREQ,
-		GEN9_FREQUENCY(dev_priv->gt_pm.rps.rp1_freq));
+	/* Program defaults and thresholds for RPS */
+
+	/* GEN6_RC_VIDEO_FREQ is deprecated for >= gen10 */
+	if (INTEL_GEN(dev_priv) == 9)
+		I915_WRITE(GEN6_RC_VIDEO_FREQ,
+			GEN9_FREQUENCY(dev_priv->gt_pm.rps.rp1_freq));
 
-	/* 1 second timeout*/
+	/* 1 second timeout */
 	I915_WRITE(GEN6_RP_DOWN_TIMEOUT,
 		GT_INTERVAL_FROM_US(dev_priv, 1000000));
 
-- 
2.15.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
