diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/1158-drm-amdgpu-csa_vaddr-should-not-larger-than-AMDGPU_G.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/1158-drm-amdgpu-csa_vaddr-should-not-larger-than-AMDGPU_G.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/1158-drm-amdgpu-csa_vaddr-should-not-larger-than-AMDGPU_G.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/1158-drm-amdgpu-csa_vaddr-should-not-larger-than-AMDGPU_G.patch new file mode 100644 index 00000000..d885d742 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/1158-drm-amdgpu-csa_vaddr-should-not-larger-than-AMDGPU_G.patch @@ -0,0 +1,35 @@ +From 2b85e70c79b4ea22b49140e9c1a7c9fb2101bbbf Mon Sep 17 00:00:00 2001 +From: wentalou <Wentao.Lou@amd.com> +Date: Mon, 14 Jan 2019 16:26:13 +0800 +Subject: [PATCH 1158/2940] drm/amdgpu: csa_vaddr should not larger than + AMDGPU_GMC_HOLE_START + +After removing unnecessary VM size calculations, +vm_manager.max_pfn would reach 0x10,0000,0000 +max_pfn << AMDGPU_GPU_PAGE_SHIFT exceeding AMDGPU_GMC_HOLE_START +would cause GPU reset. + +Signed-off-by: wentalou <Wentao.Lou@amd.com> +Reviewed-by: Monk Liu <monk.liu@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c +index 7e22be7ca68a..dd3bd01e3070 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c +@@ -26,7 +26,8 @@ + + uint64_t amdgpu_csa_vaddr(struct amdgpu_device *adev) + { +- uint64_t addr = adev->vm_manager.max_pfn << AMDGPU_GPU_PAGE_SHIFT; ++ uint64_t addr = min(adev->vm_manager.max_pfn << AMDGPU_GPU_PAGE_SHIFT, ++ AMDGPU_GMC_HOLE_START); + + addr -= AMDGPU_VA_RESERVED_SIZE; + addr = amdgpu_gmc_sign_extend(addr); +-- +2.17.1 + |