drm/amdkfd: Use gpu_offset for user queue's wptr

YuBiao Wang · alexdeucher · commit cc39f9ccb824 · 2023-09-20T17:30:42.000-04:00
Directly use tbo's start address will miss the domain start offset. Need
to use gpu_offset instead.

Signed-off-by: YuBiao Wang &lt;YuBiao.Wang@amd.com&gt;
Reviewed-by: Christian König &lt;christian.koenig@amd.com&gt;
Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
Cc: stable@vger.kernel.org
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -216,7 +216,7 @@ static int add_queue_mes(struct device_queue_manager *dqm, struct queue *q,
 
 	if (q->wptr_bo) {
 		wptr_addr_off = (uint64_t)q->properties.write_ptr & (PAGE_SIZE - 1);
-		queue_input.wptr_mc_addr = ((uint64_t)q->wptr_bo->tbo.resource->start << PAGE_SHIFT) + wptr_addr_off;
+		queue_input.wptr_mc_addr = amdgpu_bo_gpu_offset(q->wptr_bo) + wptr_addr_off;
 	}
 
 	queue_input.is_kfd_process = 1;

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ static int add_queue_mes(struct device_queue_manager dqm, struct queue q,`
`216`	`216`
`217`	`217`	`if (q->wptr_bo) {`
`218`	`218`	`wptr_addr_off = (uint64_t)q->properties.write_ptr & (PAGE_SIZE - 1);`
`219`		`- queue_input.wptr_mc_addr = ((uint64_t)q->wptr_bo->tbo.resource->start << PAGE_SHIFT) + wptr_addr_off;`
	`219`	`+ queue_input.wptr_mc_addr = amdgpu_bo_gpu_offset(q->wptr_bo) + wptr_addr_off;`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`queue_input.is_kfd_process = 1;`