drm/i915: Rename to GEN8_LEGACY_PDPES
Subsystems (2)
PATCH 1/1 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]
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +++--- drivers/gpu/drm/i915/i915_gem_gtt.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -3
@@ -301,7 +301,7 @@ static void gen8_ppgtt_insert_entries(struct i915_address_space *vm, pt_vaddr =NULL ;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 ;if (pt_vaddr ==NULL )
@@ -410,7 +410,7 @@ bail:static int gen8_ppgtt_allocate_page_tables (struct i915_hw_ppgtt *ppgtt,const int max_pdp) { -struct page **pt_pages[GEN8_LEGACY_PDPS ]; +struct page **pt_pages[GEN8_LEGACY_PDPES ];int i, ret;for (i =0 ; i < max_pdp; i++) {
@@ -462,7 +462,7 @@ static int gen8_ppgtt_allocate_page_directories(struct i915_hw_ppgtt *ppgtt,return -ENOMEM ; 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 ; }
drivers/gpu/drm/i915/i915_gem_gtt.h +3 -3
@@ -86,7 +86,7 @@ typedef gen8_gtt_pte_t gen8_ppgtt_pde_t;#define GEN8_PDE_MASK 0x1ff#define GEN8_PTE_SHIFT 12#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_PDES_PER_PAGE (PAGE_SIZE / sizeof(gen8_ppgtt_pde_t))
@@ -244,12 +244,12 @@ struct i915_hw_ppgtt {unsigned num_pd_pages;/* gen8+ */ union {struct page **pt_pages; -struct page **gen8_pt_pages[GEN8_LEGACY_PDPS ]; +struct page **gen8_pt_pages[GEN8_LEGACY_PDPES ]; };struct page *pd_pages;union {uint32_t pd_offset; -dma_addr_t pd_dma_addr[GEN8_LEGACY_PDPS ]; +dma_addr_t pd_dma_addr[GEN8_LEGACY_PDPES ]; };union {dma_addr_t *pt_dma_addr;
Signature · 1 line
1.9.1
Quoted 7 lines · Ben Widawsky
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]
Signed-off-by Ben Widawsky <[email protected]>
I have to admit that I still don't really see the finer disdinction here. Call me dense, but can you please supply expansions of pdp and pdpe?
Thus far I've simply looked at what the code does when reviewing ppgtt code ;-)
-Daniel
Quoted 71 lines
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +++--- drivers/gpu/drm/i915/i915_gem_gtt.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +3
-3@@ -301,7 +301,7 @@ static void gen8_ppgtt_insert_entries(struct i915_address_space *vm, pt_vaddr =NULL ;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 ;if (pt_vaddr ==NULL )@@ -410,7 +410,7 @@ bail:static int gen8_ppgtt_allocate_page_tables (struct i915_hw_ppgtt *ppgtt,const int max_pdp) { -struct page **pt_pages[GEN8_LEGACY_PDPS ]; +struct page **pt_pages[GEN8_LEGACY_PDPES ];int i, ret;for (i =0 ; i < max_pdp; i++) {@@ -462,7 +462,7 @@ static int gen8_ppgtt_allocate_page_directories(struct i915_hw_ppgtt *ppgtt,return -ENOMEM ; 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 ; }drivers/gpu/drm/i915/i915_gem_gtt.h +3
-3@@ -86,7 +86,7 @@ typedef gen8_gtt_pte_t gen8_ppgtt_pde_t;#define GEN8_PDE_MASK 0x1ff#define GEN8_PTE_SHIFT 12#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_PDES_PER_PAGE (PAGE_SIZE / sizeof(gen8_ppgtt_pde_t))@@ -244,12 +244,12 @@ struct i915_hw_ppgtt {unsigned num_pd_pages;/* gen8+ */ union {struct page **pt_pages; -struct page **gen8_pt_pages[GEN8_LEGACY_PDPS ]; +struct page **gen8_pt_pages[GEN8_LEGACY_PDPES ]; };struct page *pd_pages;union {uint32_t pd_offset; -dma_addr_t pd_dma_addr[GEN8_LEGACY_PDPS ]; +dma_addr_t pd_dma_addr[GEN8_LEGACY_PDPES ]; };union {dma_addr_t *pt_dma_addr;Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch