OSDN Git Service

drm/msm/a6xx: Use new kernel API free function for gpu state
authorJordan Crouse <jcrouse@codeaurora.org>
Mon, 3 Dec 2018 19:39:45 +0000 (12:39 -0700)
committerRob Clark <robdclark@gmail.com>
Tue, 11 Dec 2018 18:07:09 +0000 (13:07 -0500)
dadb36b7ec42 ("drm/msm: Add a common function to free kernel buffer objects")
missed freeing the crashdumper state for a6xx.

Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c

index df6308e..716595b 100644 (file)
@@ -149,15 +149,6 @@ static int a6xx_crashdumper_run(struct msm_gpu *gpu,
        return ret;
 }
 
-static void a6xx_crashdumper_free(struct msm_gpu *gpu,
-               struct a6xx_crashdumper *dumper)
-{
-       msm_gem_unpin_iova(dumper->bo, gpu->aspace);
-       msm_gem_put_vaddr(dumper->bo);
-
-       drm_gem_object_unreference(dumper->bo);
-}
-
 /* read a value from the GX debug bus */
 static int debugbus_read(struct msm_gpu *gpu, u32 block, u32 offset,
                u32 *data)
@@ -900,7 +891,7 @@ struct msm_gpu_state *a6xx_gpu_state_get(struct msm_gpu *gpu)
                a6xx_get_clusters(gpu, a6xx_state, &dumper);
                a6xx_get_dbgahb_clusters(gpu, a6xx_state, &dumper);
 
-               a6xx_crashdumper_free(gpu, &dumper);
+               msm_gem_kernel_put(dumper.bo, gpu->aspace, true);
        }
 
        a6xx_get_debugbus(gpu, a6xx_state);