[Intel-xe] [PATCH] drm/xe: Always use xe_vm_queue_rebind_worker helper

[Rodrigo Vivi]

On Wed, Jul 26, 2023 at 09:37:21AM -0700, Matthew Brost wrote:
> Do not queue the rebind worker directly, rather use the helper
> xe_vm_queue_rebind_worker. This ensures we use the correct work queue.

Although I believe we need to reduce the usage of the XE_WARN_ON
in favor of WARN_ON, or drm_warn, or err, or dbg, this patch makes
sense to me and any warn_on stuff should be handled in separated
fronts.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

> 
> Signed-off-by: Matthew Brost <matthew.brost at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_pt.c |  3 +--
>  drivers/gpu/drm/xe/xe_vm.h | 14 +++++++-------
>  2 files changed, 8 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_pt.c b/drivers/gpu/drm/xe/xe_pt.c
> index d4660520ac2c..c4270e7747bf 100644
> --- a/drivers/gpu/drm/xe/xe_pt.c
> +++ b/drivers/gpu/drm/xe/xe_pt.c
> @@ -1472,8 +1472,7 @@ __xe_pt_bind_vma(struct xe_tile *tile, struct xe_vma *vma, struct xe_engine *e,
>  		}
>  		if (!rebind && last_munmap_rebind &&
>  		    xe_vm_in_compute_mode(vm))
> -			queue_work(vm->xe->ordered_wq,
> -				   &vm->preempt.rebind_work);
> +			xe_vm_queue_rebind_worker(vm);
>  	} else {
>  		kfree(rfence);
>  		kfree(ifence);
> diff --git a/drivers/gpu/drm/xe/xe_vm.h b/drivers/gpu/drm/xe/xe_vm.h
> index eaf11ac8ff51..4db777d7e375 100644
> --- a/drivers/gpu/drm/xe/xe_vm.h
> +++ b/drivers/gpu/drm/xe/xe_vm.h
> @@ -185,6 +185,12 @@ extern struct ttm_device_funcs xe_ttm_funcs;
>  
>  struct ttm_buffer_object *xe_vm_ttm_bo(struct xe_vm *vm);
>  
> +static inline void xe_vm_queue_rebind_worker(struct xe_vm *vm)
> +{
> +	XE_WARN_ON(!xe_vm_in_compute_mode(vm));
> +	queue_work(vm->xe->ordered_wq, &vm->preempt.rebind_work);
> +}
> +
>  /**
>   * xe_vm_reactivate_rebind() - Reactivate the rebind functionality on compute
>   * vms.
> @@ -198,7 +204,7 @@ static inline void xe_vm_reactivate_rebind(struct xe_vm *vm)
>  {
>  	if (xe_vm_in_compute_mode(vm) && vm->preempt.rebind_deactivated) {
>  		vm->preempt.rebind_deactivated = false;
> -		queue_work(system_unbound_wq, &vm->preempt.rebind_work);
> +		xe_vm_queue_rebind_worker(vm);
>  	}
>  }
>  
> @@ -206,12 +212,6 @@ int xe_vma_userptr_pin_pages(struct xe_vma *vma);
>  
>  int xe_vma_userptr_check_repin(struct xe_vma *vma);
>  
> -static inline void xe_vm_queue_rebind_worker(struct xe_vm *vm)
> -{
> -	XE_WARN_ON(!xe_vm_in_compute_mode(vm));
> -	queue_work(vm->xe->ordered_wq, &vm->preempt.rebind_work);
> -}
> -
>  /*
>   * XE_ONSTACK_TV is used to size the tv_onstack array that is input
>   * to xe_vm_lock_dma_resv() and xe_vm_unlock_dma_resv().
> -- 
> 2.34.1
>