diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3734-drm-ttm-use-an-operation-ctx-for-ttm_tt_bind.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3734-drm-ttm-use-an-operation-ctx-for-ttm_tt_bind.patch | 123 |
1 files changed, 123 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3734-drm-ttm-use-an-operation-ctx-for-ttm_tt_bind.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3734-drm-ttm-use-an-operation-ctx-for-ttm_tt_bind.patch new file mode 100644 index 00000000..82a45894 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3734-drm-ttm-use-an-operation-ctx-for-ttm_tt_bind.patch @@ -0,0 +1,123 @@ +From bc043ec71c5c6e2e23c414c23af08eefdb036238 Mon Sep 17 00:00:00 2001 +From: Roger He <Hongbo.He@amd.com> +Date: Thu, 21 Dec 2017 17:42:51 +0800 +Subject: [PATCH 3734/4131] drm/ttm: use an operation ctx for ttm_tt_bind +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +forward the operation context to ttm_tt_bind as well, +and the ultimate goal is swapout enablement for reserved BOs. + +v2: use common term rather than amd specific + +Reviewed-by: Thomas Hellström <thellstrom@vmware.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Chuming Zhou <david1.zhou@amd.com> +Signed-off-by: Roger He <Hongbo.He@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +- + drivers/gpu/drm/ttm/ttm_tt.c | 9 +++------ + 6 files changed, 8 insertions(+), 11 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +index 0e96eff..548239c 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +@@ -529,7 +529,7 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, bool evict, + goto out_cleanup; + } + +- r = ttm_tt_bind(bo->ttm, &tmp_mem); ++ r = ttm_tt_bind(bo->ttm, &tmp_mem, ctx); + if (unlikely(r)) { + goto out_cleanup; + } +diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c +index 8ac03fc..05f1218 100644 +--- a/drivers/gpu/drm/nouveau/nouveau_bo.c ++++ b/drivers/gpu/drm/nouveau/nouveau_bo.c +@@ -1146,7 +1146,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr, + if (ret) + return ret; + +- ret = ttm_tt_bind(bo->ttm, &tmp_reg); ++ ret = ttm_tt_bind(bo->ttm, &tmp_reg, &ctx); + if (ret) + goto out; + +diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c +index d00a1ff..e651589 100644 +--- a/drivers/gpu/drm/radeon/radeon_ttm.c ++++ b/drivers/gpu/drm/radeon/radeon_ttm.c +@@ -339,7 +339,7 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo, + goto out_cleanup; + } + +- r = ttm_tt_bind(bo->ttm, &tmp_mem); ++ r = ttm_tt_bind(bo->ttm, &tmp_mem, &ctx); + if (unlikely(r)) { + goto out_cleanup; + } +diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c +index fa0268f..9c1930d 100644 +--- a/drivers/gpu/drm/ttm/ttm_bo.c ++++ b/drivers/gpu/drm/ttm/ttm_bo.c +@@ -303,7 +303,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, + goto out_err; + + if (mem->mem_type != TTM_PL_SYSTEM) { +- ret = ttm_tt_bind(bo->ttm, mem); ++ ret = ttm_tt_bind(bo->ttm, mem, ctx); + if (ret) + goto out_err; + } +diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c +index 174ef9a..4ef7a59 100644 +--- a/drivers/gpu/drm/ttm/ttm_bo_util.c ++++ b/drivers/gpu/drm/ttm/ttm_bo_util.c +@@ -73,7 +73,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, + return ret; + + if (new_mem->mem_type != TTM_PL_SYSTEM) { +- ret = ttm_tt_bind(ttm, new_mem); ++ ret = ttm_tt_bind(ttm, new_mem, ctx); + if (unlikely(ret != 0)) + return ret; + } +diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c +index 0ce3e54..522a80d 100644 +--- a/drivers/gpu/drm/ttm/ttm_tt.c ++++ b/drivers/gpu/drm/ttm/ttm_tt.c +@@ -331,12 +331,9 @@ void ttm_tt_unbind(struct ttm_tt *ttm) + } + } + +-int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem) ++int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem, ++ struct ttm_operation_ctx *ctx) + { +- struct ttm_operation_ctx ctx = { +- .interruptible = false, +- .no_wait_gpu = false +- }; + int ret = 0; + + if (!ttm) +@@ -345,7 +342,7 @@ int ttm_tt_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem) + if (ttm->state == tt_bound) + return 0; + +- ret = ttm->bdev->driver->ttm_tt_populate(ttm, &ctx); ++ ret = ttm->bdev->driver->ttm_tt_populate(ttm, ctx); + if (ret) + return ret; + +-- +2.7.4 + |