amdgpu/uvd: get ring reference from rq scheduler

davidwuAMD · alexdeucher · commit 47f402a3e081 · 2024-12-05T14:15:22.000-05:00
base.sched may not be set for each instance and should not be used for cases such as non-IB tests. Fixes: 2320c9e ("drm/sched: memset() 'job' in drm_sched_job_init()") Signed-off-by: David (Ming Qiang) Wu <David.Wu3@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
@@ -1288,7 +1288,7 @@ static int uvd_v7_0_ring_patch_cs_in_place(struct amdgpu_cs_parser *p,
 					   struct amdgpu_job *job,
 					   struct amdgpu_ib *ib)
 {
-	struct amdgpu_ring *ring = to_amdgpu_ring(job->base.sched);
+	struct amdgpu_ring *ring = amdgpu_job_ring(job);
 	unsigned i;
 
 	/* No patching necessary for the first instance */

Original file line number	Diff line number	Diff line change
`@@ -1288,7 +1288,7 @@ static int uvd_v7_0_ring_patch_cs_in_place(struct amdgpu_cs_parser *p,`
`1288`	`1288`	`struct amdgpu_job *job,`
`1289`	`1289`	`struct amdgpu_ib *ib)`
`1290`	`1290`	`{`
`1291`		`- struct amdgpu_ring *ring = to_amdgpu_ring(job->base.sched);`
	`1291`	`+ struct amdgpu_ring *ring = amdgpu_job_ring(job);`
`1292`	`1292`	`unsigned i;`
`1293`	`1293`
`1294`	`1294`	`/* No patching necessary for the first instance */`