[PATCH 1/2] drm/msm/a6xx: Replace kcalloc() with kvzalloc()

[Akhil P Oommen]

In order to reduce chance of allocation failure while capturing a6xx
gpu state, use kvzalloc() instead of kcalloc() in state_kcalloc().

Indirectly, this patch helps to fix leaking memory allocated for
gmu_debug object.

Fixes: b859f9b009b (drm/msm/gpu: Snapshot GMU debug buffer)
Signed-off-by: Akhil P Oommen <quic_akhi...@quicinc.com>
---

 drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c 
b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c
index 55f4433..3c112a6 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c
@@ -91,7 +91,7 @@ struct a6xx_state_memobj {
 static void *state_kcalloc(struct a6xx_gpu_state *a6xx_state, int nr, size_t 
objsize)
 {
        struct a6xx_state_memobj *obj =
-               kzalloc((nr * objsize) + sizeof(*obj), GFP_KERNEL);
+               kvzalloc((nr * objsize) + sizeof(*obj), GFP_KERNEL);
 
        if (!obj)
                return NULL;
@@ -819,7 +819,7 @@ static struct msm_gpu_state_bo *a6xx_snapshot_gmu_bo(
 
        snapshot->iova = bo->iova;
        snapshot->size = bo->size;
-       snapshot->data = kvzalloc(snapshot->size, GFP_KERNEL);
+       snapshot->data = state_kcalloc(a6xx_state, 1, snapshot->size);
        if (!snapshot->data)
                return NULL;
 
@@ -1034,14 +1034,8 @@ static void a6xx_gpu_state_destroy(struct kref *kref)
        struct a6xx_gpu_state *a6xx_state = container_of(state,
                        struct a6xx_gpu_state, base);
 
-       if (a6xx_state->gmu_log)
-               kvfree(a6xx_state->gmu_log->data);
-
-       if (a6xx_state->gmu_hfi)
-               kvfree(a6xx_state->gmu_hfi->data);
-
        list_for_each_entry_safe(obj, tmp, &a6xx_state->objs, node)
-               kfree(obj);
+               kvfree(obj);
 
        adreno_gpu_state_destroy(state);
        kfree(a6xx_state);
-- 
2.7.4