Commit 76643600 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter

drm/i915: Rename to GEN8_LEGACY_PDPES

In gen8, 32b PPGTT has always had one "pdp" (it doesn't actually have
one, but it resembles having one). The #define was confusing as is, and
using "PDPE" is a much better description.

sed -i 's/GEN8_LEGACY_PDPS/GEN8_LEGACY_PDPES/' drivers/gpu/drm/i915/*.[ch]

It also matches the x86 pagetable terminology:
PTE  = Page Table Entry - pagetable level 1 page
PDE  = Page Directory Entry - pagetable level 2 page
PDPE = Page Directory Pointer Entry - pagetable level 3 page

And in the near future (for 48b addressing):
PML4E = Page Map Level 4 Entry

v2: Expanded information about Page Directory/Table nomenclature.

Cc: Daniel Vetter <daniel@ffwll.ch>
CC: Dave Gordon <david.s.gordon@intel.com>
Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: Michel Thierry <michel.thierry@intel.com> (v2)
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 33938714
...@@ -375,7 +375,7 @@ static void gen8_ppgtt_insert_entries(struct i915_address_space *vm, ...@@ -375,7 +375,7 @@ static void gen8_ppgtt_insert_entries(struct i915_address_space *vm,
pt_vaddr = NULL; pt_vaddr = NULL;
for_each_sg_page(pages->sgl, &sg_iter, pages->nents, 0) { for_each_sg_page(pages->sgl, &sg_iter, pages->nents, 0) {
if (WARN_ON(pdpe >= GEN8_LEGACY_PDPS)) if (WARN_ON(pdpe >= GEN8_LEGACY_PDPES))
break; break;
if (pt_vaddr == NULL) if (pt_vaddr == NULL)
...@@ -486,7 +486,7 @@ static struct page **__gen8_alloc_page_tables(void) ...@@ -486,7 +486,7 @@ static struct page **__gen8_alloc_page_tables(void)
static int gen8_ppgtt_allocate_page_tables(struct i915_hw_ppgtt *ppgtt, static int gen8_ppgtt_allocate_page_tables(struct i915_hw_ppgtt *ppgtt,
const int max_pdp) const int max_pdp)
{ {
struct page **pt_pages[GEN8_LEGACY_PDPS]; struct page **pt_pages[GEN8_LEGACY_PDPES];
int i, ret; int i, ret;
for (i = 0; i < max_pdp; i++) { for (i = 0; i < max_pdp; i++) {
...@@ -537,7 +537,7 @@ static int gen8_ppgtt_allocate_page_directories(struct i915_hw_ppgtt *ppgtt, ...@@ -537,7 +537,7 @@ static int gen8_ppgtt_allocate_page_directories(struct i915_hw_ppgtt *ppgtt,
return -ENOMEM; return -ENOMEM;
ppgtt->num_pd_pages = 1 << get_order(max_pdp << PAGE_SHIFT); ppgtt->num_pd_pages = 1 << get_order(max_pdp << PAGE_SHIFT);
BUG_ON(ppgtt->num_pd_pages > GEN8_LEGACY_PDPS); BUG_ON(ppgtt->num_pd_pages > GEN8_LEGACY_PDPES);
return 0; return 0;
} }
......
...@@ -88,7 +88,7 @@ typedef gen8_gtt_pte_t gen8_ppgtt_pde_t; ...@@ -88,7 +88,7 @@ typedef gen8_gtt_pte_t gen8_ppgtt_pde_t;
#define GEN8_PDE_MASK 0x1ff #define GEN8_PDE_MASK 0x1ff
#define GEN8_PTE_SHIFT 12 #define GEN8_PTE_SHIFT 12
#define GEN8_PTE_MASK 0x1ff #define GEN8_PTE_MASK 0x1ff
#define GEN8_LEGACY_PDPS 4 #define GEN8_LEGACY_PDPES 4
#define GEN8_PTES_PER_PAGE (PAGE_SIZE / sizeof(gen8_gtt_pte_t)) #define GEN8_PTES_PER_PAGE (PAGE_SIZE / sizeof(gen8_gtt_pte_t))
#define GEN8_PDES_PER_PAGE (PAGE_SIZE / sizeof(gen8_ppgtt_pde_t)) #define GEN8_PDES_PER_PAGE (PAGE_SIZE / sizeof(gen8_ppgtt_pde_t))
...@@ -273,12 +273,12 @@ struct i915_hw_ppgtt { ...@@ -273,12 +273,12 @@ struct i915_hw_ppgtt {
unsigned num_pd_pages; /* gen8+ */ unsigned num_pd_pages; /* gen8+ */
union { union {
struct page **pt_pages; struct page **pt_pages;
struct page **gen8_pt_pages[GEN8_LEGACY_PDPS]; struct page **gen8_pt_pages[GEN8_LEGACY_PDPES];
}; };
struct page *pd_pages; struct page *pd_pages;
union { union {
uint32_t pd_offset; uint32_t pd_offset;
dma_addr_t pd_dma_addr[GEN8_LEGACY_PDPS]; dma_addr_t pd_dma_addr[GEN8_LEGACY_PDPES];
}; };
union { union {
dma_addr_t *pt_dma_addr; dma_addr_t *pt_dma_addr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment