drm/amdgpu: clean up non-scheduler code path (v2)

Non-scheduler code is longer supported.

v2: agd: rebased on upstream

Signed-off-by: Chunming Zhou <David1.Zhou@amd.com>
Reviewed-by: Ken Wang  <Qingqing.Wang@amd.com>
Reviewed-by: Monk Liu <monk.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 19 insertions, 20 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index 3671f9f220bd..cac03e743b58 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -472,6 +472,7 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring,
 int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring)
 {
         int i, r;
+        long timeout;
 
         ring->fence_drv.cpu_addr = NULL;
         ring->fence_drv.gpu_addr = 0;
@@ -486,26 +487,24 @@ int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring)
 
         init_waitqueue_head(&ring->fence_drv.fence_queue);
 
-        if (amdgpu_enable_scheduler) {
-                long 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,
-                                   amdgpu_sched_hw_submission,
-                                   timeout, ring->name);
-                if (r) {
-                        DRM_ERROR("Failed to create scheduler on ring %s.\n",
-                                  ring->name);
-                        return r;
-                }
+        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,
+                           amdgpu_sched_hw_submission,
+                           timeout, ring->name);
+        if (r) {
+                DRM_ERROR("Failed to create scheduler on ring %s.\n",
+                          ring->name);
+                return r;
         }
 
         return 0;