From: Alex Deucher Date: Thu, 9 Apr 2020 20:04:39 +0000 (-0400) Subject: drm/amdgpu/ring: simplify scheduler setup logic X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a4c246802719416a53162d807da562effe8ef355;p=linux.git drm/amdgpu/ring: simplify scheduler setup logic Set up a GPU scheduler based on the ring flag rather than the ring type. Reviewed-by: Christian König Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c index 4863e91c5533d..13ea8ebc421c6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c @@ -260,9 +260,7 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, ring->priority = DRM_SCHED_PRIORITY_NORMAL; mutex_init(&ring->priority_mutex); - if (ring->funcs->type >= AMDGPU_RING_TYPE_GFX && - ring->funcs->type <= AMDGPU_RING_TYPE_VCN_JPEG && - !ring->no_scheduler) { + if (!ring->no_scheduler) { 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)++] =