drm/amdgpu:no gpu scheduler for KIQ

KIQ is used for interaction between driver and
CP, and not exposed to outside client, as such it
doesn't need to be handled by GPU scheduler.

Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
Signed-off-by: Trigger Huang <trigger.huang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index 97928d7..7b60fb7 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -382,24 +382,27 @@ int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring,
        if (!ring->fence_drv.fences)
                return -ENOMEM;
 
-       timeout = msecs_to_jiffies(amdgpu_lockup_timeout);
-       if (timeout == 0) {
-               /*
-                * FIXME:
-                * Delayed workqueue cannot use it directly,
-                * so the scheduler will not use delayed workqueue if
-                * MAX_SCHEDULE_TIMEOUT is set.
-                * Currently keep it simple and silly.
-                */
-               timeout = MAX_SCHEDULE_TIMEOUT;
-       }
-       r = amd_sched_init(&ring->sched, &amdgpu_sched_ops,
-                          num_hw_submission,
-                          timeout, ring->name);
-       if (r) {
-               DRM_ERROR("Failed to create scheduler on ring %s.\n",
-                         ring->name);
-               return r;
+       /* No need to setup the GPU scheduler for KIQ ring */
+       if (ring->funcs->type != AMDGPU_RING_TYPE_KIQ) {
+               timeout = msecs_to_jiffies(amdgpu_lockup_timeout);
+               if (timeout == 0) {
+                       /*
+                        * FIXME:
+                        * Delayed workqueue cannot use it directly,
+                        * so the scheduler will not use delayed workqueue if
+                        * MAX_SCHEDULE_TIMEOUT is set.
+                        * Currently keep it simple and silly.
+                        */
+                       timeout = MAX_SCHEDULE_TIMEOUT;
+               }
+               r = amd_sched_init(&ring->sched, &amdgpu_sched_ops,
+                                  num_hw_submission,
+                                  timeout, ring->name);
+               if (r) {
+                       DRM_ERROR("Failed to create scheduler on ring %s.\n",
+                                 ring->name);
+                       return r;
+               }
        }
 
        return 0;