diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2793-drm-amdgpu-fix-amdgpu_vm_num_entries.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2793-drm-amdgpu-fix-amdgpu_vm_num_entries.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2793-drm-amdgpu-fix-amdgpu_vm_num_entries.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2793-drm-amdgpu-fix-amdgpu_vm_num_entries.patch new file mode 100644 index 00000000..89d04861 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2793-drm-amdgpu-fix-amdgpu_vm_num_entries.patch @@ -0,0 +1,49 @@ +From a9f56d7e6106ef1536d662a26c4277760ce13363 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Mon, 20 Nov 2017 14:29:01 +0100 +Subject: [PATCH 2793/4131] drm/amdgpu: fix amdgpu_vm_num_entries +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The block size only affects the leave nodes, everything else is fixed. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +index 6d56baf..1386998 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -170,17 +170,17 @@ static unsigned amdgpu_vm_level_shift(struct amdgpu_device *adev, + static unsigned amdgpu_vm_num_entries(struct amdgpu_device *adev, + unsigned level) + { ++ unsigned shift = amdgpu_vm_level_shift(adev, 0); ++ + if (level == 0) + /* For the root directory */ +- return adev->vm_manager.max_pfn >> +- (adev->vm_manager.block_size * +- adev->vm_manager.num_level); +- else if (level == adev->vm_manager.num_level) ++ return round_up(adev->vm_manager.max_pfn, 1 << shift) >> shift; ++ else if (level != adev->vm_manager.num_level) ++ /* Everything in between */ ++ return 512; ++ else + /* For the page tables on the leaves */ + return AMDGPU_VM_PTE_COUNT(adev); +- else +- /* Everything in between */ +- return 1 << adev->vm_manager.block_size; + } + + /** +-- +2.7.4 + |