Commit 730c2eb9 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/fence: use the no_scheduler flag 



Rather than checking the ring type manually.  We already set
this for MES and KIQ (and a few other special cases).

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent eb0b5d6f

drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c

+4 −4
Original line number Diff line number Diff line
@@ -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,6 +542,7 @@ 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);

		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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE