From 16b3eaf9d3e7c6ac0bc5c69980f4a941bc149136 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 7 Mar 2012 11:44:47 -0800 Subject: [PATCH] 3.0-stable patches added patches: drm-i915-gen7-disable-the-rhwo-optimization-as-it-can-cause-gpu-hangs.patch drm-i915-gen7-work-around-a-system-hang-on-ivb.patch --- ...timization-as-it-can-cause-gpu-hangs.patch | 49 +++++++++++++++++ ...en7-work-around-a-system-hang-on-ivb.patch | 52 +++++++++++++++++++ queue-3.0/series | 2 + 3 files changed, 103 insertions(+) create mode 100644 queue-3.0/drm-i915-gen7-disable-the-rhwo-optimization-as-it-can-cause-gpu-hangs.patch create mode 100644 queue-3.0/drm-i915-gen7-work-around-a-system-hang-on-ivb.patch diff --git a/queue-3.0/drm-i915-gen7-disable-the-rhwo-optimization-as-it-can-cause-gpu-hangs.patch b/queue-3.0/drm-i915-gen7-disable-the-rhwo-optimization-as-it-can-cause-gpu-hangs.patch new file mode 100644 index 00000000000..43a9c2d5156 --- /dev/null +++ b/queue-3.0/drm-i915-gen7-disable-the-rhwo-optimization-as-it-can-cause-gpu-hangs.patch @@ -0,0 +1,49 @@ +From d71de14ddf423ccc9a2e3f7e37553c99ead20d7c Mon Sep 17 00:00:00 2001 +From: Kenneth Graunke +Date: Wed, 8 Feb 2012 12:53:52 -0800 +Subject: drm/i915: gen7: Disable the RHWO optimization as it can cause GPU hangs. + +From: Kenneth Graunke + +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 +Signed-off-by: Kenneth Graunke +Signed-off-by: Jesse Barnes +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/i915/i915_reg.h | 3 +++ + drivers/gpu/drm/i915/intel_display.c | 4 ++++ + 2 files changed, 7 insertions(+) + +--- a/drivers/gpu/drm/i915/i915_reg.h ++++ b/drivers/gpu/drm/i915/i915_reg.h +@@ -2848,6 +2848,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 + +--- a/drivers/gpu/drm/i915/intel_display.c ++++ b/drivers/gpu/drm/i915/intel_display.c +@@ -7464,6 +7464,10 @@ static void ivybridge_init_clock_gating( + + 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); diff --git a/queue-3.0/drm-i915-gen7-work-around-a-system-hang-on-ivb.patch b/queue-3.0/drm-i915-gen7-work-around-a-system-hang-on-ivb.patch new file mode 100644 index 00000000000..755f0012a01 --- /dev/null +++ b/queue-3.0/drm-i915-gen7-work-around-a-system-hang-on-ivb.patch @@ -0,0 +1,52 @@ +From db099c8f963fe656108e0a068274c5580a17f69b Mon Sep 17 00:00:00 2001 +From: Eugeni Dodonov +Date: Wed, 8 Feb 2012 12:53:51 -0800 +Subject: drm/i915: gen7: work around a system hang on IVB + +From: Eugeni Dodonov + +commit db099c8f963fe656108e0a068274c5580a17f69b upstream. + +This adds the workaround for WaCatErrorRejectionIssue which could result +in a system hang. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41353 +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44610 +Tested-by: Eugeni Dodonov +Reviewed-by: Kenneth Graunke +Signed-off-by: Eugeni Dodonov +Signed-off-by: Jesse Barnes +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/i915/i915_reg.h | 4 ++++ + drivers/gpu/drm/i915/intel_display.c | 5 +++++ + 2 files changed, 9 insertions(+) + +--- a/drivers/gpu/drm/i915/i915_reg.h ++++ b/drivers/gpu/drm/i915/i915_reg.h +@@ -2854,6 +2854,10 @@ + #define GEN7_L3_CHICKEN_MODE_REGISTER 0xB030 + #define GEN7_WA_L3_CHICKEN_MODE 0x20000000 + ++/* WaCatErrorRejectionIssue */ ++#define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG 0x9030 ++#define GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB (1<<11) ++ + /* PCH */ + + /* south display engine interrupt */ +--- a/drivers/gpu/drm/i915/intel_display.c ++++ b/drivers/gpu/drm/i915/intel_display.c +@@ -7470,6 +7470,11 @@ static void ivybridge_init_clock_gating( + I915_WRITE(GEN7_L3_CHICKEN_MODE_REGISTER, + GEN7_WA_L3_CHICKEN_MODE); + ++ /* This is required by WaCatErrorRejectionIssue */ ++ I915_WRITE(GEN7_SQ_CHICKEN_MBCUNIT_CONFIG, ++ I915_READ(GEN7_SQ_CHICKEN_MBCUNIT_CONFIG) | ++ GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB); ++ + for_each_pipe(pipe) + I915_WRITE(DSPCNTR(pipe), + I915_READ(DSPCNTR(pipe)) | diff --git a/queue-3.0/series b/queue-3.0/series index 1089778ba39..fafc7bef23c 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -39,3 +39,5 @@ avr32-select-generic-atomic64_t-support.patch kprobes-adjust-fix-a-memory-leak-in-function-pre_handler_kretprobe.patch drm-i915-gen7-implement-rczunit-workaround.patch drm-i915-gen7-implement-an-l3-caching-workaround.patch +drm-i915-gen7-work-around-a-system-hang-on-ivb.patch +drm-i915-gen7-disable-the-rhwo-optimization-as-it-can-cause-gpu-hangs.patch -- 2.47.3