From f1c68b6a3283032d67546a983d9b4cfae8b179bc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20K=C3=B6nig?= Date: Thu, 11 Feb 2021 11:08:54 +0100 Subject: [PATCH] drm/qxl: clean up qxl_bo_move_notify MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Remove the unused evict parameter and drop swapping bo->mem. Signed-off-by: Christian König Reviewed-by: Matthew Auld Link: https://patchwork.freedesktop.org/patch/msgid/20210315191432.153826-1-christian.koenig@amd.com --- drivers/gpu/drm/qxl/qxl_ttm.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c index b7f77eb685cb0..47afe95d04a1a 100644 --- a/drivers/gpu/drm/qxl/qxl_ttm.c +++ b/drivers/gpu/drm/qxl/qxl_ttm.c @@ -121,7 +121,6 @@ static struct ttm_tt *qxl_ttm_tt_create(struct ttm_buffer_object *bo, } static void qxl_bo_move_notify(struct ttm_buffer_object *bo, - bool evict, struct ttm_resource *new_mem) { struct qxl_bo *qbo; @@ -144,29 +143,22 @@ static int qxl_bo_move(struct ttm_buffer_object *bo, bool evict, struct ttm_resource *old_mem = &bo->mem; int ret; - qxl_bo_move_notify(bo, evict, new_mem); + qxl_bo_move_notify(bo, new_mem); ret = ttm_bo_wait_ctx(bo, ctx); if (ret) - goto out; + return ret; if (old_mem->mem_type == TTM_PL_SYSTEM && bo->ttm == NULL) { ttm_bo_move_null(bo, new_mem); return 0; } - ret = ttm_bo_move_memcpy(bo, ctx, new_mem); -out: - if (ret) { - swap(*new_mem, bo->mem); - qxl_bo_move_notify(bo, false, new_mem); - swap(*new_mem, bo->mem); - } - return ret; + return ttm_bo_move_memcpy(bo, ctx, new_mem); } static void qxl_bo_delete_mem_notify(struct ttm_buffer_object *bo) { - qxl_bo_move_notify(bo, false, NULL); + qxl_bo_move_notify(bo, NULL); } static struct ttm_device_funcs qxl_bo_driver = { -- 2.30.2