diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4285-drm-amdgpu-call-amdgpu_vm_prt_fini-before-deleting-t.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4285-drm-amdgpu-call-amdgpu_vm_prt_fini-before-deleting-t.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4285-drm-amdgpu-call-amdgpu_vm_prt_fini-before-deleting-t.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4285-drm-amdgpu-call-amdgpu_vm_prt_fini-before-deleting-t.patch new file mode 100644 index 00000000..62b17d9b --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4285-drm-amdgpu-call-amdgpu_vm_prt_fini-before-deleting-t.patch @@ -0,0 +1,60 @@ +From 3a6825e8f5dc6c82061e2fc0a4eed682003797e6 Mon Sep 17 00:00:00 2001 +From: "Pelloux-prayer, Pierre-eric" <Pierre-eric.Pelloux-prayer@amd.com> +Date: Wed, 23 Oct 2019 12:02:45 +0000 +Subject: [PATCH 4285/4736] drm/amdgpu: call amdgpu_vm_prt_fini before deleting + the root PD +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +amdgpu_vm_prt_fini uses "vm->root.base.bo" so it must still be valid when +we call it. + +Fixes: b65709a92156 ("drm/amdgpu: reserve the root PD while freeing PASIDs") +Change-Id: Idd5fef2b9344ab6129a6dcdcce2d0a568ed4dde0 +Signed-off-by: Pelloux-prayer, Pierre-eric <Pierre-eric.Pelloux-prayer@amd.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +index c970824b041d..d0604167cd74 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -2977,6 +2977,16 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm) + vm->pasid = 0; + } + ++ list_for_each_entry_safe(mapping, tmp, &vm->freed, list) { ++ if (mapping->flags & AMDGPU_PTE_PRT && prt_fini_needed) { ++ amdgpu_vm_prt_fini(adev, vm); ++ prt_fini_needed = false; ++ } ++ ++ list_del(&mapping->list); ++ amdgpu_vm_free_mapping(adev, vm, mapping, NULL); ++ } ++ + amdgpu_vm_free_pts(adev, vm, NULL); + amdgpu_bo_unreserve(root); + amdgpu_bo_unref(&root); +@@ -2996,15 +3006,6 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm) + list_del(&mapping->list); + kfree(mapping); + } +- list_for_each_entry_safe(mapping, tmp, &vm->freed, list) { +- if (mapping->flags & AMDGPU_PTE_PRT && prt_fini_needed) { +- amdgpu_vm_prt_fini(adev, vm); +- prt_fini_needed = false; +- } +- +- list_del(&mapping->list); +- amdgpu_vm_free_mapping(adev, vm, mapping, NULL); +- } + + dma_fence_put(vm->last_update); + for (i = 0; i < AMDGPU_MAX_VMHUBS; i++) +-- +2.17.1 + |