commit 63c90acc9eba2c7252794b415ad4d5ace6956c4e
author Lionel Landwerlin <lionel.g.landwerlin@intel.com> Thu Oct 03 02:13:32 2019 +0300
committer Marge Bot <eric+marge@anholt.net> Fri Aug 07 11:27:54 2020 +0000
tree 631e30de52dec02e6982979de848ad5f977c3147
parent 54c68498d4c4627a56fd73f8a4becbed3327cad6

intel/dump_gpu: only write BOs mapped by the driver

Track what BOs are mapped by the driver and only write those. We can
safely assume that when not mapped there is no data to save.

v2: Don't forget to return the ret (Rafael)

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>

src/intel/tools/intel_dump_gpu.c

diff --git a/src/intel/tools/intel_dump_gpu.c b/src/intel/tools/intel_dump_gpu.c
index 24dd1df..1b6a1fa 100644
--- a/src/intel/tools/intel_dump_gpu.c
+++ b/src/intel/tools/intel_dump_gpu.c
@@ -65,6 +65,7 @@
    uint32_t size;
    uint64_t offset;
    void *map;
+   bool mapped;
 };
 
 static struct bo *bos;
@@ -285,12 +286,14 @@
       else
          data = bo->map;
 
-      if (bo == batch_bo) {
-         aub_write_trace_block(&aub_file, AUB_TRACE_TYPE_BATCH,
-                               GET_PTR(data), bo->size, bo->offset);
-      } else {
-         aub_write_trace_block(&aub_file, AUB_TRACE_TYPE_NOTYPE,
-                               GET_PTR(data), bo->size, bo->offset);
+      if (bo->mapped) {
+         if (bo == batch_bo) {
+            aub_write_trace_block(&aub_file, AUB_TRACE_TYPE_BATCH,
+                                  GET_PTR(data), bo->size, bo->offset);
+         } else {
+            aub_write_trace_block(&aub_file, AUB_TRACE_TYPE_NOTYPE,
+                                  GET_PTR(data), bo->size, bo->offset);
+         }
       }
 
       if (data != bo->map)
@@ -331,6 +334,7 @@
 
    bo->size = size;
    bo->map = map;
+   bo->mapped = false;
 }
 
 static void
@@ -342,6 +346,7 @@
       munmap(bo->map, bo->size);
    bo->size = 0;
    bo->map = NULL;
+   bo->mapped = false;
 }
 
 __attribute__ ((visibility ("default"))) int
@@ -636,6 +641,16 @@
          return ret;
       }
 
+      case DRM_IOCTL_I915_GEM_MMAP: {
+         ret = libc_ioctl(fd, request, argp);
+         if (ret == 0) {
+            struct drm_i915_gem_mmap *mmap = argp;
+            struct bo *bo = get_bo(fd, mmap->handle);
+            bo->mapped = true;
+         }
+         return ret;
+      }
+
       default:
          return libc_ioctl(fd, request, argp);
       }