drm/amdgpu: add proper job alloc/free functions

And use them in the CS instead of allocating IBs and jobs separately.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
index e7d2676839e1..f808b5a6e52b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
@@ -38,10 +38,10 @@ TRACE_EVENT(amdgpu_cs,
 
             TP_fast_assign(
                            __entry->bo_list = p->bo_list;
-                           __entry->ring = p->ibs[i].ring->idx;
-                           __entry->dw = p->ibs[i].length_dw;
+                           __entry->ring = p->job->ibs[i].ring->idx;
+                           __entry->dw = p->job->ibs[i].length_dw;
                            __entry->fences = amdgpu_fence_count_emitted(
-                                p->ibs[i].ring);
+                                p->job->ibs[i].ring);
                            ),
             TP_printk("bo_list=%p, ring=%u, dw=%u, fences=%u",
                       __entry->bo_list, __entry->ring, __entry->dw,