[PATCH] drm/ttm: Dead code elimination & comment addition

From: Jerome Glisse
Date: Thu Nov 05 2009 - 09:43:45 EST


Remove dead code in ttm_bo_handle_mem_move and add comment on
what we are doing their and why.

Signed-off-by: Jerome Glisse <jglisse@xxxxxxxxxx>
---
drivers/gpu/drm/ttm/ttm_bo.c | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 87c0625..aea4699 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -309,9 +309,8 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
ttm_bo_unmap_virtual(bo);

/*
- * Create and bind a ttm if required.
+ * Create and bind a ttm if new placement is not on card memory.
*/
-
if (!(new_man->flags & TTM_MEMTYPE_FLAG_FIXED) && (bo->ttm == NULL)) {
ret = ttm_bo_add_ttm(bo, false);
if (ret)
@@ -327,15 +326,12 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
goto out_err;
}

+ /* New placement is not on card and old placement is system
+ * memory we can thus simply copy new placement informations
+ */
if (bo->mem.mem_type == TTM_PL_SYSTEM) {
-
- struct ttm_mem_reg *old_mem = &bo->mem;
- uint32_t save_flags = old_mem->placement;
-
- *old_mem = *mem;
+ bo->mem = *mem;
mem->mm_node = NULL;
- ttm_flag_masked(&save_flags, mem->placement,
- TTM_PL_MASK_MEMTYPE);
goto moved;
}

--
1.6.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/