From: jsg <jsg@openbsd.org>
Date: Mon, 27 Mar 2023 03:25:04 +0000 (+0000)
Subject: drm/amdgpu: Use the sched from entity for amdgpu_cs trace
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=aad183ce2f854871d5f3d28459eec7f539e52402;p=openbsd

drm/amdgpu: Use the sched from entity for amdgpu_cs trace

From Leo Liu
208680ccf7bff31fc08735c2a23fd3dd3c19b903 in linux-6.1.y/6.1.16
cf22ef78f22ce4df4757472c5dbd33c430c5b659 in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_trace.h b/sys/dev/pci/drm/amd/amdgpu/amdgpu_trace.h
index 5e6ddc7e101..6cd6ea765d3 100644
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_trace.h
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_trace.h
@@ -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,