aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_pm.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 9af0af49382e..1f4b56e273c8 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -6508,7 +6508,7 @@ static void gen6_init_clock_gating(struct drm_device *dev)
6508 * to keep in mind (see 3DSTATE_PS and 3DSTATE_WM). 6508 * to keep in mind (see 3DSTATE_PS and 3DSTATE_WM).
6509 */ 6509 */
6510 I915_WRITE(GEN6_GT_MODE, 6510 I915_WRITE(GEN6_GT_MODE,
6511 GEN6_WIZ_HASHING_MASK | GEN6_WIZ_HASHING_16x4); 6511 _MASKED_FIELD(GEN6_WIZ_HASHING_MASK, GEN6_WIZ_HASHING_16x4));
6512 6512
6513 ilk_init_lp_watermarks(dev); 6513 ilk_init_lp_watermarks(dev);
6514 6514
@@ -6706,7 +6706,7 @@ static void haswell_init_clock_gating(struct drm_device *dev)
6706 * to keep in mind (see 3DSTATE_PS and 3DSTATE_WM). 6706 * to keep in mind (see 3DSTATE_PS and 3DSTATE_WM).
6707 */ 6707 */
6708 I915_WRITE(GEN7_GT_MODE, 6708 I915_WRITE(GEN7_GT_MODE,
6709 GEN6_WIZ_HASHING_MASK | GEN6_WIZ_HASHING_16x4); 6709 _MASKED_FIELD(GEN6_WIZ_HASHING_MASK, GEN6_WIZ_HASHING_16x4));
6710 6710
6711 /* WaSwitchSolVfFArbitrationPriority:hsw */ 6711 /* WaSwitchSolVfFArbitrationPriority:hsw */
6712 I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) | HSW_ECOCHK_ARB_PRIO_SOL); 6712 I915_WRITE(GAM_ECOCHK, I915_READ(GAM_ECOCHK) | HSW_ECOCHK_ARB_PRIO_SOL);
@@ -6803,7 +6803,7 @@ static void ivybridge_init_clock_gating(struct drm_device *dev)
6803 * to keep in mind (see 3DSTATE_PS and 3DSTATE_WM). 6803 * to keep in mind (see 3DSTATE_PS and 3DSTATE_WM).
6804 */ 6804 */
6805 I915_WRITE(GEN7_GT_MODE, 6805 I915_WRITE(GEN7_GT_MODE,
6806 GEN6_WIZ_HASHING_MASK | GEN6_WIZ_HASHING_16x4); 6806 _MASKED_FIELD(GEN6_WIZ_HASHING_MASK, GEN6_WIZ_HASHING_16x4));
6807 6807
6808 snpcr = I915_READ(GEN6_MBCUNIT_SNPCR); 6808 snpcr = I915_READ(GEN6_MBCUNIT_SNPCR);
6809 snpcr &= ~GEN6_MBC_SNPCR_MASK; 6809 snpcr &= ~GEN6_MBC_SNPCR_MASK;