diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3154-drm-amdgpu-fix-CPU-based-VM-updates.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3154-drm-amdgpu-fix-CPU-based-VM-updates.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3154-drm-amdgpu-fix-CPU-based-VM-updates.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3154-drm-amdgpu-fix-CPU-based-VM-updates.patch new file mode 100644 index 00000000..d6c3b537 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3154-drm-amdgpu-fix-CPU-based-VM-updates.patch @@ -0,0 +1,45 @@ +From e001bbd25044f92c024c85ebfbb4e3d74bbeece7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Tue, 16 Jan 2018 15:35:10 +0100 +Subject: [PATCH 3154/4131] drm/amdgpu: fix CPU based VM updates +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +That got accidentially removed. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +index 8a20e53..eb0a055 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -974,12 +974,16 @@ static void amdgpu_vm_handle_huge_pages(struct amdgpu_pte_update_params *p, + entry->huge = true; + amdgpu_gmc_get_vm_pde(p->adev, AMDGPU_VM_PDB0, &dst, &flags); + +- if (parent->base.bo->shadow) { +- pd_addr = amdgpu_bo_gpu_offset(parent->base.bo->shadow); +- pde = pd_addr + (entry - parent->entries) * 8; +- p->func(p, pde, dst, 1, 0, flags); ++ if (p->func == amdgpu_vm_cpu_set_ptes) { ++ pd_addr = (unsigned long)amdgpu_bo_kptr(parent->base.bo); ++ } else { ++ if (parent->base.bo->shadow) { ++ pd_addr = amdgpu_bo_gpu_offset(parent->base.bo->shadow); ++ pde = pd_addr + (entry - parent->entries) * 8; ++ p->func(p, pde, dst, 1, 0, flags); ++ } ++ pd_addr = amdgpu_bo_gpu_offset(parent->base.bo); + } +- pd_addr = amdgpu_bo_gpu_offset(parent->base.bo); + pde = pd_addr + (entry - parent->entries) * 8; + p->func(p, pde, dst, 1, 0, flags); + } +-- +2.7.4 + |