From: Greg Kroah-Hartman Date: Mon, 18 Mar 2013 19:50:31 +0000 (-0700) Subject: 3.4-stable patches X-Git-Tag: v3.0.70~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43c7997b328d63598644e19b86824078fc354b4a;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: drm-i915-increase-the-rc6p-threshold.patch --- diff --git a/queue-3.4/drm-i915-increase-the-rc6p-threshold.patch b/queue-3.4/drm-i915-increase-the-rc6p-threshold.patch new file mode 100644 index 00000000000..2830d94d9e0 --- /dev/null +++ b/queue-3.4/drm-i915-increase-the-rc6p-threshold.patch @@ -0,0 +1,33 @@ +From 0920a48719f1ceefc909387a64f97563848c7854 Mon Sep 17 00:00:00 2001 +From: Stéphane Marchesin +Date: Tue, 29 Jan 2013 19:41:59 -0800 +Subject: drm/i915: Increase the RC6p threshold. + +From: Stéphane Marchesin + +commit 0920a48719f1ceefc909387a64f97563848c7854 upstream. + +This increases GEN6_RC6p_THRESHOLD from 100000 to 150000. For some +reason this avoids the gen6_gt_check_fifodbg.isra warnings and +associated GPU lockups, which makes my ivy bridge machine stable. + +Signed-off-by: Stéphane Marchesin +Acked-by: Jesse Barnes +Signed-off-by: Daniel Vetter +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/i915/intel_display.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/i915/intel_display.c ++++ b/drivers/gpu/drm/i915/intel_display.c +@@ -8364,7 +8364,7 @@ void gen6_enable_rps(struct drm_i915_pri + I915_WRITE(GEN6_RC_SLEEP, 0); + I915_WRITE(GEN6_RC1e_THRESHOLD, 1000); + I915_WRITE(GEN6_RC6_THRESHOLD, 50000); +- I915_WRITE(GEN6_RC6p_THRESHOLD, 100000); ++ I915_WRITE(GEN6_RC6p_THRESHOLD, 150000); + I915_WRITE(GEN6_RC6pp_THRESHOLD, 64000); /* unused */ + + rc6_mode = intel_enable_rc6(dev_priv->dev); diff --git a/queue-3.4/series b/queue-3.4/series index f987e849461..e73772b8ebb 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -33,3 +33,4 @@ hwmon-sht15-fix-memory-leak-if-regulator_enable-fails.patch block-use-i_size_write-in-bd_set_size.patch loopdev-fix-a-deadlock.patch loopdev-remove-an-user-triggerable-oops.patch +drm-i915-increase-the-rc6p-threshold.patch