Commit b717fa5c authored by Christian König's avatar Christian König Committed by Alex Deucher

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: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 95045783
...@@ -450,9 +450,9 @@ int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_device *adev, ...@@ -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 /* Copy size cannot exceed GTT_MAX_BYTES. So if src or dst
* begins at an offset, then adjust the size accordingly * begins at an offset, then adjust the size accordingly
*/ */
cur_size = min3(src_node_size, dst_node_size, size); cur_size = max(src_page_offset, dst_page_offset);
cur_size = min(GTT_MAX_BYTES - src_page_offset, cur_size); cur_size = min(min3(src_node_size, dst_node_size, size),
cur_size = min(GTT_MAX_BYTES - dst_page_offset, cur_size); (uint64_t)(GTT_MAX_BYTES - cur_size));
/* Map src to window 0 and dst to window 1. */ /* Map src to window 0 and dst to window 1. */
r = amdgpu_ttm_map_buffer(src->bo, src->mem, src_mm, r = amdgpu_ttm_map_buffer(src->bo, src->mem, src_mm,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment