drm: move amd_gpu_scheduler into common location

This moves and renames the AMDGPU scheduler to a common location in DRM
in order to facilitate re-use by other drivers. This is mostly a straight
forward rename with no code changes.

One notable exception is the function to_drm_sched_fence(), which is no
longer a inline header function to avoid the need to export the
drm_sched_fence_ops_scheduled and drm_sched_fence_ops_finished structures.

Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 952e0bf3bc84..7db9556b389b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -76,7 +76,7 @@ static int amdgpu_ttm_global_init(struct amdgpu_device *adev)
 {
         struct drm_global_reference *global_ref;
         struct amdgpu_ring *ring;
-        struct amd_sched_rq *rq;
+        struct drm_sched_rq *rq;
         int r;
 
         adev->mman.mem_global_referenced = false;
@@ -108,8 +108,8 @@ static int amdgpu_ttm_global_init(struct amdgpu_device *adev)
         mutex_init(&adev->mman.gtt_window_lock);
 
         ring = adev->mman.buffer_funcs_ring;
-        rq = &ring->sched.sched_rq[AMD_SCHED_PRIORITY_KERNEL];
-        r = amd_sched_entity_init(&ring->sched, &adev->mman.entity,
+        rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_KERNEL];
+        r = drm_sched_entity_init(&ring->sched, &adev->mman.entity,
                                   rq, amdgpu_sched_jobs, NULL);
         if (r) {
                 DRM_ERROR("Failed setting up TTM BO move run queue.\n");
@@ -131,7 +131,7 @@ error_mem:
 static void amdgpu_ttm_global_fini(struct amdgpu_device *adev)
 {
         if (adev->mman.mem_global_referenced) {
-                amd_sched_entity_fini(adev->mman.entity.sched,
+                drm_sched_entity_fini(adev->mman.entity.sched,
                                       &adev->mman.entity);
                 mutex_destroy(&adev->mman.gtt_window_lock);
                 drm_global_item_unref(&adev->mman.bo_global_ref.ref);