Quoting Mika Kuoppala (2019-08-15 14:50:00)
> As we give page directory pointer (lvl 3) structure
> for pte insertion, we can fold both versions into
> one function by teaching it to get pdp regardless
> of top level.
>
> Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> Signed-off-by: Mika Kuoppala <mika.kuoppala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_gem_gtt.c | 84 ++++++++++++++++-------------
> 1 file changed, 48 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index e07c1ae971d7..85fd7ea0dd76 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -910,6 +910,32 @@ static inline unsigned int gen8_pd_top_count(const struct i915_address_space *vm
> return (vm->total + (1ull << shift) - 1) >> shift;
> }
>
> +static inline struct i915_page_directory *
> +gen8_pdp_for_page_index(struct i915_address_space * const vm, const u64 idx)
> +{
> + struct i915_ppgtt * const ppgtt = i915_vm_to_ppgtt(vm);
> + struct i915_page_directory *pd = ppgtt->pd;
> +
> + switch (vm->top) {
> + case 3:
> + pd = i915_pd_entry(pd, gen8_pd_index(idx, 3));
> + /* fall through */
You fell through for a break!
What could you be planning next?
if (vm->top == 2)
return ppgtt->pd;
else
return i915_pd_entry(ppgtt->pd, gen8_pd_index(idx, vm->top));
> + case 2:
> + break;
> +
> + default:
> + GEM_BUG_ON(vm->top);
> + }
> +
> + return pd;
> +}
> +
> +static inline struct i915_page_directory *
> +gen8_pdp_for_page_address(struct i915_address_space * const vm, const u64 addr)
> +{
> + return gen8_pdp_for_page_index(vm, addr >> GEN8_PTE_SHIFT);
> +}
> +
> static void __gen8_ppgtt_cleanup(struct i915_address_space *vm,
> struct i915_page_directory *pd,
> int count, int lvl)
> @@ -1182,23 +1208,7 @@ gen8_ppgtt_insert_pte_entries(struct i915_ppgtt *ppgtt,
> return idx;
> }
>
> -static void gen8_ppgtt_insert_3lvl(struct i915_address_space *vm,
> - struct i915_vma *vma,
> - enum i915_cache_level cache_level,
> - u32 flags)
> -{
> - struct i915_ppgtt *ppgtt = i915_vm_to_ppgtt(vm);
> - struct sgt_dma iter = sgt_dma(vma);
> -
> - gen8_ppgtt_insert_pte_entries(ppgtt, ppgtt->pd, &iter,
> - vma->node.start >> GEN8_PTE_SHIFT,
> - cache_level, flags);
> -
> - vma->page_sizes.gtt = I915_GTT_PAGE_SIZE;
> -}
> -
> static void gen8_ppgtt_insert_huge_entries(struct i915_vma *vma,
> - struct i915_page_directory *pml4,
> struct sgt_dma *iter,
> enum i915_cache_level cache_level,
> u32 flags)
> @@ -1208,9 +1218,9 @@ static void gen8_ppgtt_insert_huge_entries(struct i915_vma *vma,
> dma_addr_t rem = iter->sg->length;
>
> do {
> - struct i915_page_directory *pdp =
> - i915_pd_entry(pml4, __gen8_pte_index(start, 3));
> - struct i915_page_directory *pd =
> + struct i915_page_directory * const pdp =
> + gen8_pdp_for_page_address(vma->vm, start);
> + struct i915_page_directory * const pd =
> i915_pd_entry(pdp, __gen8_pte_index(start, 2));
> gen8_pte_t encode = pte_encode;
> unsigned int maybe_64K = -1;
> @@ -1316,26 +1326,31 @@ static void gen8_ppgtt_insert_huge_entries(struct i915_vma *vma,
> } while (iter->sg);
> }
>
> -static void gen8_ppgtt_insert_4lvl(struct i915_address_space *vm,
> - struct i915_vma *vma,
> - enum i915_cache_level cache_level,
> - u32 flags)
> +static void gen8_ppgtt_insert(struct i915_address_space *vm,
> + struct i915_vma *vma,
> + enum i915_cache_level cache_level,
> + u32 flags)
> {
> - struct i915_ppgtt *ppgtt = i915_vm_to_ppgtt(vm);
> + struct i915_ppgtt * const ppgtt = i915_vm_to_ppgtt(vm);
> struct sgt_dma iter = sgt_dma(vma);
> - struct i915_page_directory * const pml4 = ppgtt->pd;
>
> if (vma->page_sizes.sg > I915_GTT_PAGE_SIZE) {
It's worth having a GEM_BUG_ON(!i915_vm_is_4lvl()) here I think
Or we use (vma->page_size.sg & vm->page_sizes) & ~SZ_4K
> - gen8_ppgtt_insert_huge_entries(vma, pml4, &iter, cache_level,
> + gen8_ppgtt_insert_huge_entries(vma, &iter, cache_level,
> flags);
> } else {
> u64 idx = vma->node.start >> GEN8_PTE_SHIFT;
>
> - while ((idx = gen8_ppgtt_insert_pte_entries(ppgtt,
> - i915_pd_entry(pml4, gen8_pd_index(idx, 3)),
> - &iter, idx, cache_level,
> - flags)))
> - ;
> + do {
> + struct i915_page_directory * const pdp =
> + gen8_pdp_for_page_index(vm, idx);
> +
> + idx = gen8_ppgtt_insert_pte_entries(ppgtt,
> + pdp,
> + &iter,
> + idx,
> + cache_level,
> + flags);
gen8 ppgtt insert page table entries entries.
If we remove the final repetition, hopefully that's less like a cliff.
gen8_ppgtt_insert_pte
gen8_ppgtt_insert_huge
?
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
