Re: [PATCH 03/11] drm/amdgpu: fix amdgpu_userq_evict

["Khatri, Sunil" <sukhatri@amd.com>]

Reviewed-by: Sunil Khatri <sunil.khatri@amd.com>

On 11-03-2026 12:43 am, Christian König wrote:
> Canceling the resume worker synchonized can deadlock because it can in
> turn wait for the eviction worker through the userq_mutex.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 9 ++-------
>   1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> index 65783f9584c5..85adc53eb523 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> @@ -1331,13 +1331,8 @@ amdgpu_userq_evict(struct amdgpu_userq_mgr *uq_mgr,
>   	/* Signal current eviction fence */
>   	amdgpu_eviction_fence_signal(evf_mgr, ev_fence);
>   
> -	if (evf_mgr->fd_closing) {
> -		cancel_delayed_work_sync(&uq_mgr->resume_work);
> -		return;
> -	}
> -
> -	/* Schedule a resume work */
> -	schedule_delayed_work(&uq_mgr->resume_work, 0);
> +	if (!evf_mgr->fd_closing)
> +		schedule_delayed_work(&uq_mgr->resume_work, 0);
>   }
>   
>   int amdgpu_userq_mgr_init(struct amdgpu_userq_mgr *userq_mgr, struct drm_file *file_priv,