drm/amdgpu: Use the sched from entity for amdgpu_cs trace
authorjsg <jsg@openbsd.org>
Mon, 27 Mar 2023 03:25:04 +0000 (03:25 +0000)
committerjsg <jsg@openbsd.org>
Mon, 27 Mar 2023 03:25:04 +0000 (03:25 +0000)
From Leo Liu
208680ccf7bff31fc08735c2a23fd3dd3c19b903 in linux-6.1.y/6.1.16
cf22ef78f22ce4df4757472c5dbd33c430c5b659 in mainline linux

sys/dev/pci/drm/amd/amdgpu/amdgpu_trace.h

index 5e6ddc7..6cd6ea7 100644 (file)
@@ -153,10 +153,10 @@ TRACE_EVENT(amdgpu_cs,
 
            TP_fast_assign(
                           __entry->bo_list = p->bo_list;
-                          __entry->ring = to_amdgpu_ring(job->base.sched)->idx;
+                          __entry->ring = to_amdgpu_ring(job->base.entity->rq->sched)->idx;
                           __entry->dw = ib->length_dw;
                           __entry->fences = amdgpu_fence_count_emitted(
-                               to_amdgpu_ring(job->base.sched));
+                               to_amdgpu_ring(job->base.entity->rq->sched));
                           ),
            TP_printk("bo_list=%p, ring=%u, dw=%u, fences=%u",
                      __entry->bo_list, __entry->ring, __entry->dw,