[Intel-gfx] [PATCH 9/9] drm/i915/gtt: Tear down setup and cleanup macros for page dma

[Mika Kuoppala]

We don't use common codepaths to setup and cleanup page
directories vs page tables. So their setup and cleanup macros
are of no use.

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

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c 
b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 9b0d0a077e31..a2022f240fb6 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -550,8 +550,6 @@ static void cleanup_page_dma(struct i915_address_space *vm,
 
 #define kmap_atomic_px(px) kmap_atomic(px_base(px)->page)
 
-#define setup_px(vm, px) setup_page_dma((vm), px_base(px))
-#define cleanup_px(vm, px) cleanup_page_dma((vm), px_base(px))
 #define fill_px(vm, px, v) fill_page_dma((vm), px_base(px), (v))
 #define fill32_px(vm, px, v) fill_page_dma_32((vm), px_base(px), (v))
 
@@ -653,7 +651,7 @@ static struct i915_page_table *alloc_pt(struct 
i915_address_space *vm)
        if (unlikely(!pt))
                return ERR_PTR(-ENOMEM);
 
-       if (unlikely(setup_px(vm, pt))) {
+       if (unlikely(setup_page_dma(vm, &pt->base))) {
                kfree(pt);
                return ERR_PTR(-ENOMEM);
        }
@@ -665,7 +663,7 @@ static struct i915_page_table *alloc_pt(struct 
i915_address_space *vm)
 
 static void free_pt(struct i915_address_space *vm, struct i915_page_table *pt)
 {
-       cleanup_px(vm, pt);
+       cleanup_page_dma(vm, &pt->base);
        kfree(pt);
 }
 
@@ -706,7 +704,7 @@ static struct i915_page_directory *alloc_pd(struct 
i915_address_space *vm)
        if (unlikely(!pd))
                return ERR_PTR(-ENOMEM);
 
-       if (unlikely(setup_px(vm, pd))) {
+       if (unlikely(setup_page_dma(vm, &pd->base))) {
                kfree(pd);
                return ERR_PTR(-ENOMEM);
        }
@@ -723,7 +721,7 @@ static void free_pd(struct i915_address_space *vm,
                    struct i915_page_directory *pd)
 {
        if (likely(pd_has_phys_page(pd)))
-               cleanup_px(vm, pd);
+               cleanup_page_dma(vm, &pd->base);
 
        kfree(pd);
 }
@@ -1304,7 +1302,7 @@ static void gen8_ppgtt_cleanup_4lvl(struct i915_ppgtt 
*ppgtt)
                gen8_ppgtt_cleanup_3lvl(&ppgtt->vm, pdp);
        }
 
-       cleanup_px(&ppgtt->vm, pml4);
+       cleanup_page_dma(&ppgtt->vm, &pml4->base);
 }
 
 static void gen8_ppgtt_cleanup(struct i915_address_space *vm)
@@ -1581,7 +1579,7 @@ static struct i915_ppgtt *gen8_ppgtt_create(struct 
drm_i915_private *i915)
        }
 
        if (i915_vm_is_4lvl(&ppgtt->vm)) {
-               ret = setup_px(&ppgtt->vm, ppgtt->pd);
+               ret = setup_page_dma(&ppgtt->vm, &ppgtt->pd->base);
                if (ret)
                        goto err_free_pdp;
 
-- 
2.17.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx