diff options
author | Michel Thierry <michel.thierry@intel.com> | 2018-05-10 16:07:08 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2018-05-13 05:29:44 -0400 |
commit | 0c79f9cb77eae28d48a4f9fc1b3341aacbbd260c (patch) | |
tree | c8efa8718cb886aceb32c5ac89c0fa0c4cc663a1 | |
parent | f79401b477bc22914e4c37ea39c611117bd10b19 (diff) |
drm/i915/gen9: Add WaClearHIZ_WM_CHICKEN3 for bxt and glk
Factor in clear values wherever required while updating destination
min/max.
References: HSDES#1604444184
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
Cc: mesa-dev@lists.freedesktop.org
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180510200708.18097-1-michel.thierry@intel.com
Cc: stable@vger.kernel.org
-rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_workarounds.c | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 14491782aa9e..f11bb213ec07 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
@@ -7259,6 +7259,9 @@ enum { | |||
7259 | #define SLICE_ECO_CHICKEN0 _MMIO(0x7308) | 7259 | #define SLICE_ECO_CHICKEN0 _MMIO(0x7308) |
7260 | #define PIXEL_MASK_CAMMING_DISABLE (1 << 14) | 7260 | #define PIXEL_MASK_CAMMING_DISABLE (1 << 14) |
7261 | 7261 | ||
7262 | #define GEN9_WM_CHICKEN3 _MMIO(0x5588) | ||
7263 | #define GEN9_FACTOR_IN_CLR_VAL_HIZ (1 << 9) | ||
7264 | |||
7262 | /* WaCatErrorRejectionIssue */ | 7265 | /* WaCatErrorRejectionIssue */ |
7263 | #define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG _MMIO(0x9030) | 7266 | #define GEN7_SQ_CHICKEN_MBCUNIT_CONFIG _MMIO(0x9030) |
7264 | #define GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB (1<<11) | 7267 | #define GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB (1<<11) |
diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c index 5eec4ce965a5..2df3538ceba5 100644 --- a/drivers/gpu/drm/i915/intel_workarounds.c +++ b/drivers/gpu/drm/i915/intel_workarounds.c | |||
@@ -270,6 +270,10 @@ static int gen9_ctx_workarounds_init(struct drm_i915_private *dev_priv) | |||
270 | GEN9_PREEMPT_GPGPU_LEVEL_MASK, | 270 | GEN9_PREEMPT_GPGPU_LEVEL_MASK, |
271 | GEN9_PREEMPT_GPGPU_COMMAND_LEVEL); | 271 | GEN9_PREEMPT_GPGPU_COMMAND_LEVEL); |
272 | 272 | ||
273 | /* WaClearHIZ_WM_CHICKEN3:bxt,glk */ | ||
274 | if (IS_GEN9_LP(dev_priv)) | ||
275 | WA_SET_BIT_MASKED(GEN9_WM_CHICKEN3, GEN9_FACTOR_IN_CLR_VAL_HIZ); | ||
276 | |||
273 | return 0; | 277 | return 0; |
274 | } | 278 | } |
275 | 279 | ||