[PATCH] drm/amdgpu/fence: use the no_scheduler flag

[Christian König]

Am 02.06.20 um 20:53 schrieb Alex Deucher:
> Rather than checking the ring type manually.  We already set
> this for MES and KIQ (and a few other special cases).
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

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

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
> index 0ce82686c983..8537f4704348 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
> @@ -469,9 +469,8 @@ int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring,
>   	if (!ring->fence_drv.fences)
>   		return -ENOMEM;
>   
> -	/* No need to setup the GPU scheduler for KIQ and MES ring */
> -	if (ring->funcs->type != AMDGPU_RING_TYPE_KIQ &&
> -	    ring->funcs->type != AMDGPU_RING_TYPE_MES) {
> +	/* No need to setup the GPU scheduler for rings that don't need it */
> +	if (!ring->no_scheduler) {
>   		switch (ring->funcs->type) {
>   		case AMDGPU_RING_TYPE_GFX:
>   			timeout = adev->gfx_timeout;
> @@ -543,7 +542,8 @@ void amdgpu_fence_driver_fini(struct amdgpu_device *adev)
>   		if (ring->fence_drv.irq_src)
>   			amdgpu_irq_put(adev, ring->fence_drv.irq_src,
>   				       ring->fence_drv.irq_type);
> -		drm_sched_fini(&ring->sched);
> +		if (!ring->no_scheduler)
> +			drm_sched_fini(&ring->sched);
>   		del_timer_sync(&ring->fence_drv.fallback_timer);
>   		for (j = 0; j <= ring->fence_drv.num_fences_mask; ++j)
>   			dma_fence_put(ring->fence_drv.fences[j]);