1 files changed, 54 insertions, 0 deletions

diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.10/0054-drm-i915-gen7-Disable-the-RHWO-optimization-as-it-ca.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.10/0054-drm-i915-gen7-Disable-the-RHWO-optimization-as-it-ca.patch
new file mode 100644
index 00000000..b0d2cbe0
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.10/0054-drm-i915-gen7-Disable-the-RHWO-optimization-as-it-ca.patch
@@ -0,0 +1,54 @@
+From 62636ad79afb701ad1580d4b45eb5840e811064f Mon Sep 17 00:00:00 2001
+From: Kenneth Graunke <kenneth@whitecape.org>
+Date: Wed, 8 Feb 2012 12:53:52 -0800
+Subject: [PATCH 54/95] drm/i915: gen7: Disable the RHWO optimization as it
+ can cause GPU hangs.
+
+commit d71de14ddf423ccc9a2e3f7e37553c99ead20d7c upstream.
+
+The BSpec Workarounds page states that bits 10 and 26 must be set to
+avoid 3D ring hangs.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41353
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44610
+Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
+Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
+Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/i915/i915_reg.h      |    3 +++
+ drivers/gpu/drm/i915/intel_display.c |    4 ++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
+index 2ae87ca..1608d2a 100644
+--- a/drivers/gpu/drm/i915/i915_reg.h
++++ b/drivers/gpu/drm/i915/i915_reg.h
+@@ -2887,6 +2887,9 @@
+ #define  DISP_FBC_WM_DIS               (1<<15)
+ 
+ /* GEN7 chicken */
++#define GEN7_COMMON_SLICE_CHICKEN1             0x7010
++# define GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC     ((1<<10) | (1<<26))
++
+ #define GEN7_L3CNTLREG1                                0xB01C
+ #define  GEN7_WA_FOR_GEN7_L3_CONTROL                   0x3C4FFF8C
+ 
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index bf3deb1..72dc505 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -8255,6 +8255,10 @@ static void ivybridge_init_clock_gating(struct drm_device *dev)
+ 
+        I915_WRITE(ILK_DSPCLK_GATE, IVB_VRHUNIT_CLK_GATE);
+ 
++       /* Apply the WaDisableRHWOOptimizationForRenderHang workaround. */
++       I915_WRITE(GEN7_COMMON_SLICE_CHICKEN1,
++                  GEN7_CSC1_RHWO_OPT_DISABLE_IN_RCC);
++
+        /* WaApplyL3ControlAndL3ChickenMode requires those two on Ivy Bridge */
+        I915_WRITE(GEN7_L3CNTLREG1,
+                        GEN7_WA_FOR_GEN7_L3_CONTROL);
+-- 
+1.7.9.4
+