[PATCH 8/8] drm/i915/gtt: Common swap for pd entry

[Mika Kuoppala]

Swapping a pd entry is same across the page directories. Make it so.

Signed-off-by: Mika Kuoppala <mika.kuoppala at linux.intel.com>
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 40 +++++++++++++++++++----------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index bdcfbbf758fb..8ebefce59ec4 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -746,6 +746,26 @@ static void __set_pd_entry(struct i915_page_directory * const pd,
 	if (likely(pd_has_phys_page(pd))) \
 		__set_pd_entry((pd), (pde), gen8_pde_encode(px_dma(to), I915_CACHE_LLC))
 
+static void *__swap_pd_entry(struct i915_page_directory * const pd,
+			     const unsigned short pde,
+			     void * const old_val,
+			     void * const new_val,
+			     const u64 encoded_entry)
+{
+	void * const old = cmpxchg(&pd->entry[pde], old_val, new_val);
+
+	if (likely(old == old_val)) {
+		atomic_inc(&pd->used);
+		if (likely(pd_has_phys_page(pd)))
+			__set_pd_entry(pd, pde, encoded_entry);
+	}
+
+	return old;
+}
+
+#define swap_pd_entry(pd, pde, old, to) \
+	__swap_pd_entry((pd), (pde), (old), (to), gen8_pde_encode(px_dma(to), I915_CACHE_LLC))
+
 /*
  * PDE TLBs are a pain to invalidate on GEN8+. When we modify
  * the page table structures, we mark them dirty so that
@@ -1317,11 +1337,8 @@ static int gen8_ppgtt_alloc_pd(struct i915_address_space *vm,
 			if (count < GEN8_PTES || intel_vgpu_active(vm->i915))
 				gen8_initialize_pt(vm, pt);
 
-			old = cmpxchg(&pd->entry[pde], vm->scratch_pt, pt);
-			if (old == vm->scratch_pt) {
-				set_pd_entry(pd, pde, pt);
-				atomic_inc(&pd->used);
-			} else {
+			old = swap_pd_entry(pd, pde, vm->scratch_pt, pt);
+			if (old != vm->scratch_pt) {
 				free_pt(vm, pt);
 				pt = old;
 			}
@@ -1362,11 +1379,8 @@ static int gen8_ppgtt_alloc_pdp(struct i915_address_space *vm,
 
 			init_pd(vm, pd, vm->scratch_pt);
 
-			old = cmpxchg(&pdp->entry[pdpe], vm->scratch_pd, pd);
-			if (old == vm->scratch_pd) {
-				set_pd_entry(pdp, pdpe, pd);
-				atomic_inc(&pdp->used);
-			} else {
+			old = swap_pd_entry(pdp, pdpe, vm->scratch_pd, pd);
+			if (old != vm->scratch_pd) {
 				free_pd(vm, pd);
 				pd = old;
 			}
@@ -1431,10 +1445,8 @@ static int gen8_ppgtt_alloc_4lvl(struct i915_address_space *vm,
 
 			init_pd(vm, pdp, vm->scratch_pd);
 
-			old = cmpxchg(&pml4->entry[pml4e], vm->scratch_pdp, pdp);
-			if (old == vm->scratch_pdp) {
-				set_pd_entry(pml4, pml4e, pdp);
-			} else {
+			old = swap_pd_entry(pml4, pml4e, vm->scratch_pdp, pdp);
+			if (old != vm->scratch_pdp) {
 				free_pd(vm, pdp);
 				pdp = old;
 			}
-- 
2.17.1