intel/dump_gpu: only map in GTT buffers not previously mapped
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/2201>
diff --git a/src/intel/tools/intel_dump_gpu.c b/src/intel/tools/intel_dump_gpu.c
index 050ec78..c3330e6 100644
--- a/src/intel/tools/intel_dump_gpu.c
+++ b/src/intel/tools/intel_dump_gpu.c
@@ -68,6 +68,8 @@
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 @@
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 @@
bo->size = size;
bo->map = map;
bo->user_mapped = false;
+ bo->gtt_mapped = false;
}
static void
@@ -357,9 +362,7 @@
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
