drm/i915: Remove _entry from PPGTT page structures

Lets try to keep this consistent:

Page Directory Pointer (PDP).
Page Directory (PD), also known as page directory pointer entries.
Page Table (PT), also known as page directory entries.

s/struct i915_page_table_entry/struct i915_page_table/
s/struct i915_page_directory_entry/struct i915_page_directory/
s/struct i915_page_directory_pointer_entry/struct
i915_page_directory_pointer/

Suggested-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 0239fbff7bf7282930aa6f345c62ab5c8b502456..c1a2fab9c7904ac654e6291a8b512d55296c857a 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -320,7 +320,7 @@ static inline int i915_dma_map_page_single(struct page *page,
        return 0;
 }
 
-static void unmap_and_free_pt(struct i915_page_table_entry *pt,
+static void unmap_and_free_pt(struct i915_page_table *pt,
                               struct drm_device *dev)
 {
        if (WARN_ON(!pt->page))
@@ -332,9 +332,9 @@ static void unmap_and_free_pt(struct i915_page_table_entry *pt,
        kfree(pt);
 }
 
-static struct i915_page_table_entry *alloc_pt_single(struct drm_device *dev)
+static struct i915_page_table *alloc_pt_single(struct drm_device *dev)
 {
-       struct i915_page_table_entry *pt;
+       struct i915_page_table *pt;
        const size_t count = INTEL_INFO(dev)->gen >= 8 ?
                GEN8_PTES : GEN6_PTES;
        int ret = -ENOMEM;
@@ -383,7 +383,7 @@ fail_bitmap:
  *
  * Return: 0 if allocation succeeded.
  */
-static int alloc_pt_range(struct i915_page_directory_entry *pd, uint16_t pde, size_t count,
+static int alloc_pt_range(struct i915_page_directory *pd, uint16_t pde, size_t count,
                          struct drm_device *dev)
 {
        int i, ret;
@@ -393,7 +393,7 @@ static int alloc_pt_range(struct i915_page_directory_entry *pd, uint16_t pde, si
                return -EINVAL;
 
        for (i = pde; i < pde + count; i++) {
-               struct i915_page_table_entry *pt = alloc_pt_single(dev);
+               struct i915_page_table *pt = alloc_pt_single(dev);
 
                if (IS_ERR(pt)) {
                        ret = PTR_ERR(pt);
@@ -413,7 +413,7 @@ err_out:
        return ret;
 }
 
-static void unmap_and_free_pd(struct i915_page_directory_entry *pd)
+static void unmap_and_free_pd(struct i915_page_directory *pd)
 {
        if (pd->page) {
                __free_page(pd->page);
@@ -421,9 +421,9 @@ static void unmap_and_free_pd(struct i915_page_directory_entry *pd)
        }
 }
 
-static struct i915_page_directory_entry *alloc_pd_single(void)
+static struct i915_page_directory *alloc_pd_single(void)
 {
-       struct i915_page_directory_entry *pd;
+       struct i915_page_directory *pd;
 
        pd = kzalloc(sizeof(*pd), GFP_KERNEL);
        if (!pd)
@@ -497,8 +497,8 @@ static void gen8_ppgtt_clear_range(struct i915_address_space *vm,
                                      I915_CACHE_LLC, use_scratch);
 
        while (num_entries) {
-               struct i915_page_directory_entry *pd;
-               struct i915_page_table_entry *pt;
+               struct i915_page_directory *pd;
+               struct i915_page_table *pt;
                struct page *page_table;
 
                if (WARN_ON(!ppgtt->pdp.page_directory[pdpe]))
@@ -559,8 +559,8 @@ static void gen8_ppgtt_insert_entries(struct i915_address_space *vm,
                        break;
 
                if (pt_vaddr == NULL) {
-                       struct i915_page_directory_entry *pd = ppgtt->pdp.page_directory[pdpe];
-                       struct i915_page_table_entry *pt = pd->page_table[pde];
+                       struct i915_page_directory *pd = ppgtt->pdp.page_directory[pdpe];
+                       struct i915_page_table *pt = pd->page_table[pde];
                        struct page *page_table = pt->page;
 
                        pt_vaddr = kmap_atomic(page_table);
@@ -588,7 +588,7 @@ static void gen8_ppgtt_insert_entries(struct i915_address_space *vm,
        }
 }
 
-static void gen8_free_page_tables(struct i915_page_directory_entry *pd, struct drm_device *dev)
+static void gen8_free_page_tables(struct i915_page_directory *pd, struct drm_device *dev)
 {
        int i;
 
@@ -632,8 +632,8 @@ static void gen8_ppgtt_unmap_pages(struct i915_hw_ppgtt *ppgtt)
                               PCI_DMA_BIDIRECTIONAL);
 
                for (j = 0; j < I915_PDES; j++) {
-                       struct i915_page_directory_entry *pd = ppgtt->pdp.page_directory[i];
-                       struct i915_page_table_entry *pt;
+                       struct i915_page_directory *pd = ppgtt->pdp.page_directory[i];
+                       struct i915_page_table *pt;
                        dma_addr_t addr;
 
                        if (WARN_ON(!pd->page_table[j]))
@@ -747,8 +747,8 @@ static int gen8_ppgtt_setup_page_tables(struct i915_hw_ppgtt *ppgtt,
                                        const int pt)
 {
        dma_addr_t pt_addr;
-       struct i915_page_directory_entry *pdir = ppgtt->pdp.page_directory[pd];
-       struct i915_page_table_entry *ptab = pdir->page_table[pt];
+       struct i915_page_directory *pdir = ppgtt->pdp.page_directory[pd];
+       struct i915_page_table *ptab = pdir->page_table[pt];
        struct page *p = ptab->page;
        int ret;
 
@@ -815,11 +815,11 @@ static int gen8_ppgtt_init(struct i915_hw_ppgtt *ppgtt, uint64_t size)
         * will never need to touch the PDEs again.
         */
        for (i = 0; i < GEN8_LEGACY_PDPES; i++) {
-               struct i915_page_directory_entry *pd = ppgtt->pdp.page_directory[i];
+               struct i915_page_directory *pd = ppgtt->pdp.page_directory[i];
                gen8_pde_t *pd_vaddr;
                pd_vaddr = kmap_atomic(ppgtt->pdp.page_directory[i]->page);
                for (j = 0; j < I915_PDES; j++) {
-                       struct i915_page_table_entry *pt = pd->page_table[j];
+                       struct i915_page_table *pt = pd->page_table[j];
                        dma_addr_t addr = pt->daddr;
                        pd_vaddr[j] = gen8_pde_encode(ppgtt->base.dev, addr,
                                                      I915_CACHE_LLC);
@@ -914,8 +914,8 @@ static void gen6_dump_ppgtt(struct i915_hw_ppgtt *ppgtt, struct seq_file *m)
 }
 
 /* Write pde (index) from the page directory @pd to the page table @pt */
-static void gen6_write_pde(struct i915_page_directory_entry *pd,
-                           const int pde, struct i915_page_table_entry *pt)
+static void gen6_write_pde(struct i915_page_directory *pd,
+                           const int pde, struct i915_page_table *pt)
 {
        /* Caller needs to make sure the write completes if necessary */
        struct i915_hw_ppgtt *ppgtt =
@@ -931,10 +931,10 @@ static void gen6_write_pde(struct i915_page_directory_entry *pd,
 /* Write all the page tables found in the ppgtt structure to incrementing page
  * directories. */
 static void gen6_write_page_range(struct drm_i915_private *dev_priv,
-                                 struct i915_page_directory_entry *pd,
+                                 struct i915_page_directory *pd,
                                  uint32_t start, uint32_t length)
 {
-       struct i915_page_table_entry *pt;
+       struct i915_page_table *pt;
        uint32_t pde, temp;
 
        gen6_for_each_pde(pt, pd, start, length, temp, pde)
@@ -1169,7 +1169,7 @@ static inline void mark_tlbs_dirty(struct i915_hw_ppgtt *ppgtt)
 }
 
 static void gen6_initialize_pt(struct i915_address_space *vm,
-               struct i915_page_table_entry *pt)
+               struct i915_page_table *pt)
 {
        gen6_pte_t *pt_vaddr, scratch_pte;
        int i;
@@ -1195,7 +1195,7 @@ static int gen6_alloc_va_range(struct i915_address_space *vm,
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct i915_hw_ppgtt *ppgtt =
                                container_of(vm, struct i915_hw_ppgtt, base);
-       struct i915_page_table_entry *pt;
+       struct i915_page_table *pt;
        const uint32_t start_save = start, length_save = length;
        uint32_t pde, temp;
        int ret;
@@ -1263,7 +1263,7 @@ static int gen6_alloc_va_range(struct i915_address_space *vm,
 
 unwind_out:
        for_each_set_bit(pde, new_page_tables, I915_PDES) {
-               struct i915_page_table_entry *pt = ppgtt->pd.page_table[pde];
+               struct i915_page_table *pt = ppgtt->pd.page_table[pde];
 
                ppgtt->pd.page_table[pde] = ppgtt->scratch_pt;
                unmap_and_free_pt(pt, vm->dev);
@@ -1278,7 +1278,7 @@ static void gen6_ppgtt_free(struct i915_hw_ppgtt *ppgtt)
        int i;
 
        for (i = 0; i < ppgtt->num_pd_entries; i++) {
-               struct i915_page_table_entry *pt = ppgtt->pd.page_table[i];
+               struct i915_page_table *pt = ppgtt->pd.page_table[i];
 
                if (pt != ppgtt->scratch_pt)
                        unmap_and_free_pt(ppgtt->pd.page_table[i], ppgtt->base.dev);
@@ -1358,7 +1358,7 @@ static int gen6_ppgtt_alloc(struct i915_hw_ppgtt *ppgtt)
 static void gen6_scratch_va_range(struct i915_hw_ppgtt *ppgtt,
                                  uint64_t start, uint64_t length)
 {
-       struct i915_page_table_entry *unused;
+       struct i915_page_table *unused;
        uint32_t pde, temp;
 
        gen6_for_each_pde(unused, &ppgtt->pd, start, length, temp, pde)

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h
index fc03c99317c94af817bc7a17e7ca4663418ec2ec..1384789673e302f5dc78e61df3c2da39802c0a2f 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_gtt.h
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
@@ -206,26 +206,26 @@ struct i915_vma {
                         u32 flags);
 };
 
-struct i915_page_table_entry {
+struct i915_page_table {
        struct page *page;
        dma_addr_t daddr;
 
        unsigned long *used_ptes;
 };
 
-struct i915_page_directory_entry {
+struct i915_page_directory {
        struct page *page; /* NULL for GEN6-GEN7 */
        union {
                uint32_t pd_offset;
                dma_addr_t daddr;
        };
 
-       struct i915_page_table_entry *page_table[I915_PDES]; /* PDEs */
+       struct i915_page_table *page_table[I915_PDES]; /* PDEs */
 };
 
-struct i915_page_directory_pointer_entry {
+struct i915_page_directory_pointer {
        /* struct page *page; */
-       struct i915_page_directory_entry *page_directory[GEN8_LEGACY_PDPES];
+       struct i915_page_directory *page_directory[GEN8_LEGACY_PDPES];
 };
 
 struct i915_address_space {
@@ -317,11 +317,11 @@ struct i915_hw_ppgtt {
        unsigned num_pd_entries;
        unsigned num_pd_pages; /* gen8+ */
        union {
-               struct i915_page_directory_pointer_entry pdp;
-               struct i915_page_directory_entry pd;
+               struct i915_page_directory_pointer pdp;
+               struct i915_page_directory pd;
        };
 
-       struct i915_page_table_entry *scratch_pt;
+       struct i915_page_table *scratch_pt;
 
        struct drm_i915_file_private *file_priv;
 

diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index b3070a4501ab59e3009758cb9ab624af8343a258..4574f0cc9b1cf1083fdf2eb54c46e66852726f1c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -221,7 +221,7 @@ DEFINE_EVENT(i915_page_table_entry, i915_page_table_entry_alloc,
 
 DECLARE_EVENT_CLASS(i915_page_table_entry_update,
        TP_PROTO(struct i915_address_space *vm, u32 pde,
-                struct i915_page_table_entry *pt, u32 first, u32 count, u32 bits),
+                struct i915_page_table *pt, u32 first, u32 count, u32 bits),
        TP_ARGS(vm, pde, pt, first, count, bits),
 
        TP_STRUCT__entry(
@@ -251,7 +251,7 @@ DECLARE_EVENT_CLASS(i915_page_table_entry_update,
 
 DEFINE_EVENT(i915_page_table_entry_update, i915_page_table_entry_map,
        TP_PROTO(struct i915_address_space *vm, u32 pde,
-                struct i915_page_table_entry *pt, u32 first, u32 count, u32 bits),
+                struct i915_page_table *pt, u32 first, u32 count, u32 bits),
        TP_ARGS(vm, pde, pt, first, count, bits)
 );