Now that we support multiple page sizes for the ppgtt, it would be useful to track the real usage for debugging purposes.
Signed-off-by: Matthew Auld <[email protected]> Cc: Joonas Lahtinen <[email protected]> --- drivers/gpu/drm/i915/i915_gem_gtt.c | 10 ++++++++++ drivers/gpu/drm/i915/i915_gem_object.h | 2 ++ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 1 + 3 files changed, 13 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 924aec4adf6d..84de1618594e 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -217,6 +217,8 @@ static int ppgtt_bind_vma(struct i915_vma *vma, static void ppgtt_unbind_vma(struct i915_vma *vma) { vma->vm->clear_range(vma->vm, vma->node.start, vma->size); + + vma->obj->mm.page_sizes.gtt = 0; } static gen8_pte_t gen8_pte_encode(dma_addr_t addr, @@ -924,6 +926,8 @@ static void gen8_ppgtt_insert_3lvl(struct i915_address_space *vm, gen8_ppgtt_insert_pte_entries(ppgtt, &ppgtt->pdp, &iter, &idx, cache_level); + + page_sizes->gtt = I915_GTT_PAGE_SIZE; } static void gen8_ppgtt_insert_4lvl(struct i915_address_space *vm, @@ -972,6 +976,8 @@ static void gen8_ppgtt_insert_4lvl(struct i915_address_space *vm, } } + page_sizes->gtt |= page_size; + start += page_size; iter.dma += page_size; if (iter.dma >= iter.max) { @@ -1731,6 +1737,8 @@ static void gen6_ppgtt_insert_entries(struct i915_address_space *vm, } } while (1); kunmap_atomic(vaddr); + + page_sizes->gtt = I915_GTT_PAGE_SIZE; } static int gen6_alloc_va_range(struct i915_address_space *vm, @@ -2525,6 +2533,8 @@ static void aliasing_gtt_unbind_vma(struct i915_vma *vma) struct i915_address_space *vm = &i915->mm.aliasing_ppgtt->base; vm->clear_range(vm, vma->node.start, vma->size); + + vma->obj->mm.page_sizes.gtt = 0; } } diff --git a/drivers/gpu/drm/i915/i915_gem_object.h b/drivers/gpu/drm/i915/i915_gem_object.h index 6db34eac9794..9b00947bf856 100644 --- a/drivers/gpu/drm/i915/i915_gem_object.h +++ b/drivers/gpu/drm/i915/i915_gem_object.h @@ -129,9 +129,11 @@ struct drm_i915_gem_object { struct sg_table *pages; void *mapping; + /* TODO: whack some of this into the error state */ struct i915_page_sizes { unsigned int phys; unsigned int sg; + unsigned int gtt; } page_sizes; struct i915_gem_object_page_iter { diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c index 81c0d6b87e68..954f4140d902 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c @@ -267,6 +267,7 @@ static int lowlevel_hole(struct drm_i915_private *i915, GEM_BUG_ON(addr + BIT_ULL(size) > vm->total); vm->clear_range(vm, addr, BIT_ULL(size)); + obj->mm.page_sizes.gtt = 0; } i915_gem_object_unpin_pages(obj); -- 2.9.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
