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

2019-07-04 Thread 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 
Reviewed-by: Chris Wilson 
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c 
b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 4709948a6c0e..84e119d7a5fc 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -594,8 +594,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))
 
@@ -697,7 +695,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);
}
@@ -709,7 +707,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);
 }
 
@@ -752,7 +750,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);
}
@@ -769,7 +767,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);
 }
@@ -1640,7 +1638,7 @@ static struct i915_ppgtt *gen8_ppgtt_create(struct 
drm_i915_private *i915)
}
 
if (i915_vm_is_4lvl(&ppgtt->vm)) {
-   err = setup_px(&ppgtt->vm, ppgtt->pd);
+   err = setup_page_dma(&ppgtt->vm, &ppgtt->pd->base);
if (err)
goto err_free_pdp;
 
-- 
2.17.1

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

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

2019-06-18 Thread 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 
Reviewed-by: Chris Wilson 
---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c 
b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 5df17db68875..b521b1ddd19b 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -551,8 +551,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))
 
@@ -654,7 +652,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);
}
@@ -666,7 +664,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);
 }
 
@@ -709,7 +707,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);
}
@@ -726,7 +724,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);
 }
@@ -1584,7 +1582,7 @@ static struct i915_ppgtt *gen8_ppgtt_create(struct 
drm_i915_private *i915)
}
 
if (i915_vm_is_4lvl(&ppgtt->vm)) {
-   err = setup_px(&ppgtt->vm, ppgtt->pd);
+   err = setup_page_dma(&ppgtt->vm, &ppgtt->pd->base);
if (err)
goto err_free_pdp;
 
-- 
2.17.1

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