Partially revert "drm/i915: tune the RC6 threshold for stability"

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=29c78f609e661e663a239a37923adb1d61f6386c
Commit:     29c78f609e661e663a239a37923adb1d61f6386c
Parent:     b2ea8ef559b4d94190009f3651b5b3ab7c05afd3
Author:     Daniel Vetter <daniel.vetter at ffwll.ch>
AuthorDate: Sat Nov 16 16:04:26 2013 +0100
Committer:  Daniel Vetter <daniel.vetter at ffwll.ch>
CommitDate: Sat Nov 16 16:05:41 2013 +0100

    Partially revert "drm/i915: tune the RC6 threshold for stability"
    
    This reverts commit 351aa5666d02062b52329bcfe4bcf9d1f882fba9.
    
    It breaks rc6 on at least one snb machine. Since we don't yet have a
    report for ivb let's keep it there for now.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71656
    Cc: Stéphane Marchesin <marcheu at chromium.org>
    Cc: erik at vontaene.de
    Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
---
 drivers/gpu/drm/i915/intel_pm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 0a07d7c..e41d3af 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3888,7 +3888,7 @@ static void gen6_enable_rps(struct drm_device *dev)
 
 	I915_WRITE(GEN6_RC_SLEEP, 0);
 	I915_WRITE(GEN6_RC1e_THRESHOLD, 1000);
-	if (INTEL_INFO(dev)->gen <= 6 || IS_IVYBRIDGE(dev))
+	if (IS_IVYBRIDGE(dev))
 		I915_WRITE(GEN6_RC6_THRESHOLD, 125000);
 	else
 		I915_WRITE(GEN6_RC6_THRESHOLD, 50000);