[PATCH 01/28] drm/i915: Keep RP SW Mode enabled while disabling rps

Sagar Arun Kamble sagar.a.kamble at intel.com
Wed Jul 6 17:37:43 UTC 2016


With SLPC, only RP SW Mode control should be left enabled by i915.
Else, SLPC requests through through RPNSWREQ will not be granted.

Signed-off-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 82c2efd..96529a6 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4938,7 +4938,12 @@ static void gen9_disable_rc6(struct drm_i915_private *dev_priv)
 
 static void gen9_disable_rps(struct drm_i915_private *dev_priv)
 {
-	I915_WRITE(GEN6_RP_CONTROL, 0);
+	uint32_t rp_ctl = 0;
+
+	rp_ctl = I915_READ(GEN6_RP_CONTROL);
+
+	/* RP SW Mode Control will be needed for SLPC, Hence not clearing.*/
+	I915_WRITE(GEN6_RP_CONTROL, rp_ctl & GEN6_RP_MEDIA_MODE_MASK);
 }
 
 static void gen6_disable_rps(struct drm_i915_private *dev_priv)
-- 
1.9.1



More information about the Intel-gfx-trybot mailing list