mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-18 11:33:36 -04:00
drm/amdgpu: fix nullptr err of vm_handle_moved
If a amdgpu_bo_va is fpriv->prt_va, the bo of this one is always NULL. So, such kind of amdgpu_bo_va should be updated separately before amdgpu_vm_handle_moved. Signed-off-by: Heng Zhou <Heng.Zhou@amd.com> Reviewed-by: Kasiviswanathan, Harish <Harish.Kasiviswanathan@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
@@ -2970,9 +2970,22 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence __rcu *
|
||||
struct amdgpu_device *adev = amdgpu_ttm_adev(
|
||||
peer_vm->root.bo->tbo.bdev);
|
||||
|
||||
struct amdgpu_fpriv *fpriv =
|
||||
container_of(peer_vm, struct amdgpu_fpriv, vm);
|
||||
|
||||
ret = amdgpu_vm_bo_update(adev, fpriv->prt_va, false);
|
||||
if (ret) {
|
||||
dev_dbg(adev->dev,
|
||||
"Memory eviction: handle PRT moved failed, pid %8d. Try again.\n",
|
||||
pid_nr(process_info->pid));
|
||||
goto validate_map_fail;
|
||||
}
|
||||
|
||||
ret = amdgpu_vm_handle_moved(adev, peer_vm, &exec.ticket);
|
||||
if (ret) {
|
||||
pr_debug("Memory eviction: handle moved failed. Try again\n");
|
||||
dev_dbg(adev->dev,
|
||||
"Memory eviction: handle moved failed, pid %8d. Try again.\n",
|
||||
pid_nr(process_info->pid));
|
||||
goto validate_map_fail;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user