summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuBiao Wang <YuBiao.Wang@amd.com>2023-09-15 10:47:50 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-10-06 14:57:06 +0200
commitb60028c81e463b0930191a4fa2ba770ff6d40e3a (patch)
tree5850f8a69b24d62be6a100f302e7e67faff8d3d9
parent48a22f13fb1b16dd56280f6fe8dccc8b68600af9 (diff)
downloadlinux-stable-b60028c81e463b0930191a4fa2ba770ff6d40e3a.tar.gz
linux-stable-b60028c81e463b0930191a4fa2ba770ff6d40e3a.tar.bz2
linux-stable-b60028c81e463b0930191a4fa2ba770ff6d40e3a.zip
drm/amdkfd: Use gpu_offset for user queue's wptr
commit cc39f9ccb82426e576734b493e1777ea01b144a8 upstream. Directly use tbo's start address will miss the domain start offset. Need to use gpu_offset instead. Signed-off-by: YuBiao Wang <YuBiao.Wang@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index c06ada0844ba..0b87034d9dd5 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -201,7 +201,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;