drm/i915/gtt: Subclass gen6_hw_ppgtt

The legacy gen6 ppgtt needs a little more hand holding than gen8+, and
so requires a larger structure. As I intend to make this slightly more
complicated in the future, separate the gen6 from the core gen8 hw
struct by subclassing. This patch moves the gen6 only features out to
gen6_hw_ppgtt and pipes the new type everywhere that needs it.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Matthew Auld <matthew.william.auld@gmail.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180612081815.3585-1-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 905a58b6ddf806496ec75938bcbd68793844a092..62991e6cf1d547677fa94bda231fd0dfc2052bf7 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -1636,20 +1636,20 @@ err_free:
        return ERR_PTR(err);
 }
 
-static void gen6_dump_ppgtt(struct i915_hw_ppgtt *ppgtt, struct seq_file *m)
+static void gen6_dump_ppgtt(struct i915_hw_ppgtt *base, struct seq_file *m)
 {
-       struct i915_address_space *vm = &ppgtt->vm;
+       struct gen6_hw_ppgtt *ppgtt = to_gen6_ppgtt(base);
+       struct i915_address_space *vm = &base->vm;
        struct i915_page_table *unused;
        gen6_pte_t scratch_pte;
        u32 pd_entry, pte, pde;
-       u32 start = 0, length = ppgtt->vm.total;
 
        scratch_pte = vm->pte_encode(vm->scratch_page.daddr, I915_CACHE_LLC, 0);
 
-       gen6_for_each_pde(unused, &ppgtt->pd, start, length, pde) {
+       gen6_for_all_pdes(unused, &base->pd, pde) {
                u32 expected;
                gen6_pte_t *pt_vaddr;
-               const dma_addr_t pt_addr = px_dma(ppgtt->pd.page_table[pde]);
+               const dma_addr_t pt_addr = px_dma(base->pd.page_table[pde]);
                pd_entry = readl(ppgtt->pd_addr + pde);
                expected = (GEN6_PDE_ADDR_ENCODE(pt_addr) | GEN6_PDE_VALID);
 
@@ -1660,7 +1660,7 @@ static void gen6_dump_ppgtt(struct i915_hw_ppgtt *ppgtt, struct seq_file *m)
                                   expected);
                seq_printf(m, "\tPDE: %x\n", pd_entry);
 
-               pt_vaddr = kmap_atomic_px(ppgtt->pd.page_table[pde]);
+               pt_vaddr = kmap_atomic_px(base->pd.page_table[pde]);
 
                for (pte = 0; pte < GEN6_PTES; pte+=4) {
                        unsigned long va =
@@ -1688,7 +1688,7 @@ 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 inline void gen6_write_pde(const struct i915_hw_ppgtt *ppgtt,
+static inline void gen6_write_pde(const struct gen6_hw_ppgtt *ppgtt,
                                  const unsigned int pde,
                                  const struct i915_page_table *pt)
 {
@@ -1699,17 +1699,18 @@ static inline void gen6_write_pde(const struct i915_hw_ppgtt *ppgtt,
 
 /* Write all the page tables found in the ppgtt structure to incrementing page
  * directories. */
-static void gen6_write_page_range(struct i915_hw_ppgtt *ppgtt,
+static void gen6_write_page_range(struct i915_hw_ppgtt *base,
                                  u32 start, u32 length)
 {
+       struct gen6_hw_ppgtt *ppgtt = to_gen6_ppgtt(base);
        struct i915_page_table *pt;
        unsigned int pde;
 
-       gen6_for_each_pde(pt, &ppgtt->pd, start, length, pde)
+       gen6_for_each_pde(pt, &base->pd, start, length, pde)
                gen6_write_pde(ppgtt, pde, pt);
 
-       mark_tlbs_dirty(ppgtt);
-       gen6_ggtt_invalidate(ppgtt->vm.i915);
+       mark_tlbs_dirty(base);
+       gen6_ggtt_invalidate(base->vm.i915);
 }
 
 static void gen8_ppgtt_enable(struct drm_i915_private *dev_priv)
@@ -1843,28 +1844,28 @@ static void gen6_ppgtt_insert_entries(struct i915_address_space *vm,
 static int gen6_alloc_va_range(struct i915_address_space *vm,
                               u64 start, u64 length)
 {
-       struct i915_hw_ppgtt *ppgtt = i915_vm_to_ppgtt(vm);
+       struct gen6_hw_ppgtt *ppgtt = to_gen6_ppgtt(i915_vm_to_ppgtt(vm));
        struct i915_page_table *pt;
        u64 from = start;
        unsigned int pde;
        bool flush = false;
 
-       gen6_for_each_pde(pt, &ppgtt->pd, start, length, pde) {
+       gen6_for_each_pde(pt, &ppgtt->base.pd, start, length, pde) {
                if (pt == vm->scratch_pt) {
                        pt = alloc_pt(vm);
                        if (IS_ERR(pt))
                                goto unwind_out;
 
                        gen6_initialize_pt(vm, pt);
-                       ppgtt->pd.page_table[pde] = pt;
+                       ppgtt->base.pd.page_table[pde] = pt;
                        gen6_write_pde(ppgtt, pde, pt);
                        flush = true;
                }
        }
 
        if (flush) {
-               mark_tlbs_dirty(ppgtt);
-               gen6_ggtt_invalidate(ppgtt->vm.i915);
+               mark_tlbs_dirty(&ppgtt->base);
+               gen6_ggtt_invalidate(ppgtt->base.vm.i915);
        }
 
        return 0;
@@ -1901,24 +1902,23 @@ static void gen6_free_scratch(struct i915_address_space *vm)
 
 static void gen6_ppgtt_cleanup(struct i915_address_space *vm)
 {
-       struct i915_hw_ppgtt *ppgtt = i915_vm_to_ppgtt(vm);
-       struct i915_page_directory *pd = &ppgtt->pd;
+       struct gen6_hw_ppgtt *ppgtt = to_gen6_ppgtt(i915_vm_to_ppgtt(vm));
        struct i915_page_table *pt;
        u32 pde;
 
        drm_mm_remove_node(&ppgtt->node);
 
-       gen6_for_all_pdes(pt, pd, pde)
+       gen6_for_all_pdes(pt, &ppgtt->base.pd, pde)
                if (pt != vm->scratch_pt)
                        free_pt(vm, pt);
 
        gen6_free_scratch(vm);
 }
 
-static int gen6_ppgtt_allocate_page_directories(struct i915_hw_ppgtt *ppgtt)
+static int gen6_ppgtt_allocate_page_directories(struct gen6_hw_ppgtt *ppgtt)
 {
-       struct i915_address_space *vm = &ppgtt->vm;
-       struct drm_i915_private *dev_priv = ppgtt->vm.i915;
+       struct i915_address_space *vm = &ppgtt->base.vm;
+       struct drm_i915_private *dev_priv = ppgtt->base.vm.i915;
        struct i915_ggtt *ggtt = &dev_priv->ggtt;
        int ret;
 
@@ -1943,11 +1943,11 @@ static int gen6_ppgtt_allocate_page_directories(struct i915_hw_ppgtt *ppgtt)
        if (ppgtt->node.start < ggtt->mappable_end)
                DRM_DEBUG("Forced to use aperture for PDEs\n");
 
-       ppgtt->pd.base.ggtt_offset =
+       ppgtt->base.pd.base.ggtt_offset =
                ppgtt->node.start / PAGE_SIZE * sizeof(gen6_pte_t);
 
        ppgtt->pd_addr = (gen6_pte_t __iomem *)ggtt->gsm +
-               ppgtt->pd.base.ggtt_offset / sizeof(gen6_pte_t);
+               ppgtt->base.pd.base.ggtt_offset / sizeof(gen6_pte_t);
 
        return 0;
 
@@ -1956,70 +1956,70 @@ err_out:
        return ret;
 }
 
-static int gen6_ppgtt_alloc(struct i915_hw_ppgtt *ppgtt)
+static int gen6_ppgtt_alloc(struct gen6_hw_ppgtt *ppgtt)
 {
        return gen6_ppgtt_allocate_page_directories(ppgtt);
 }
 
-static void gen6_scratch_va_range(struct i915_hw_ppgtt *ppgtt,
+static void gen6_scratch_va_range(struct gen6_hw_ppgtt *ppgtt,
                                  u64 start, u64 length)
 {
        struct i915_page_table *unused;
        u32 pde;
 
-       gen6_for_each_pde(unused, &ppgtt->pd, start, length, pde)
-               ppgtt->pd.page_table[pde] = ppgtt->vm.scratch_pt;
+       gen6_for_each_pde(unused, &ppgtt->base.pd, start, length, pde)
+               ppgtt->base.pd.page_table[pde] = ppgtt->base.vm.scratch_pt;
 }
 
 static struct i915_hw_ppgtt *gen6_ppgtt_create(struct drm_i915_private *i915)
 {
        struct i915_ggtt * const ggtt = &i915->ggtt;
-       struct i915_hw_ppgtt *ppgtt;
+       struct gen6_hw_ppgtt *ppgtt;
        int err;
 
        ppgtt = kzalloc(sizeof(*ppgtt), GFP_KERNEL);
        if (!ppgtt)
                return ERR_PTR(-ENOMEM);
 
-       ppgtt->vm.i915 = i915;
-       ppgtt->vm.dma = &i915->drm.pdev->dev;
+       ppgtt->base.vm.i915 = i915;
+       ppgtt->base.vm.dma = &i915->drm.pdev->dev;
 
-       ppgtt->vm.pte_encode = ggtt->vm.pte_encode;
+       ppgtt->base.vm.pte_encode = ggtt->vm.pte_encode;
 
        err = gen6_ppgtt_alloc(ppgtt);
        if (err)
                goto err_free;
 
-       ppgtt->vm.total = I915_PDES * GEN6_PTES * PAGE_SIZE;
+       ppgtt->base.vm.total = I915_PDES * GEN6_PTES * PAGE_SIZE;
 
-       gen6_scratch_va_range(ppgtt, 0, ppgtt->vm.total);
-       gen6_write_page_range(ppgtt, 0, ppgtt->vm.total);
+       gen6_scratch_va_range(ppgtt, 0, ppgtt->base.vm.total);
+       gen6_write_page_range(&ppgtt->base, 0, ppgtt->base.vm.total);
 
-       err = gen6_alloc_va_range(&ppgtt->vm, 0, ppgtt->vm.total);
+       err = gen6_alloc_va_range(&ppgtt->base.vm, 0, ppgtt->base.vm.total);
        if (err)
                goto err_cleanup;
 
-       ppgtt->vm.clear_range = gen6_ppgtt_clear_range;
-       ppgtt->vm.insert_entries = gen6_ppgtt_insert_entries;
-       ppgtt->vm.cleanup = gen6_ppgtt_cleanup;
-       ppgtt->debug_dump = gen6_dump_ppgtt;
+       ppgtt->base.vm.clear_range = gen6_ppgtt_clear_range;
+       ppgtt->base.vm.insert_entries = gen6_ppgtt_insert_entries;
+       ppgtt->base.vm.cleanup = gen6_ppgtt_cleanup;
+       ppgtt->base.debug_dump = gen6_dump_ppgtt;
 
-       ppgtt->vm.vma_ops.bind_vma    = gen6_ppgtt_bind_vma;
-       ppgtt->vm.vma_ops.unbind_vma  = ppgtt_unbind_vma;
-       ppgtt->vm.vma_ops.set_pages   = ppgtt_set_pages;
-       ppgtt->vm.vma_ops.clear_pages = clear_pages;
+       ppgtt->base.vm.vma_ops.bind_vma    = gen6_ppgtt_bind_vma;
+       ppgtt->base.vm.vma_ops.unbind_vma  = ppgtt_unbind_vma;
+       ppgtt->base.vm.vma_ops.set_pages   = ppgtt_set_pages;
+       ppgtt->base.vm.vma_ops.clear_pages = clear_pages;
 
        DRM_DEBUG_DRIVER("Allocated pde space (%lldM) at GTT entry: %llx\n",
                         ppgtt->node.size >> 20,
                         ppgtt->node.start / PAGE_SIZE);
 
        DRM_DEBUG_DRIVER("Adding PPGTT at offset %x\n",
-                        ppgtt->pd.base.ggtt_offset << 10);
+                        ppgtt->base.pd.base.ggtt_offset << 10);
 
-       return ppgtt;
+       return &ppgtt->base;
 
 err_cleanup:
-       gen6_ppgtt_cleanup(&ppgtt->vm);
+       gen6_ppgtt_cleanup(&ppgtt->base.vm);
 err_free:
        kfree(ppgtt);
        return ERR_PTR(err);

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h
index e70f6abcd0f28f3be6ceed8cac766d9a435bdd87..7d65d813eff0b829c0a4e4c205efd52ac063260b 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_gtt.h
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
@@ -396,7 +396,7 @@ struct i915_ggtt {
 struct i915_hw_ppgtt {
        struct i915_address_space vm;
        struct kref ref;
-       struct drm_mm_node node;
+
        unsigned long pd_dirty_rings;
        union {
                struct i915_pml4 pml4;          /* GEN8+ & 48b PPGTT */
@@ -404,11 +404,24 @@ struct i915_hw_ppgtt {
                struct i915_page_directory pd;          /* GEN6-7 */
        };
 
-       gen6_pte_t __iomem *pd_addr;
-
        void (*debug_dump)(struct i915_hw_ppgtt *ppgtt, struct seq_file *m);
 };
 
+struct gen6_hw_ppgtt {
+       struct i915_hw_ppgtt base;
+
+       struct drm_mm_node node;
+       gen6_pte_t __iomem *pd_addr;
+};
+
+#define __to_gen6_ppgtt(base) container_of(base, struct gen6_hw_ppgtt, base)
+
+static inline struct gen6_hw_ppgtt *to_gen6_ppgtt(struct i915_hw_ppgtt *base)
+{
+       BUILD_BUG_ON(offsetof(struct gen6_hw_ppgtt, base));
+       return __to_gen6_ppgtt(base);
+}
+
 /*
  * gen6_for_each_pde() iterates over every pde from start until start+length.
  * If start and start+length are not perfectly divisible, the macro will round

diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
index f80cf7ce3fa96472bd4f6453b34a4344e196c769..a4060238bef031ba3b4b09b1c91a60d7c17153ea 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
@@ -135,17 +135,13 @@ static int igt_ppgtt_alloc(void *arg)
        struct drm_i915_private *dev_priv = arg;
        struct i915_hw_ppgtt *ppgtt;
        u64 size, last;
-       int err;
+       int err = 0;
 
        /* Allocate a ppggt and try to fill the entire range */
 
        if (!USES_PPGTT(dev_priv))
                return 0;
 
-       ppgtt = kzalloc(sizeof(*ppgtt), GFP_KERNEL);
-       if (!ppgtt)
-               return -ENOMEM;
-
        mutex_lock(&dev_priv->drm.struct_mutex);
        ppgtt = __hw_ppgtt_create(dev_priv);
        if (IS_ERR(ppgtt)) {
@@ -153,10 +149,8 @@ static int igt_ppgtt_alloc(void *arg)
                goto err_unlock;
        }
 
-       if (!ppgtt->vm.allocate_va_range) {
-               err = 0;
+       if (!ppgtt->vm.allocate_va_range)
                goto err_ppgtt_cleanup;
-       }
 
        /* Check we can allocate the entire range */
        for (size = 4096;