sync with Debian
This commit is contained in:
@@ -24,9 +24,11 @@ Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
|
||||
drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 12 +++++++++++-
|
||||
1 file changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_queue.c
|
||||
index ecccd7adbab4..62c635e9d1aa 100644
|
||||
--- a/drivers/gpu/drm/amd/amdkfd/kfd_queue.c
|
||||
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_queue.c
|
||||
@@ -233,6 +233,7 @@ void kfd_queue_buffer_put(struct amdgpu_
|
||||
@@ -233,6 +233,7 @@ void kfd_queue_buffer_put(struct amdgpu_bo **bo)
|
||||
int kfd_queue_acquire_buffers(struct kfd_process_device *pdd, struct queue_properties *properties)
|
||||
{
|
||||
struct kfd_topology_device *topo_dev;
|
||||
@@ -34,7 +36,7 @@ Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
|
||||
struct amdgpu_vm *vm;
|
||||
u32 total_cwsr_size;
|
||||
int err;
|
||||
@@ -241,6 +242,15 @@ int kfd_queue_acquire_buffers(struct kfd
|
||||
@@ -241,6 +242,15 @@ int kfd_queue_acquire_buffers(struct kfd_process_device *pdd, struct queue_prope
|
||||
if (!topo_dev)
|
||||
return -EINVAL;
|
||||
|
||||
@@ -50,7 +52,7 @@ Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
|
||||
vm = drm_priv_to_vm(pdd->drm_priv);
|
||||
err = amdgpu_bo_reserve(vm->root.bo, false);
|
||||
if (err)
|
||||
@@ -255,7 +265,7 @@ int kfd_queue_acquire_buffers(struct kfd
|
||||
@@ -255,7 +265,7 @@ int kfd_queue_acquire_buffers(struct kfd_process_device *pdd, struct queue_prope
|
||||
goto out_err_unreserve;
|
||||
|
||||
err = kfd_queue_buffer_get(vm, (void *)properties->queue_address,
|
||||
@@ -59,3 +61,6 @@ Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
|
||||
if (err)
|
||||
goto out_err_unreserve;
|
||||
|
||||
--
|
||||
2.47.2
|
||||
|
||||
|
Reference in New Issue
Block a user