|
108 | 108 | static int
|
109 | 109 | i915_get_ggtt_vma_pages(struct i915_vma *vma);
|
110 | 110 |
|
111 |
| -static void gen6_ggtt_invalidate(struct drm_i915_private *dev_priv) |
| 111 | +static void gen6_ggtt_invalidate(struct drm_i915_private *i915) |
112 | 112 | {
|
| 113 | + struct intel_uncore *uncore = &i915->uncore; |
| 114 | + |
113 | 115 | /*
|
114 | 116 | * Note that as an uncached mmio write, this will flush the
|
115 | 117 | * WCB of the writes into the GGTT before it triggers the invalidate.
|
116 | 118 | */
|
117 |
| - I915_WRITE(GFX_FLSH_CNTL_GEN6, GFX_FLSH_CNTL_EN); |
| 119 | + intel_uncore_write_fw(uncore, GFX_FLSH_CNTL_GEN6, GFX_FLSH_CNTL_EN); |
118 | 120 | }
|
119 | 121 |
|
120 |
| -static void guc_ggtt_invalidate(struct drm_i915_private *dev_priv) |
| 122 | +static void guc_ggtt_invalidate(struct drm_i915_private *i915) |
121 | 123 | {
|
122 |
| - gen6_ggtt_invalidate(dev_priv); |
123 |
| - I915_WRITE(GEN8_GTCR, GEN8_GTCR_INVALIDATE); |
| 124 | + struct intel_uncore *uncore = &i915->uncore; |
| 125 | + |
| 126 | + gen6_ggtt_invalidate(i915); |
| 127 | + intel_uncore_write_fw(uncore, GEN8_GTCR, GEN8_GTCR_INVALIDATE); |
124 | 128 | }
|
125 | 129 |
|
126 |
| -static void gmch_ggtt_invalidate(struct drm_i915_private *dev_priv) |
| 130 | +static void gmch_ggtt_invalidate(struct drm_i915_private *i915) |
127 | 131 | {
|
128 | 132 | intel_gtt_chipset_flush();
|
129 | 133 | }
|
@@ -1347,10 +1351,10 @@ static void gen8_ppgtt_cleanup_4lvl(struct i915_hw_ppgtt *ppgtt)
|
1347 | 1351 |
|
1348 | 1352 | static void gen8_ppgtt_cleanup(struct i915_address_space *vm)
|
1349 | 1353 | {
|
1350 |
| - struct drm_i915_private *dev_priv = vm->i915; |
| 1354 | + struct drm_i915_private *i915 = vm->i915; |
1351 | 1355 | struct i915_hw_ppgtt *ppgtt = i915_vm_to_ppgtt(vm);
|
1352 | 1356 |
|
1353 |
| - if (intel_vgpu_active(dev_priv)) |
| 1357 | + if (intel_vgpu_active(i915)) |
1354 | 1358 | gen8_ppgtt_notify_vgt(ppgtt, false);
|
1355 | 1359 |
|
1356 | 1360 | if (i915_vm_is_4lvl(vm))
|
|
0 commit comments