On 21/09/16 04:39 PM, Christian König wrote:
> From: Christian König
>
> 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
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index db89a28..219f056 100644
> --- 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:
>
Reviewed-by: Michel Dänzer
P.S. This code could use /* fall through */ comments at the end of
switch cases without break.
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Mesa and X developer
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
