[PATCH] drm/amdgpu: Fix amdgpu_vm_alloc_pts failed

Rex Zhu Rex.Zhu at amd.com
Tue Oct 23 03:29:30 UTC 2018


when the VA address located in the last PD entries,
the alloc_pts will faile.

Use the right PD mask instand of hardcode, suggested
by jerry.zhang.

Signed-off-by: Rex Zhu <Rex.Zhu at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 054633b..3939013 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -202,8 +202,11 @@ static unsigned amdgpu_vm_num_entries(struct amdgpu_device *adev,
 static uint32_t amdgpu_vm_entries_mask(struct amdgpu_device *adev,
 				       unsigned int level)
 {
+	unsigned shift = amdgpu_vm_level_shift(adev,
+					       adev->vm_manager.root_level);
+
 	if (level <= adev->vm_manager.root_level)
-		return 0xffffffff;
+		return (round_up(adev->vm_manager.max_pfn, 1 << shift) >> shift) - 1;
 	else if (level != AMDGPU_VM_PTB)
 		return 0x1ff;
 	else
-- 
1.9.1



More information about the amd-gfx mailing list