diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2143-drm-amdgpu-don-t-use-ttm_bo_move_ttm-in-amdgpu_ttm_b.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2143-drm-amdgpu-don-t-use-ttm_bo_move_ttm-in-amdgpu_ttm_b.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2143-drm-amdgpu-don-t-use-ttm_bo_move_ttm-in-amdgpu_ttm_b.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2143-drm-amdgpu-don-t-use-ttm_bo_move_ttm-in-amdgpu_ttm_b.patch new file mode 100644 index 00000000..c975c6e0 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2143-drm-amdgpu-don-t-use-ttm_bo_move_ttm-in-amdgpu_ttm_b.patch @@ -0,0 +1,70 @@ +From ed24ac418fec4fb9f7000d660fd0e2543d8041fe Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Thu, 26 Oct 2017 17:54:12 +0200 +Subject: [PATCH 2143/4131] drm/amdgpu: don't use ttm_bo_move_ttm in + amdgpu_ttm_bind v2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Just allocate the GART space and fill it. + +This prevents forcing the BO to be idle. + +v2: don't unbind/bind at all, just fill the allocated GART space + +Signed-off-by: Christian König <christian.koenig@amd.com> +Acked-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +index b266b69..a07b6ad 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +@@ -944,10 +944,12 @@ static int amdgpu_ttm_backend_bind(struct ttm_tt *ttm, + int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo) + { + struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev); ++ struct amdgpu_ttm_tt *gtt = (void*)bo->ttm; + struct ttm_mem_reg tmp; + + struct ttm_placement placement; + struct ttm_place placements; ++ uint64_t flags; + int r; + + if (bo->mem.mem_type != TTM_PL_TT || +@@ -969,14 +971,21 @@ int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo) + if (unlikely(r)) + return r; + +- r = ttm_bo_move_ttm(bo, true, false, &tmp); +- if (unlikely(r)) ++ flags = amdgpu_ttm_tt_pte_flags(adev, bo->ttm, &tmp); ++ gtt->offset = (u64)tmp.start << PAGE_SHIFT; ++ r = amdgpu_gart_bind(adev, gtt->offset, bo->ttm->num_pages, ++ bo->ttm->pages, gtt->ttm.dma_address, flags); ++ if (unlikely(r)) { + ttm_bo_mem_put(bo, &tmp); +- else +- bo->offset = (bo->mem.start << PAGE_SHIFT) + +- bo->bdev->man[bo->mem.mem_type].gpu_offset; ++ return r; ++ } + +- return r; ++ ttm_bo_mem_put(bo, &bo->mem); ++ bo->mem = tmp; ++ bo->offset = (bo->mem.start << PAGE_SHIFT) + ++ bo->bdev->man[bo->mem.mem_type].gpu_offset; ++ ++ return 0; + } + + int amdgpu_ttm_recover_gart(struct ttm_buffer_object *tbo) +-- +2.7.4 + |