[PATCH] drm/amdgpu: make sure to only process the remaining VM range

Christian König ckoenig.leichtzumerken at gmail.com
Mon Mar 15 12:58:21 UTC 2021


We should only map the remaining size here and not the whole segment.

Signed-off-by: Christian König <christian.koenig at amd.com>
Fixes: 3af0a018a728 ("drm/amdgpu: new resource cursor")
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 318eeea577b5..ad1698bd6b24 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -1646,7 +1646,8 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
 	while (cursor.remaining) {
 		uint64_t tmp, num_entries, addr;
 
-		num_entries = cursor.size >> AMDGPU_GPU_PAGE_SHIFT;
+		num_entries = min(cursor.size, cursor.remaining)
+			>> AMDGPU_GPU_PAGE_SHIFT;
 		if (pages_addr) {
 			bool contiguous = true;
 
-- 
2.25.1



More information about the amd-gfx mailing list