]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/msm: rd dumping support for sparse
authorRob Clark <robdclark@chromium.org>
Sun, 29 Jun 2025 20:13:11 +0000 (13:13 -0700)
committerRob Clark <robin.clark@oss.qualcomm.com>
Sat, 5 Jul 2025 00:48:37 +0000 (17:48 -0700)
As with devcoredump, we need to iterate the VMAs to figure out what to
dump.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com>
Tested-by: Antonino Maniscalco <antomani103@gmail.com>
Reviewed-by: Antonino Maniscalco <antomani103@gmail.com>
Patchwork: https://patchwork.freedesktop.org/patch/661510/

drivers/gpu/drm/msm/msm_rd.c

index edbcb93410a9acdd6bcd267606b535be756a66a8..54493a94dcb7d6328c3f73abdcdbc89e3ca302fc 100644 (file)
@@ -372,25 +372,43 @@ void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit,
 
        rd_write_section(rd, RD_CMD, msg, ALIGN(n, 4));
 
-       for (i = 0; i < submit->nr_bos; i++) {
-               struct drm_gem_object *obj = submit->bos[i].obj;
-               bool dump = rd_full || (submit->bos[i].flags & MSM_SUBMIT_BO_DUMP);
+       if (msm_context_is_vmbind(submit->queue->ctx)) {
+               struct drm_gpuva *vma;
 
-               snapshot_buf(rd, obj, submit->bos[i].iova, dump, 0, obj->size);
-       }
+               drm_gpuvm_resv_assert_held(submit->vm);
 
-       for (i = 0; i < submit->nr_cmds; i++) {
-               uint32_t szd  = submit->cmd[i].size; /* in dwords */
-               int idx = submit->cmd[i].idx;
-               bool dump = rd_full || (submit->bos[idx].flags & MSM_SUBMIT_BO_DUMP);
+               drm_gpuvm_for_each_va (vma, submit->vm) {
+                       bool dump = rd_full || (vma->flags & MSM_VMA_DUMP);
+
+                       /* Skip MAP_NULL/PRR VMAs: */
+                       if (!vma->gem.obj)
+                               continue;
+
+                       snapshot_buf(rd, vma->gem.obj, vma->va.addr, dump,
+                                    vma->gem.offset, vma->va.range);
+               }
+
+       } else {
+               for (i = 0; i < submit->nr_bos; i++) {
+                       struct drm_gem_object *obj = submit->bos[i].obj;
+                       bool dump = rd_full || (submit->bos[i].flags & MSM_SUBMIT_BO_DUMP);
+
+                       snapshot_buf(rd, obj, submit->bos[i].iova, dump, 0, obj->size);
+               }
+
+               for (i = 0; i < submit->nr_cmds; i++) {
+                       uint32_t szd  = submit->cmd[i].size; /* in dwords */
+                       int idx = submit->cmd[i].idx;
+                       bool dump = rd_full || (submit->bos[idx].flags & MSM_SUBMIT_BO_DUMP);
 
-               /* snapshot cmdstream bo's (if we haven't already): */
-               if (!dump) {
-                       struct drm_gem_object *obj = submit->bos[idx].obj;
-                       size_t offset = submit->cmd[i].iova - submit->bos[idx].iova;
+                       /* snapshot cmdstream bo's (if we haven't already): */
+                       if (!dump) {
+                               struct drm_gem_object *obj = submit->bos[idx].obj;
+                               size_t offset = submit->cmd[i].iova - submit->bos[idx].iova;
 
-                       snapshot_buf(rd, obj, submit->cmd[i].iova, true,
-                                    offset, szd * 4);
+                               snapshot_buf(rd, obj, submit->cmd[i].iova, true,
+                                       offset, szd * 4);
+                       }
                }
        }