Re: [PATCH 3/3] drm/amdgpu: Simplify amdgpu_ring_init

["Christian König" <christian.koenig@amd.com>]

On 10/20/26 15:27, Tvrtko Ursulin wrote:
> (Too) many times I grepped the codebase trying to figure out who sets
> adev->gpu_sched[hw_ip][hw_prio].num_scheds and this time I decided to make
> this greppable by avoding the fun pointer games.
> 
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: Christian König <christian.koenig@amd.com>
> Cc: Timur Kristóf <timur.kristof@gmail.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> index 227734541316..7b67e8cecca2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> @@ -213,11 +213,9 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
>  		     unsigned int irq_type, unsigned int hw_prio,
>  		     atomic_t *sched_score)
>  {
> -	int r;
>  	int sched_hw_submission = amdgpu_sched_hw_submission;
> -	u32 *num_sched;
> -	u32 hw_ip;
>  	unsigned int max_ibs_dw;
> +	int r;
>  
>  	/* Set the hw submission limit higher for KIQ because
>  	 * it's used for a number of gfx/compute tasks by both
> @@ -359,10 +357,10 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
>  	ring->vmid_wait = dma_fence_get_stub();
>  
>  	if (!ring->no_scheduler && ring->funcs->type < AMDGPU_HW_IP_NUM) {
> -		hw_ip = ring->funcs->type;
> -		num_sched = &adev->gpu_sched[hw_ip][hw_prio].num_scheds;
> -		adev->gpu_sched[hw_ip][hw_prio].sched[(*num_sched)++] =
> -			&ring->sched;
> +		struct amdgpu_sched *gpu_sched =
> +			&adev->gpu_sched[ring->funcs->type][hw_prio];
> +
> +		gpu_sched->sched[gpu_sched->num_scheds++] = &ring->sched;
>  	}
>  
>  	return 0;