diff options
author | Eugeni Dodonov <eugeni.dodonov@intel.com> | 2012-02-08 15:53:51 -0500 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-02-10 17:19:14 -0500 |
commit | db099c8f963fe656108e0a068274c5580a17f69b (patch) | |
tree | 297ad1b9831163f56981a802773e69b0036b90fc | |
parent | e4e0c058a19c41150d12ad2d3023b3cf09c5de67 (diff) |
drm/i915: gen7: work around a system hang on IVB
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 <eugeni.dodonov@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index ca4737e5cdfd..4e1ee909a80b 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
@@ -3035,6 +3035,10 @@ | |||
3035 | #define GEN7_L3_CHICKEN_MODE_REGISTER 0xB030 | 3035 | #define GEN7_L3_CHICKEN_MODE_REGISTER 0xB030 |
3036 | #define GEN7_WA_L3_CHICKEN_MODE 0x20000000 | 3036 | #define GEN7_WA_L3_CHICKEN_MODE 0x20000000 |
3037 | 3037 | ||
3038 | /* WaCatErrorRejectionIssue */ | ||
3039 | #define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG 0x9030 | ||
3040 | #define GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB (1<<11) | ||
3041 | |||
3038 | /* PCH */ | 3042 | /* PCH */ |
3039 | 3043 | ||
3040 | /* south display engine interrupt */ | 3044 | /* south display engine interrupt */ |
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 928840aaeb06..a5276150b8f8 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -8478,6 +8478,11 @@ static void ivybridge_init_clock_gating(struct drm_device *dev) | |||
8478 | I915_WRITE(GEN7_L3_CHICKEN_MODE_REGISTER, | 8478 | I915_WRITE(GEN7_L3_CHICKEN_MODE_REGISTER, |
8479 | GEN7_WA_L3_CHICKEN_MODE); | 8479 | GEN7_WA_L3_CHICKEN_MODE); |
8480 | 8480 | ||
8481 | /* This is required by WaCatErrorRejectionIssue */ | ||
8482 | I915_WRITE(GEN7_SQ_CHICKEN_MBCUNIT_CONFIG, | ||
8483 | I915_READ(GEN7_SQ_CHICKEN_MBCUNIT_CONFIG) | | ||
8484 | GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB); | ||
8485 | |||
8481 | for_each_pipe(pipe) { | 8486 | for_each_pipe(pipe) { |
8482 | I915_WRITE(DSPCNTR(pipe), | 8487 | I915_WRITE(DSPCNTR(pipe), |
8483 | I915_READ(DSPCNTR(pipe)) | | 8488 | I915_READ(DSPCNTR(pipe)) | |