drm/amdgpu: rename amdgpu_sched.c to amdgpu_job.c

That's probably a better matching name.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile
index dceebbbf94b087d9f4fd835a5b527f512171f2d8..c7fcdcedaadbf5b98a333ad6e87796bccb653812 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/Makefile
+++ b/drivers/gpu/drm/amd/amdgpu/Makefile
@@ -93,7 +93,7 @@ amdgpu-y += amdgpu_cgs.o
 amdgpu-y += \
        ../scheduler/gpu_scheduler.o \
        ../scheduler/sched_fence.o \
-       amdgpu_sched.o
+       amdgpu_job.o
 
 # ACP componet
 ifneq ($(CONFIG_DRM_AMD_ACP),)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
new file mode 100644 (file)
index 0000000..6f3e757
--- /dev/null
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2015 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *
+ */
+#include <linux/kthread.h>
+#include <linux/wait.h>
+#include <linux/sched.h>
+#include <drm/drmP.h>
+#include "amdgpu.h"
+#include "amdgpu_trace.h"
+
+int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,
+                    struct amdgpu_job **job)
+{
+       size_t size = sizeof(struct amdgpu_job);
+
+       if (num_ibs == 0)
+               return -EINVAL;
+
+       size += sizeof(struct amdgpu_ib) * num_ibs;
+
+       *job = kzalloc(size, GFP_KERNEL);
+       if (!*job)
+               return -ENOMEM;
+
+       (*job)->adev = adev;
+       (*job)->ibs = (void *)&(*job)[1];
+       (*job)->num_ibs = num_ibs;
+
+       return 0;
+}
+
+int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, unsigned size,
+                            struct amdgpu_job **job)
+{
+       int r;
+
+       r = amdgpu_job_alloc(adev, 1, job);
+       if (r)
+               return r;
+
+       r = amdgpu_ib_get(adev, NULL, size, &(*job)->ibs[0]);
+       if (r)
+               kfree(*job);
+
+       return r;
+}
+
+void amdgpu_job_free(struct amdgpu_job *job)
+{
+       unsigned i;
+
+       for (i = 0; i < job->num_ibs; ++i)
+               amdgpu_ib_free(job->adev, &job->ibs[i]);
+
+       amdgpu_bo_unref(&job->uf.bo);
+       kfree(job);
+}
+
+int amdgpu_job_submit(struct amdgpu_job *job, struct amdgpu_ring *ring,
+                     void *owner, struct fence **f)
+{
+       struct amdgpu_device *adev = job->adev;
+
+       job->ring = ring;
+       job->base.sched = &ring->sched;
+       job->base.s_entity = &adev->kernel_ctx.rings[ring->idx].entity;
+       job->base.s_fence = amd_sched_fence_create(job->base.s_entity, owner);
+       if (!job->base.s_fence)
+               return -ENOMEM;
+
+       *f = fence_get(&job->base.s_fence->base);
+
+       job->owner = owner;
+       amd_sched_entity_push_job(&job->base);
+
+       return 0;
+}
+
+static struct fence *amdgpu_job_dependency(struct amd_sched_job *sched_job)
+{
+       struct amdgpu_job *job = to_amdgpu_job(sched_job);
+       struct amdgpu_sync *sync = &job->ibs->sync;
+       struct amdgpu_vm *vm = job->ibs->vm;
+
+       struct fence *fence = amdgpu_sync_get_fence(sync);
+
+       if (fence == NULL && vm && !job->ibs->grabbed_vmid) {
+               struct amdgpu_ring *ring = job->ring;
+               int r;
+
+               r = amdgpu_vm_grab_id(vm, ring, sync,
+                                     &job->base.s_fence->base);
+               if (r)
+                       DRM_ERROR("Error getting VM ID (%d)\n", r);
+               else
+                       job->ibs->grabbed_vmid = true;
+
+               fence = amdgpu_sync_get_fence(sync);
+       }
+
+       return fence;
+}
+
+static struct fence *amdgpu_job_run(struct amd_sched_job *sched_job)
+{
+       struct fence *fence = NULL;
+       struct amdgpu_job *job;
+       int r;
+
+       if (!sched_job) {
+               DRM_ERROR("job is null\n");
+               return NULL;
+       }
+       job = to_amdgpu_job(sched_job);
+       trace_amdgpu_sched_run_job(job);
+       r = amdgpu_ib_schedule(job->ring, job->num_ibs, job->ibs,
+                              job->owner, &fence);
+       if (r) {
+               DRM_ERROR("Error scheduling IBs (%d)\n", r);
+               goto err;
+       }
+
+err:
+       amdgpu_job_free(job);
+       return fence;
+}
+
+struct amd_sched_backend_ops amdgpu_sched_ops = {
+       .dependency = amdgpu_job_dependency,
+       .run_job = amdgpu_job_run,
+};

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
deleted file mode 100644 (file)
index bbdda72..0000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright 2015 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- *
- */
-#include <linux/kthread.h>
-#include <linux/wait.h>
-#include <linux/sched.h>
-#include <drm/drmP.h>
-#include "amdgpu.h"
-#include "amdgpu_trace.h"
-
-int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,
-                    struct amdgpu_job **job)
-{
-       size_t size = sizeof(struct amdgpu_job);
-
-       if (num_ibs == 0)
-               return -EINVAL;
-
-       size += sizeof(struct amdgpu_ib) * num_ibs;
-
-       *job = kzalloc(size, GFP_KERNEL);
-       if (!*job)
-               return -ENOMEM;
-
-       (*job)->adev = adev;
-       (*job)->ibs = (void *)&(*job)[1];
-       (*job)->num_ibs = num_ibs;
-
-       return 0;
-}
-
-int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, unsigned size,
-                            struct amdgpu_job **job)
-{
-       int r;
-
-       r = amdgpu_job_alloc(adev, 1, job);
-       if (r)
-               return r;
-
-       r = amdgpu_ib_get(adev, NULL, size, &(*job)->ibs[0]);
-       if (r)
-               kfree(*job);
-
-       return r;
-}
-
-void amdgpu_job_free(struct amdgpu_job *job)
-{
-       unsigned i;
-
-       for (i = 0; i < job->num_ibs; ++i)
-               amdgpu_ib_free(job->adev, &job->ibs[i]);
-
-       amdgpu_bo_unref(&job->uf.bo);
-       kfree(job);
-}
-
-int amdgpu_job_submit(struct amdgpu_job *job, struct amdgpu_ring *ring,
-                     void *owner, struct fence **f)
-{
-       struct amdgpu_device *adev = job->adev;
-
-       job->ring = ring;
-       job->base.sched = &ring->sched;
-       job->base.s_entity = &adev->kernel_ctx.rings[ring->idx].entity;
-       job->base.s_fence = amd_sched_fence_create(job->base.s_entity, owner);
-       if (!job->base.s_fence)
-               return -ENOMEM;
-
-       *f = fence_get(&job->base.s_fence->base);
-
-       job->owner = owner;
-       amd_sched_entity_push_job(&job->base);
-
-       return 0;
-}
-
-static struct fence *amdgpu_sched_dependency(struct amd_sched_job *sched_job)
-{
-       struct amdgpu_job *job = to_amdgpu_job(sched_job);
-       struct amdgpu_sync *sync = &job->ibs->sync;
-       struct amdgpu_vm *vm = job->ibs->vm;
-
-       struct fence *fence = amdgpu_sync_get_fence(sync);
-
-       if (fence == NULL && vm && !job->ibs->grabbed_vmid) {
-               struct amdgpu_ring *ring = job->ring;
-               int r;
-
-               r = amdgpu_vm_grab_id(vm, ring, sync,
-                                     &job->base.s_fence->base);
-               if (r)
-                       DRM_ERROR("Error getting VM ID (%d)\n", r);
-               else
-                       job->ibs->grabbed_vmid = true;
-
-               fence = amdgpu_sync_get_fence(sync);
-       }
-
-       return fence;
-}
-
-static struct fence *amdgpu_sched_run_job(struct amd_sched_job *sched_job)
-{
-       struct fence *fence = NULL;
-       struct amdgpu_job *job;
-       int r;
-
-       if (!sched_job) {
-               DRM_ERROR("job is null\n");
-               return NULL;
-       }
-       job = to_amdgpu_job(sched_job);
-       trace_amdgpu_sched_run_job(job);
-       r = amdgpu_ib_schedule(job->ring, job->num_ibs, job->ibs,
-                              job->owner, &fence);
-       if (r) {
-               DRM_ERROR("Error scheduling IBs (%d)\n", r);
-               goto err;
-       }
-
-err:
-       amdgpu_job_free(job);
-       return fence;
-}
-
-struct amd_sched_backend_ops amdgpu_sched_ops = {
-       .dependency = amdgpu_sched_dependency,
-       .run_job = amdgpu_sched_run_job,
-};