From: Rob Clark <robdcl...@chromium.org>
As with devcoredump, we need to iterate the VMAs to figure out what to
dump.
Signed-off-by: Rob Clark <robdcl...@chromium.org>
---
drivers/gpu/drm/msm/msm_rd.c | 48 +++++++++++++++++++++++++-----------
1 file changed, 33 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c
index edbcb93410a9..1876b789c924 100644
--- a/drivers/gpu/drm/msm/msm_rd.c
+++ b/drivers/gpu/drm/msm/msm_rd.c
@@ -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);
- }
+ mutex_lock(&to_msm_vm(submit->vm)->vm_lock);
+ drm_gpuvm_for_each_va (vma, submit->vm) {
+ bool dump = rd_full || (vma->flags & MSM_VMA_DUMP);
- 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);
+ /* 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);
+ }
+ mutex_unlock(&to_msm_vm(submit->vm)->vm_lock);
+
+ } 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);
+ }
}
}
--
2.48.1
