[PATCH 1/2] drm/xe/vm: move rebind_work init earlier

[Matthew Brost]

On Wed, May 14, 2025 at 04:24:25PM +0100, Matthew Auld wrote:
> In xe_vm_close_and_put() we need to be able to call
> flush_work(rebind_work), however during vm creation we can call this on
> the error path, before having actually set up the worker, leading to a
> splat from flush_work().
> 
> It looks like we can simply move the worker init step earlier to fix
> this.
> 
> Fixes: dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
> Signed-off-by: Matthew Auld <matthew.auld at intel.com>
> Cc: Matthew Brost <matthew.brost at intel.com>

Reviewed-by: Matthew Brost <matthew.brost at intel.com>

> Cc: <stable at vger.kernel.org> # v6.8+
> ---
>  drivers/gpu/drm/xe/xe_vm.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
> index 5a978da411b0..168756fb140b 100644
> --- a/drivers/gpu/drm/xe/xe_vm.c
> +++ b/drivers/gpu/drm/xe/xe_vm.c
> @@ -1704,8 +1704,10 @@ struct xe_vm *xe_vm_create(struct xe_device *xe, u32 flags)
>  	 * scheduler drops all the references of it, hence protecting the VM
>  	 * for this case is necessary.
>  	 */
> -	if (flags & XE_VM_FLAG_LR_MODE)
> +	if (flags & XE_VM_FLAG_LR_MODE) {
> +		INIT_WORK(&vm->preempt.rebind_work, preempt_rebind_work_func);
>  		xe_pm_runtime_get_noresume(xe);
> +	}
>  
>  	vm_resv_obj = drm_gpuvm_resv_object_alloc(&xe->drm);
>  	if (!vm_resv_obj) {
> @@ -1750,10 +1752,8 @@ struct xe_vm *xe_vm_create(struct xe_device *xe, u32 flags)
>  		vm->batch_invalidate_tlb = true;
>  	}
>  
> -	if (vm->flags & XE_VM_FLAG_LR_MODE) {
> -		INIT_WORK(&vm->preempt.rebind_work, preempt_rebind_work_func);
> +	if (vm->flags & XE_VM_FLAG_LR_MODE)
>  		vm->batch_invalidate_tlb = false;
> -	}
>  
>  	/* Fill pt_root after allocating scratch tables */
>  	for_each_tile(tile, xe, id) {
> -- 
> 2.49.0
>