diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/1545-drm-amdgpu-Use-validate_pt_bos-instead-of-get_pt_bos.patch')
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/1545-drm-amdgpu-Use-validate_pt_bos-instead-of-get_pt_bos.patch | 85 |
1 files changed, 85 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/1545-drm-amdgpu-Use-validate_pt_bos-instead-of-get_pt_bos.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/1545-drm-amdgpu-Use-validate_pt_bos-instead-of-get_pt_bos.patch new file mode 100644 index 00000000..d2149403 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/1545-drm-amdgpu-Use-validate_pt_bos-instead-of-get_pt_bos.patch @@ -0,0 +1,85 @@ +From b13e68591c067a08387e0172c2a2ed32343145bb Mon Sep 17 00:00:00 2001 +From: Kent Russell <kent.russell@amd.com> +Date: Mon, 24 Oct 2016 13:11:17 -0400 +Subject: [PATCH 1545/4131] drm/amdgpu - Use validate_pt_bos instead of + get_pt_bos + +Change-Id: I50f4b1a0e60ccc4b5bf056f35c9c0c6f7f6d346f +Signed-off-by: Kent Russell <kent.russell@amd.com> + + Conflicts: + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +index 8a1becf..91eb8d7 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +@@ -580,6 +580,7 @@ static int reserve_bo_and_vm(struct kgd_mem *mem, + struct bo_vm_reservation_context *ctx) + { + struct amdgpu_bo *bo = mem->bo; ++ struct amdgpu_vm_parser param; + int ret; + + WARN_ON(!vm); +@@ -604,7 +605,10 @@ static int reserve_bo_and_vm(struct kgd_mem *mem, + list_add(&ctx->kfd_bo.tv.head, &ctx->list); + + amdgpu_vm_get_pd_bo(vm, &ctx->list, &ctx->vm_pd[0]); +- amdgpu_vm_get_pt_bos(bo->adev, vm, &ctx->duplicates); ++ param.domain = bo->prefered_domains; ++ param.wait = false; ++ amdgpu_vm_validate_pt_bos(amdgpu_ttm_adev(bo->tbo.bdev), vm, ++ amdgpu_amdkfd_validate, ¶m); + + ret = ttm_eu_reserve_buffers(&ctx->ticket, &ctx->list, + false, &ctx->duplicates); +@@ -642,6 +646,7 @@ static int reserve_bo_and_cond_vms(struct kgd_mem *mem, + { + struct amdgpu_bo *bo = mem->bo; + struct kfd_bo_va_list *entry; ++ struct amdgpu_vm_parser param; + unsigned i; + int ret; + +@@ -685,11 +690,16 @@ static int reserve_bo_and_cond_vms(struct kgd_mem *mem, + + amdgpu_vm_get_pd_bo(entry->bo_va->vm, &ctx->list, + &ctx->vm_pd[i]); +- amdgpu_vm_get_pt_bos(bo->adev, entry->bo_va->vm, +- &ctx->duplicates); + i++; + } + ++ if (vm) { ++ param.domain = bo->prefered_domains; ++ param.wait = false; ++ amdgpu_vm_validate_pt_bos(amdgpu_ttm_adev(bo->tbo.bdev), vm, ++ amdgpu_amdkfd_validate, ¶m); ++ } ++ + ret = ttm_eu_reserve_buffers(&ctx->ticket, &ctx->list, + false, &ctx->duplicates); + if (!ret) +@@ -1917,15 +1927,11 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *m_vm) + /* Get PD BO list and PT BO list from all the VMs */ + amdgpu_vm_get_pd_bo(&master_vm->base, &ctx.list, + &pd_bo_list[0]); +- amdgpu_vm_get_pt_bos(master_vm->adev, &master_vm->base, +- &ctx.duplicates); + + i = 1; + list_for_each_entry(peer_vm, &master_vm->kfd_vm_list, kfd_vm_list) { + amdgpu_vm_get_pd_bo(&peer_vm->base, &ctx.list, + &pd_bo_list[i]); +- amdgpu_vm_get_pt_bos(peer_vm->adev, &peer_vm->base, +- &ctx.duplicates); + i++; + } + +-- +2.7.4 + |