diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3959-drm-ttm-Refactor-ttm_bo_pipeline_move.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3959-drm-ttm-Refactor-ttm_bo_pipeline_move.patch | 107 |
1 files changed, 107 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3959-drm-ttm-Refactor-ttm_bo_pipeline_move.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3959-drm-ttm-Refactor-ttm_bo_pipeline_move.patch new file mode 100644 index 00000000..2d2a1ad3 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3959-drm-ttm-Refactor-ttm_bo_pipeline_move.patch @@ -0,0 +1,107 @@ +From eb9b5b91a85f2aa32a5315a86933e9647cf25f78 Mon Sep 17 00:00:00 2001 +From: Brian Welty <brian.welty@intel.com> +Date: Fri, 16 Aug 2019 14:59:16 -0400 +Subject: [PATCH 3959/4256] drm/ttm: Refactor ttm_bo_pipeline_move +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +ttm_bo_pipeline_move needlessly duplicates code. Refactor this to +instead call ttm_bo_move_accel_cleanup. + +Signed-off-by: Brian Welty <brian.welty@intel.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +--- + drivers/gpu/drm/ttm/ttm_bo_util.c | 64 +++---------------------------- + 1 file changed, 5 insertions(+), 59 deletions(-) + +diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c +index 046a6dda690a..23fa015be34e 100644 +--- a/drivers/gpu/drm/ttm/ttm_bo_util.c ++++ b/drivers/gpu/drm/ttm/ttm_bo_util.c +@@ -747,49 +747,10 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo, + { + struct ttm_bo_device *bdev = bo->bdev; + struct ttm_mem_reg *old_mem = &bo->mem; +- + struct ttm_mem_type_manager *from = &bdev->man[old_mem->mem_type]; +- struct ttm_mem_type_manager *to = &bdev->man[new_mem->mem_type]; +- +- int ret; +- +- reservation_object_add_excl_fence(bo->resv, fence); +- +- if (!evict) { +- struct ttm_buffer_object *ghost_obj; +- +- /** +- * This should help pipeline ordinary buffer moves. +- * +- * Hang old buffer memory on a new buffer object, +- * and leave it to be released when the GPU +- * operation has completed. +- */ +- +- dma_fence_put(bo->moving); +- bo->moving = dma_fence_get(fence); + +- ret = ttm_buffer_object_transfer(bo, &ghost_obj); +- if (ret) +- return ret; +- +- reservation_object_add_excl_fence(ghost_obj->resv, fence); +- +- /** +- * If we're not moving to fixed memory, the TTM object +- * needs to stay alive. Otherwhise hang it on the ghost +- * bo to be unbound and destroyed. +- */ +- +- if (!(to->flags & TTM_MEMTYPE_FLAG_FIXED)) +- ghost_obj->ttm = NULL; +- else +- bo->ttm = NULL; +- +- ttm_bo_unreserve(ghost_obj); +- ttm_bo_put(ghost_obj); +- +- } else if (from->flags & TTM_MEMTYPE_FLAG_FIXED) { ++ if (evict && from->flags & TTM_MEMTYPE_FLAG_FIXED) { ++ reservation_object_add_excl_fence(bo->resv, fence); + + /** + * BO doesn't have a TTM we need to bind/unbind. Just remember +@@ -808,27 +769,12 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo, + dma_fence_put(bo->moving); + bo->moving = dma_fence_get(fence); + ++ *old_mem = *new_mem; ++ new_mem->mm_node = NULL; + } else { +- /** +- * Last resort, wait for the move to be completed. +- * +- * Should never happen in pratice. +- */ +- +- ret = ttm_bo_wait(bo, false, false); +- if (ret) +- return ret; +- +- if (to->flags & TTM_MEMTYPE_FLAG_FIXED) { +- ttm_tt_destroy(bo->ttm); +- bo->ttm = NULL; +- } +- ttm_bo_free_old_node(bo); ++ return ttm_bo_move_accel_cleanup(bo, fence, evict, new_mem); + } + +- *old_mem = *new_mem; +- new_mem->mm_node = NULL; +- + return 0; + } + EXPORT_SYMBOL(ttm_bo_pipeline_move); +-- +2.17.1 + |