leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdgpu: fix waiting for BO moves with CPU based PD/PT updates

Browse Source 
Otherwise we open up the possibility to use uninitialized memory.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König
2019-01-30 14:12:51 +01:00
committed by Alex Deucher
parent 12a8bd8862
commit 90d647222a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
View File

@@ -1781,13 +1781,18 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
if (pages_addr) if (pages_addr)
params.src = ~0; params.src = ~0;
/* Wait for PT BOs to be free. PTs share the same resv. object /* Wait for PT BOs to be idle. PTs share the same resv. object
* as the root PD BO * as the root PD BO
*/ */
r = amdgpu_vm_wait_pd(adev, vm, owner); r = amdgpu_vm_wait_pd(adev, vm, owner);
if (unlikely(r)) if (unlikely(r))
return r; return r;
/* Wait for any BO move to be completed */
r = dma_fence_wait(exclusive, true);
if (unlikely(r))
return r;
params.func = amdgpu_vm_cpu_set_ptes; params.func = amdgpu_vm_cpu_set_ptes;
params.pages_addr = pages_addr; params.pages_addr = pages_addr;
return amdgpu_vm_update_ptes(&params, start, last + 1, return amdgpu_vm_update_ptes(&params, start, last + 1,