Re: [PATCH 05/11] drm/amdgpu: rework userq fence signal processing

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

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

On 21-04-2026 06:25 pm, Christian König wrote:
> Move more code into a common userq function.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 13 +++++++++++++
>   drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h |  1 +
>   drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c    | 10 +---------
>   drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c    | 10 +---------
>   drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c    | 11 +----------
>   drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c    | 11 +----------
>   drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c    | 11 +----------
>   7 files changed, 19 insertions(+), 48 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> index 174190a77005..8ce001481d42 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> @@ -205,6 +205,19 @@ void amdgpu_userq_start_hang_detect_work(struct amdgpu_usermode_queue *queue)
>   		     msecs_to_jiffies(timeout_ms));
>   }
>   
> +void amdgpu_userq_process_fence_irq(struct amdgpu_device *adev, u32 doorbell)
> +{
> +	struct xarray *xa = &adev->userq_doorbell_xa;
> +	struct amdgpu_usermode_queue *queue;
> +	unsigned long flags;
> +
> +	xa_lock_irqsave(xa, flags);
> +	queue = xa_load(xa, doorbell);
> +	if (queue)
> +		amdgpu_userq_fence_driver_process(queue->fence_drv);
> +	xa_unlock_irqrestore(xa, flags);
> +}
> +
>   static void amdgpu_userq_init_hang_detect_work(struct amdgpu_usermode_queue *queue)
>   {
>   	INIT_DELAYED_WORK(&queue->hang_detect_work, amdgpu_userq_hang_detect_work);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h
> index cb92789c1ed1..843ea8ecc5d7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h
> @@ -168,6 +168,7 @@ void amdgpu_userq_reset_work(struct work_struct *work);
>   void amdgpu_userq_pre_reset(struct amdgpu_device *adev);
>   int amdgpu_userq_post_reset(struct amdgpu_device *adev, bool vram_lost);
>   void amdgpu_userq_start_hang_detect_work(struct amdgpu_usermode_queue *queue);
> +void amdgpu_userq_process_fence_irq(struct amdgpu_device *adev, u32 doorbell);
>   
>   int amdgpu_userq_input_va_validate(struct amdgpu_device *adev,
>   				   struct amdgpu_usermode_queue *queue,
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> index 837d98947958..1ffbb5450f3a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> @@ -6528,15 +6528,7 @@ static int gfx_v11_0_eop_irq(struct amdgpu_device *adev,
>   	DRM_DEBUG("IH: CP EOP\n");
>   
>   	if (adev->enable_mes && doorbell_offset) {
> -		struct amdgpu_usermode_queue *queue;
> -		struct xarray *xa = &adev->userq_doorbell_xa;
> -		unsigned long flags;
> -
> -		xa_lock_irqsave(xa, flags);
> -		queue = xa_load(xa, doorbell_offset);
> -		if (queue)
> -			amdgpu_userq_fence_driver_process(queue->fence_drv);
> -		xa_unlock_irqrestore(xa, flags);
> +		amdgpu_userq_process_fence_irq(adev, doorbell_offset);
>   	} else {
>   		me_id = (entry->ring_id & 0x0c) >> 2;
>   		pipe_id = (entry->ring_id & 0x03) >> 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
> index 60f0c7d6a7a3..6baac533a2e6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
> @@ -4859,15 +4859,7 @@ static int gfx_v12_0_eop_irq(struct amdgpu_device *adev,
>   	DRM_DEBUG("IH: CP EOP\n");
>   
>   	if (adev->enable_mes && doorbell_offset) {
> -		struct xarray *xa = &adev->userq_doorbell_xa;
> -		struct amdgpu_usermode_queue *queue;
> -		unsigned long flags;
> -
> -		xa_lock_irqsave(xa, flags);
> -		queue = xa_load(xa, doorbell_offset);
> -		if (queue)
> -			amdgpu_userq_fence_driver_process(queue->fence_drv);
> -		xa_unlock_irqrestore(xa, flags);
> +		amdgpu_userq_process_fence_irq(adev, doorbell_offset);
>   	} else {
>   		me_id = (entry->ring_id & 0x0c) >> 2;
>   		pipe_id = (entry->ring_id & 0x03) >> 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
> index 948758b51b5c..ae65412109c2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
> @@ -3654,16 +3654,7 @@ static int gfx_v12_1_eop_irq(struct amdgpu_device *adev,
>   	DRM_DEBUG("IH: CP EOP\n");
>   
>   	if (adev->enable_mes && doorbell_offset) {
> -		struct xarray *xa = &adev->userq_doorbell_xa;
> -		struct amdgpu_usermode_queue *queue;
> -		unsigned long flags;
> -
> -		xa_lock_irqsave(xa, flags);
> -		queue = xa_load(xa, doorbell_offset);
> -		if (queue)
> -			amdgpu_userq_fence_driver_process(queue->fence_drv);
> -
> -		xa_unlock_irqrestore(xa, flags);
> +		amdgpu_userq_process_fence_irq(adev, doorbell_offset);
>   	} else {
>   		me_id = (entry->ring_id & 0x0c) >> 2;
>   		pipe_id = (entry->ring_id & 0x03) >> 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
> index de329b76a00c..bf09ac841a68 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
> @@ -1662,17 +1662,8 @@ static int sdma_v6_0_process_fence_irq(struct amdgpu_device *adev,
>   	u32 doorbell_offset = entry->src_data[0];
>   
>   	if (adev->enable_mes && doorbell_offset) {
> -		struct amdgpu_usermode_queue *queue;
> -		struct xarray *xa = &adev->userq_doorbell_xa;
> -		unsigned long flags;
> -
>   		doorbell_offset >>= SDMA0_QUEUE0_DOORBELL_OFFSET__OFFSET__SHIFT;
> -
> -		xa_lock_irqsave(xa, flags);
> -		queue = xa_load(xa, doorbell_offset);
> -		if (queue)
> -			amdgpu_userq_fence_driver_process(queue->fence_drv);
> -		xa_unlock_irqrestore(xa, flags);
> +		amdgpu_userq_process_fence_irq(adev, doorbell_offset);
>   	}
>   
>   	return 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
> index 85d98a0e1bff..f154b68dda70 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
> @@ -1594,17 +1594,8 @@ static int sdma_v7_0_process_fence_irq(struct amdgpu_device *adev,
>   	u32 doorbell_offset = entry->src_data[0];
>   
>   	if (adev->enable_mes && doorbell_offset) {
> -		struct xarray *xa = &adev->userq_doorbell_xa;
> -		struct amdgpu_usermode_queue *queue;
> -		unsigned long flags;
> -
>   		doorbell_offset >>= SDMA0_QUEUE0_DOORBELL_OFFSET__OFFSET__SHIFT;
> -
> -		xa_lock_irqsave(xa, flags);
> -		queue = xa_load(xa, doorbell_offset);
> -		if (queue)
> -			amdgpu_userq_fence_driver_process(queue->fence_drv);
> -		xa_unlock_irqrestore(xa, flags);
> +		amdgpu_userq_process_fence_irq(adev, doorbell_offset);
>   	}
>   
>   	return 0;