From: Daniel Vetter Date: Sat, 16 Nov 2013 15:04:26 +0000 (+0100) Subject: Partially revert "drm/i915: tune the RC6 threshold for stability" X-Git-Tag: v3.13-rc1~3^2~4^2~7 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=29c78f609e661e663a239a37923adb1d61f6386c;p=karo-tx-linux.git 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 Cc: erik@vontaene.de Signed-off-by: Daniel Vetter --- 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);