diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4506-drm-amdgpu-cleanup-amdgpu_vm_validate_pt_bos-v2.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/4506-drm-amdgpu-cleanup-amdgpu_vm_validate_pt_bos-v2.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4506-drm-amdgpu-cleanup-amdgpu_vm_validate_pt_bos-v2.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4506-drm-amdgpu-cleanup-amdgpu_vm_validate_pt_bos-v2.patch new file mode 100644 index 00000000..c2f07200 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4506-drm-amdgpu-cleanup-amdgpu_vm_validate_pt_bos-v2.patch @@ -0,0 +1,72 @@ +From c0d03122ca4119c4c19e6753930881f41b7cbd23 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Thu, 19 Apr 2018 11:02:54 +0200 +Subject: [PATCH 4506/5725] drm/amdgpu: cleanup amdgpu_vm_validate_pt_bos v2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use list_for_each_entry_safe here. + +v2: Drop the optimization, it doesn't work as expected. + +Change-Id: I7781e41382efc2f3ec8949b1abfd384953ca26ec +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Chunming Zhou <david1.zhou@amd.com> +Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 19 +++++++------------ + 1 file changed, 7 insertions(+), 12 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +index 048e39e..47dfcdb 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -224,21 +224,16 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm, + void *param) + { + struct ttm_bo_global *glob = adev->mman.bdev.glob; +- int r; +- +- while (!list_empty(&vm->evicted)) { +- struct amdgpu_vm_bo_base *bo_base; +- struct amdgpu_bo *bo; ++ struct amdgpu_vm_bo_base *bo_base, *tmp; ++ int r = 0; + +- bo_base = list_first_entry(&vm->evicted, +- struct amdgpu_vm_bo_base, +- vm_status); ++ list_for_each_entry_safe(bo_base, tmp, &vm->evicted, vm_status) { ++ struct amdgpu_bo *bo = bo_base->bo; + +- bo = bo_base->bo; + if (bo->parent) { + r = validate(param, bo); + if (r) +- return r; ++ break; + + spin_lock(&glob->lru_lock); + ttm_bo_move_to_lru_tail(&bo->tbo); +@@ -251,7 +246,7 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm, + vm->use_cpu_for_update) { + r = amdgpu_bo_kmap(bo, NULL); + if (r) +- return r; ++ break; + } + + if (bo->tbo.type != ttm_bo_type_kernel) { +@@ -263,7 +258,7 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm, + } + } + +- return 0; ++ return r; + } + + /** +-- +2.7.4 + |