drm/amdgpu: fix BO move offsets

It's pretty pointless to get the offset first and then initialize it.

Should fix issues with the new GTT manager.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@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 9660026c99d665789a4b52b499bd154a721c2fb4..61a885b5a6a12f46011e53d3a501dd511755861d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -272,8 +272,6 @@ static int amdgpu_move_blit(struct ttm_buffer_object *bo,
 
        adev = amdgpu_get_adev(bo->bdev);
        ring = adev->mman.buffer_funcs_ring;
-       old_start = (u64)old_mem->start << PAGE_SHIFT;
-       new_start = (u64)new_mem->start << PAGE_SHIFT;
 
        switch (old_mem->mem_type) {
        case TTM_PL_TT:
@@ -282,6 +280,7 @@ static int amdgpu_move_blit(struct ttm_buffer_object *bo,
                        return r;
 
        case TTM_PL_VRAM:
+               old_start = (u64)old_mem->start << PAGE_SHIFT;
                old_start += bo->bdev->man[old_mem->mem_type].gpu_offset;
                break;
        default:
@@ -295,6 +294,7 @@ static int amdgpu_move_blit(struct ttm_buffer_object *bo,
                        return r;
 
        case TTM_PL_VRAM:
+               new_start = (u64)new_mem->start << PAGE_SHIFT;
                new_start += bo->bdev->man[new_mem->mem_type].gpu_offset;
                break;
        default: