Attachment 126692 Details for Bug 97840 – Part #1 of the fix.

[patch] Part #1 of the fix.

0001-drm-amdgpu-fix-BO-move-offsets.patch (text/plain), 1.58 KB, created by Christian König on 2016-09-21 07:41:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian König

Created: 2016-09-21 07:41:39 UTC

Size: 1.58 KB

patch

obsolete

>From 9814546bc62b2a724b9745b352431d90249b074c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
>Date: Wed, 21 Sep 2016 09:38:14 +0200
>Subject: [PATCH] drm/amdgpu: fix BO move offsets
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>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>
>---
> 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:
>-- 
>2.5.0
>

Actions: View | Splinter Review

Attachments on bug 97840: 126589 | 126590 | 126591 | 126643 | 126667 | 126668 | 126692

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.