Commit 731f4ab5 authored by Thomas Hellström's avatar Thomas Hellström
Browse files

drm/ttm: Don't shadow the operation context 



ttm_bo_swapout() shadows the ttm operation context which may cause
major confusion in driver callbacks when swapping out !TTM_PL_SYSTEM
memory. Fix this by reusing the operation context argument to
ttm_bo_swapout().

Cc: "Christian König" <christian.koenig@amd.com>
Cc: Roger He <Hongbo.He@amd.com>
Cc: <dri-devel@lists.freedesktop.org>
Cc: <intel-gfx@lists.freedesktop.org>
Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Acked-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarChristian König <ckoenig.leichtzumerken@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230626091450.14757-3-thomas.hellstrom@linux.intel.com
parent 701d2054

drivers/gpu/drm/ttm/ttm_bo.c

+1 −2
Original line number Diff line number Diff line
@@ -1154,7 +1154,6 @@ int ttm_bo_swapout(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx, 
	 * Move to system cached

	 */

	if (bo->resource->mem_type != TTM_PL_SYSTEM) {

		struct ttm_operation_ctx ctx = { false, false };

		struct ttm_resource *evict_mem;

		struct ttm_place hop;
@@ -1164,7 +1163,7 @@ int ttm_bo_swapout(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx, 
		if (unlikely(ret))

			goto out;



		ret = ttm_bo_handle_move_mem(bo, evict_mem, true, &ctx, &hop);

		ret = ttm_bo_handle_move_mem(bo, evict_mem, true, ctx, &hop);

		if (unlikely(ret != 0)) {

			WARN(ret == -EMULTIHOP, "Unexpected multihop in swaput - likely driver bug.\n");

			goto out;