drm/amdgpu: fix size calculation in amdgpu_ttm_copy_mem_to_mem

When the node is larger than 4GB we overrun the size calculation.

Fix this by correctly limiting the size to the window as well.

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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 0d7ad6468ef5324e761f3bca3d0273786dca42e4..1296499f0f54920699152fd75122db043a45b83f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -450,9 +450,9 @@ int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_device *adev,
                /* Copy size cannot exceed GTT_MAX_BYTES. So if src or dst
                 * begins at an offset, then adjust the size accordingly
                 */
-               cur_size = min3(src_node_size, dst_node_size, size);
-               cur_size = min(GTT_MAX_BYTES - src_page_offset, cur_size);
-               cur_size = min(GTT_MAX_BYTES - dst_page_offset, cur_size);
+               cur_size = max(src_page_offset, dst_page_offset);
+               cur_size = min(min3(src_node_size, dst_node_size, size),
+                              (uint64_t)(GTT_MAX_BYTES - cur_size));
 
                /* Map src to window 0 and dst to window 1. */
                r = amdgpu_ttm_map_buffer(src->bo, src->mem, src_mm,