[Intel-xe] [PATCH 6/6] drm/ttm: Don't shadow the operation context

[Matthew Brost]

On Fri, Jun 16, 2023 at 11:55:04AM +0200, Thomas Hellström wrote:
> 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().
> 
> Signed-off-by: Thomas Hellström <thomas.hellstrom at linux.intel.com>

Makes sense to me, good with this is our tree but probably should send
this one upstream on dri-devel and make sure the TTM maintainers agree.

With that:
Acked-by: Matthew Brost <matthew.brost at intel.com>

> ---
>  drivers/gpu/drm/ttm/ttm_bo.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index bd5dae4d1624..615d30c4262d 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -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;
> -- 
> 2.40.1
>