diff options
-rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 5 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 5814f67ae86d..f67e290b5475 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
@@ -5256,8 +5256,9 @@ enum skl_disp_power_wells { | |||
5256 | #define COMMON_SLICE_CHICKEN2 0x7014 | 5256 | #define COMMON_SLICE_CHICKEN2 0x7014 |
5257 | # define GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE (1<<0) | 5257 | # define GEN8_CSC2_SBE_VUE_CACHE_CONSERVATIVE (1<<0) |
5258 | 5258 | ||
5259 | #define HIZ_CHICKEN 0x7018 | 5259 | #define HIZ_CHICKEN 0x7018 |
5260 | # define CHV_HZ_8X8_MODE_IN_1X (1<<15) | 5260 | # define CHV_HZ_8X8_MODE_IN_1X (1<<15) |
5261 | # define BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE (1<<3) | ||
5261 | 5262 | ||
5262 | #define GEN9_SLICE_COMMON_ECO_CHICKEN0 0x7308 | 5263 | #define GEN9_SLICE_COMMON_ECO_CHICKEN0 0x7308 |
5263 | #define DISABLE_PIXEL_MASK_CAMMING (1<<14) | 5264 | #define DISABLE_PIXEL_MASK_CAMMING (1<<14) |
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index e758c0592675..4570fe172b79 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
@@ -1004,8 +1004,16 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring) | |||
1004 | 1004 | ||
1005 | static int skl_init_workarounds(struct intel_engine_cs *ring) | 1005 | static int skl_init_workarounds(struct intel_engine_cs *ring) |
1006 | { | 1006 | { |
1007 | struct drm_device *dev = ring->dev; | ||
1008 | struct drm_i915_private *dev_priv = dev->dev_private; | ||
1009 | |||
1007 | gen9_init_workarounds(ring); | 1010 | gen9_init_workarounds(ring); |
1008 | 1011 | ||
1012 | /* WaDisablePowerCompilerClockGating:skl */ | ||
1013 | if (INTEL_REVID(dev) == SKL_REVID_B0) | ||
1014 | WA_SET_BIT_MASKED(HIZ_CHICKEN, | ||
1015 | BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE); | ||
1016 | |||
1009 | return 0; | 1017 | return 0; |
1010 | } | 1018 | } |
1011 | 1019 | ||