diff options
| author | Ben Widawsky <benjamin.widawsky@intel.com> | 2014-02-05 10:35:33 +0000 |
|---|---|---|
| committer | Ben Widawsky <benjamin.widawsky@intel.com> | 2014-02-08 13:14:51 -0800 |
| commit | bbd041a882253d98b470baaebf66022a7e19e924 (patch) | |
| tree | c6de3448b002b97cdefab729b684d6544b0bb18f | |
| parent | b8ee1c562328efd164e39d95de8e49d42e672812 (diff) | |
drm/i915: s/I915_PPGTT_PT_ENTRIES/GEN6_PTES_PER_PAGE
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_gtt.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 6e858e17bb0c..1e9d9ab26ed8 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -30,7 +30,7 @@ #include "intel_drv.h" #define GEN6_PPGTT_PD_ENTRIES 512 -#define I915_PPGTT_PT_ENTRIES (PAGE_SIZE / sizeof(gen6_gtt_pte_t)) +#define GEN6_PTES_PER_PAGE (PAGE_SIZE / sizeof(gen6_gtt_pte_t)) typedef uint64_t gen8_gtt_pte_t; typedef gen8_gtt_pte_t gen8_ppgtt_pde_t; @@ -492,9 +492,9 @@ static void gen6_dump_ppgtt(struct i915_hw_ppgtt *ppgtt, struct seq_file *m) seq_printf(m, "\tPDE: %x\n", pd_entry); pt_vaddr = kmap_atomic(ppgtt->pt_pages[pde]); - for (pte = 0; pte < I915_PPGTT_PT_ENTRIES; pte+=4) { + for (pte = 0; pte < GEN6_PTES_PER_PAGE; pte+=4) { unsigned long va = - (pde * PAGE_SIZE * I915_PPGTT_PT_ENTRIES) + + (pde * PAGE_SIZE * GEN6_PTES_PER_PAGE) + (pte * PAGE_SIZE); int i; bool found = false; @@ -766,16 +766,16 @@ static void gen6_ppgtt_clear_range(struct i915_address_space *vm, struct i915_hw_ppgtt *ppgtt = container_of(vm, struct i915_hw_ppgtt, base); gen6_gtt_pte_t *pt_vaddr, scratch_pte; - unsigned act_pt = first_entry / I915_PPGTT_PT_ENTRIES; - unsigned first_pte = first_entry % I915_PPGTT_PT_ENTRIES; + unsigned act_pt = first_entry / GEN6_PTES_PER_PAGE; + unsigned first_pte = first_entry % GEN6_PTES_PER_PAGE; unsigned last_pte, i; scratch_pte = vm->pte_encode(vm->scratch.addr, I915_CACHE_LLC, true); while (num_entries) { last_pte = first_pte + num_entries; - if (last_pte > I915_PPGTT_PT_ENTRIES) - last_pte = I915_PPGTT_PT_ENTRIES; + if (last_pte > GEN6_PTES_PER_PAGE) + last_pte = GEN6_PTES_PER_PAGE; pt_vaddr = kmap_atomic(ppgtt->pt_pages[act_pt]); @@ -798,8 +798,8 @@ static void gen6_ppgtt_insert_entries(struct i915_address_space *vm, struct i915_hw_ppgtt *ppgtt = container_of(vm, struct i915_hw_ppgtt, base); gen6_gtt_pte_t *pt_vaddr; - unsigned act_pt = first_entry / I915_PPGTT_PT_ENTRIES; - unsigned act_pte = first_entry % I915_PPGTT_PT_ENTRIES; + unsigned act_pt = first_entry / GEN6_PTES_PER_PAGE; + unsigned act_pte = first_entry % GEN6_PTES_PER_PAGE; struct sg_page_iter sg_iter; pt_vaddr = NULL; @@ -810,7 +810,7 @@ static void gen6_ppgtt_insert_entries(struct i915_address_space *vm, pt_vaddr[act_pte] = vm->pte_encode(sg_page_iter_dma_address(&sg_iter), cache_level, true); - if (++act_pte == I915_PPGTT_PT_ENTRIES) { + if (++act_pte == GEN6_PTES_PER_PAGE) { kunmap_atomic(pt_vaddr); pt_vaddr = NULL; act_pt++; @@ -897,7 +897,7 @@ alloc: ppgtt->base.cleanup = gen6_ppgtt_cleanup; ppgtt->base.scratch = dev_priv->gtt.base.scratch; ppgtt->base.start = 0; - ppgtt->base.total = GEN6_PPGTT_PD_ENTRIES * I915_PPGTT_PT_ENTRIES * PAGE_SIZE; + ppgtt->base.total = GEN6_PPGTT_PD_ENTRIES * GEN6_PTES_PER_PAGE * PAGE_SIZE; ppgtt->pt_pages = kcalloc(ppgtt->num_pd_entries, sizeof(struct page *), GFP_KERNEL); if (!ppgtt->pt_pages) { @@ -931,7 +931,7 @@ alloc: } ppgtt->base.clear_range(&ppgtt->base, 0, - ppgtt->num_pd_entries * I915_PPGTT_PT_ENTRIES, true); + ppgtt->num_pd_entries * GEN6_PTES_PER_PAGE, true); ppgtt->debug_dump = gen6_dump_ppgtt; DRM_DEBUG_DRIVER("Allocated pde space (%ldM) at GTT entry: %lx\n", |