From 42cb068d9f16bdf4d6b82d17265c13673f38f75a Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Mon, 14 Oct 2019 00:42:27 +0300 Subject: [PATCH] intel/dump_gpu: only map in GTT buffers not previously mapped Signed-off-by: Lionel Landwerlin Reviewed-by: Kenneth Graunke Part-of: --- src/intel/tools/intel_dump_gpu.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/intel/tools/intel_dump_gpu.c b/src/intel/tools/intel_dump_gpu.c index 050ec78e3b8..c3330e6cc2e 100644 --- a/src/intel/tools/intel_dump_gpu.c +++ b/src/intel/tools/intel_dump_gpu.c @@ -68,6 +68,8 @@ struct bo { uint32_t size; uint64_t offset; void *map; + /* Whether the buffer has been positionned in the GTT already. */ + bool gtt_mapped : 1; /* Tracks userspace mmapping of the buffer */ bool user_mapped : 1; /* Using the i915-gem mmapping ioctl & execbuffer ioctl, track whether a @@ -278,8 +280,10 @@ dump_execbuffer2(int fd, struct drm_i915_gem_execbuffer2 *execbuffer2) bo->map = gem_mmap(fd, obj->handle, 0, bo->size); fail_if(bo->map == MAP_FAILED, "bo mmap failed\n"); - if (aub_use_execlists(&aub_file)) + if (aub_use_execlists(&aub_file) && !bo->gtt_mapped) { aub_map_ppgtt(&aub_file, bo->offset, bo->size); + bo->gtt_mapped = true; + } } batch_index = (execbuffer2->flags & I915_EXEC_BATCH_FIRST) ? 0 : @@ -348,6 +352,7 @@ add_new_bo(unsigned fd, int handle, uint64_t size, void *map) bo->size = size; bo->map = map; bo->user_mapped = false; + bo->gtt_mapped = false; } static void @@ -357,9 +362,7 @@ remove_bo(int fd, int handle) if (bo->map && !IS_USERPTR(bo->map)) munmap(bo->map, bo->size); - bo->size = 0; - bo->map = NULL; - bo->user_mapped = false; + memset(bo, 0, sizeof(*bo)); } __attribute__ ((visibility ("default"))) int -- 2.30.2