drm/msm/gpu: Only store local command buffers in the GPU state

Instead of trying to store all the tagged buffers from a hanging
submit only store the command buffers that were not imported.
This cuts down on the amount of data stored in the GPU state to
the base minimum of useful information.

The downside is that this will make it more difficult to
successfully replay a hang with just the GPU state but there
isn't any reason why that functionality can't be added back
in later once we've figured out how to better communicate
such massive amounts of data.

Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index d63fa2a361936dfaa3543819d3df885ae333be36..f43e329146e58a77d92f97e1856de37440b7712b 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -316,28 +316,28 @@ static void msm_gpu_crashstate_get_bo(struct msm_gpu_state *state,
        struct msm_gpu_state_bo *state_bo = &state->bos[state->nr_bos];
 
        /* Don't record write only objects */
-
        state_bo->size = obj->base.size;
        state_bo->iova = iova;
 
-       /* Only store the data for buffer objects marked for read */
-       if ((flags & MSM_SUBMIT_BO_READ)) {
+       /* Only store data for non imported buffer objects marked for read */
+       if ((flags & MSM_SUBMIT_BO_READ) && !obj->base.import_attach) {
                void *ptr;
 
                state_bo->data = kvmalloc(obj->base.size, GFP_KERNEL);
                if (!state_bo->data)
-                       return;
+                       goto out;
 
                ptr = msm_gem_get_vaddr_active(&obj->base);
                if (IS_ERR(ptr)) {
                        kvfree(state_bo->data);
-                       return;
+                       state_bo->data = NULL;
+                       goto out;
                }
 
                memcpy(state_bo->data, ptr, obj->base.size);
                msm_gem_put_vaddr(&obj->base);
        }
-
+out:
        state->nr_bos++;
 }
 
@@ -361,12 +361,15 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu,
        if (submit) {
                int i;
 
-               state->bos = kcalloc(submit->nr_bos,
+               state->bos = kcalloc(submit->nr_cmds,
                        sizeof(struct msm_gpu_state_bo), GFP_KERNEL);
 
-               for (i = 0; state->bos && i < submit->nr_bos; i++)
-                       msm_gpu_crashstate_get_bo(state, submit->bos[i].obj,
-                               submit->bos[i].iova, submit->bos[i].flags);
+               for (i = 0; state->bos && i < submit->nr_cmds; i++) {
+                       int idx = submit->cmd[i].idx;
+
+                       msm_gpu_crashstate_get_bo(state, submit->bos[idx].obj,
+                               submit->bos[idx].iova, submit->bos[idx].flags);
+               }
        }
 
        /* Set the active crash state to be dumped on failure */