summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-11-16 16:04:26 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-11-16 16:05:41 +0100
commit29c78f609e661e663a239a37923adb1d61f6386c (patch)
tree92dfe16e94b6a4990fc1e39a35228d1c1361f4e0 /drivers
parentb2ea8ef559b4d94190009f3651b5b3ab7c05afd3 (diff)
downloadlinux-29c78f609e661e663a239a37923adb1d61f6386c.tar.gz
linux-29c78f609e661e663a239a37923adb1d61f6386c.tar.bz2
linux-29c78f609e661e663a239a37923adb1d61f6386c.zip
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@chromium.org> Cc: erik@vontaene.de Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 0a07d7c9cafc..e41d3af9d3db 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);