summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Widawsky <benjamin.widawsky@intel.com>2014-03-08 11:22:25 -0800
committerBen Widawsky <benjamin.widawsky@intel.com>2014-06-20 16:28:54 -0700
commit9f08734f14427f9a5bbb5820bcd1eb98a61b82cd (patch)
treea866d049f15ecc6f05500fdc6ab1c8fcdbce2a5f
parent7c4296720521fc2819fd2c558daaea3e5fc3c31e (diff)
drm/i915: Always dma map page table allocations
There is never a case where we don't want to do it. Since we've broken up the allocations into nice clean helper functions, it's both easy and obvious to do the dma mapping at the same time. Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
-rw-r--r--drivers/gpu/drm/i915/i915_gem_gtt.c78
1 files changed, 17 insertions, 61 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 1f67ca8a4b41..f9186e3b7ae4 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -222,20 +222,6 @@ static gen6_gtt_pte_t iris_pte_encode(dma_addr_t addr,
pci_unmap_page((dev)->pdev, (pt)->daddr, 4096, PCI_DMA_BIDIRECTIONAL); \
} while (0);
-
-static void dma_unmap_pt_range(struct i915_pagedir *pd,
- unsigned pde, size_t n,
- struct drm_device *dev)
-{
- if (WARN_ON(pde + n > I915_PDES_PER_PD))
- n = I915_PDES_PER_PD - pde;
-
- n += pde;
-
- for (; pde < n; pde++)
- dma_unmap_pt_single(pd->page_tables[pde], dev);
-}
-
/**
* dma_map_pt_single() - Create a dma mapping for a page table
* @pt: Page table to get a DMA map for
@@ -265,33 +251,12 @@ static int dma_map_pt_single(struct i915_pagetab *pt, struct drm_device *dev)
return 0;
}
-static int dma_map_pt_range(struct i915_pagedir *pd,
- unsigned pde, size_t n,
- struct drm_device *dev)
-{
- const int first = pde;
-
- if (WARN_ON(pde + n > I915_PDES_PER_PD))
- n = I915_PDES_PER_PD - pde;
-
- n += pde;
-
- for (; pde < n; pde++) {
- int ret;
- ret = dma_map_pt_single(pd->page_tables[pde], dev);
- if (ret) {
- dma_unmap_pt_range(pd, first, pde, dev);
- return ret;
- }
- }
-
- return 0;
-}
-
-static void free_pt_single(struct i915_pagetab *pt)
+static void free_pt_single(struct i915_pagetab *pt, struct drm_device *dev)
{
if (WARN_ON(!pt->page))
return;
+
+ dma_unmap_pt_single(pt, dev);
__free_page(pt->page);
kfree(pt);
}
@@ -299,6 +264,7 @@ static void free_pt_single(struct i915_pagetab *pt)
static struct i915_pagetab *alloc_pt_single(struct drm_device *dev)
{
struct i915_pagetab *pt;
+ int ret;
pt = kzalloc(sizeof(*pt), GFP_KERNEL);
if (!pt)
@@ -310,6 +276,13 @@ static struct i915_pagetab *alloc_pt_single(struct drm_device *dev)
return ERR_PTR(-ENOMEM);
}
+ ret = dma_map_pt_single(pt, dev);
+ if (ret) {
+ __free_page(pt->page);
+ kfree(pt);
+ return ERR_PTR(ret);
+ }
+
return pt;
}
@@ -353,7 +326,7 @@ static int alloc_pt_range(struct i915_pagedir *pd, uint16_t pde, size_t count,
err_out:
while (i--)
- free_pt_single(pd->page_tables[i]);
+ free_pt_single(pd->page_tables[i], dev);
return ret;
}
@@ -528,7 +501,7 @@ static void gen8_ppgtt_insert_entries(struct i915_address_space *vm,
}
}
-static void gen8_free_page_tables(struct i915_pagedir *pd)
+static void gen8_free_page_tables(struct i915_pagedir *pd, struct drm_device *dev)
{
int i;
@@ -536,7 +509,7 @@ static void gen8_free_page_tables(struct i915_pagedir *pd)
return;
for (i = 0; i < I915_PDES_PER_PD; i++) {
- free_pt_single(pd->page_tables[i]);
+ free_pt_single(pd->page_tables[i], dev);
pd->page_tables[i] = NULL;
}
}
@@ -546,7 +519,7 @@ static void gen8_ppgtt_free(struct i915_hw_ppgtt *ppgtt)
int i;
for (i = 0; i < ppgtt->num_pd_pages; i++) {
- gen8_free_page_tables(ppgtt->pdp.pagedir[i]);
+ gen8_free_page_tables(ppgtt->pdp.pagedir[i], ppgtt->base.dev);
free_pd_single(ppgtt->pdp.pagedir[i]);
}
}
@@ -603,7 +576,7 @@ static int gen8_ppgtt_allocate_page_tables(struct i915_hw_ppgtt *ppgtt)
unwind_out:
while (i--)
- gen8_free_page_tables(ppgtt->pdp.pagedir[i]);
+ gen8_free_page_tables(ppgtt->pdp.pagedir[i], ppgtt->base.dev);
return -ENOMEM;
}
@@ -701,18 +674,9 @@ static int gen8_ppgtt_init(struct i915_hw_ppgtt *ppgtt, uint64_t size)
* 2. Create DMA mappings for the page directories and page tables.
*/
for (i = 0; i < max_pdp; i++) {
- struct i915_pagedir *pd;
ret = gen8_ppgtt_setup_page_directories(ppgtt, i);
if (ret)
goto bail;
-
- pd = ppgtt->pdp.pagedir[i];
-
- for (j = 0; j < I915_PDES_PER_PD; j++) {
- ret = dma_map_pt_single(pd->page_tables[j], ppgtt->base.dev);
- if (ret)
- goto bail;
- }
}
/*
@@ -1132,7 +1096,7 @@ static void gen6_ppgtt_free(struct i915_hw_ppgtt *ppgtt)
int i;
for (i = 0; i < ppgtt->num_pd_entries; i++)
- free_pt_single(ppgtt->pd.page_tables[i]);
+ free_pt_single(ppgtt->pd.page_tables[i], ppgtt->base.dev);
free_pd_single(&ppgtt->pd);
}
@@ -1146,7 +1110,6 @@ static void gen6_ppgtt_cleanup(struct i915_address_space *vm)
drm_mm_takedown(&ppgtt->base.mm);
drm_mm_remove_node(&ppgtt->node);
- dma_unmap_pt_range(&ppgtt->pd, 0, ppgtt->num_pd_entries, vm->dev);
gen6_ppgtt_free(ppgtt);
}
@@ -1233,13 +1196,6 @@ static int gen6_ppgtt_init(struct i915_hw_ppgtt *ppgtt)
if (ret)
return ret;
- ret = dma_map_pt_range(&ppgtt->pd, 0, ppgtt->num_pd_entries,
- ppgtt->base.dev);
- if (ret) {
- gen6_ppgtt_free(ppgtt);
- return ret;
- }
-
ppgtt->base.clear_range = gen6_ppgtt_clear_range;
ppgtt->base.insert_entries = gen6_ppgtt_insert_entries;
ppgtt->base.cleanup = gen6_ppgtt_cleanup;