Skip to contentSkip to conversation

drm/amdgpu: fix a wrong ib reference

PATCH In review Lang Yu 2 participants 2 messages Mar 7, 2022

Subsystems (2)
lore
Share & tools
lore

Lang Yu

author
#0 lore raw

PATCH 1/1 drm/amdgpu: fix a wrong ib reference

It should be p->job->ibs[j] instead of p->job->ibs[i] here.

Fixes 1027d5d791b7 (drm/amdgpu: use job and ib structures directly in CS parsers)
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +2 -5
index 662cb66493a4..e8a3078a85cc 100644
@@ -783,15 +783,12 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p)
 				memcpy(ib->ptr, kptr, chunk_ib->ib_bytes);
 				amdgpu_bo_kunmap(aobj);
 
-				r = amdgpu_ring_parse_cs(ring, p, p->job,
-							 &p->job->ibs[i]);
+				r = amdgpu_ring_parse_cs(ring, p, p->job, ib);
 				if (r)
 					return r;
 			} else {
 				ib->ptr = (uint32_t *)kptr;
-				r = amdgpu_ring_patch_cs_in_place(ring, p,
-								  p->job,
-								  &p->job->ibs[i]);
+				r = amdgpu_ring_patch_cs_in_place(ring, p, p->job, ib);
 				amdgpu_bo_kunmap(aobj);
 				if (r)
 					return r;
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw

Am 07.03.22 um 05:03 schrieb Lang Yu:

Quoted 1 line

It should be p->job->ibs[j] instead of p->job->ibs[i] here.

Rebase fallout, thanks for fixing!

Quoted 4 lines
Fixes 1027d5d791b7 (drm/amdgpu: use job and ib structures directly in CS parsers)
Quoted 26 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 7 ++-----
  1 file changed, 2 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +2 -5
index 662cb66493a4..e8a3078a85cc 100644
@@ -783,15 +783,12 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p)
  				memcpy(ib->ptr, kptr, chunk_ib->ib_bytes);
  				amdgpu_bo_kunmap(aobj);
 
-				r = amdgpu_ring_parse_cs(ring, p, p->job,
-							 &p->job->ibs[i]);
+				r = amdgpu_ring_parse_cs(ring, p, p->job, ib);
  				if (r)
  					return r;
  			} else {
  				ib->ptr = (uint32_t *)kptr;
-				r = amdgpu_ring_patch_cs_in_place(ring, p,
-								  p->job,
-								  &p->job->ibs[i]);
+				r = amdgpu_ring_patch_cs_in_place(ring, p, p->job, ib);
  				amdgpu_bo_kunmap(aobj);
  				if (r)
  					return r;