aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0505-drm-amdgpu-remove-extra-parameters-from-scheduler-ca.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0505-drm-amdgpu-remove-extra-parameters-from-scheduler-ca.patch')
-rw-r--r--common/recipes-kernel/linux/files/0505-drm-amdgpu-remove-extra-parameters-from-scheduler-ca.patch97
1 files changed, 0 insertions, 97 deletions
diff --git a/common/recipes-kernel/linux/files/0505-drm-amdgpu-remove-extra-parameters-from-scheduler-ca.patch b/common/recipes-kernel/linux/files/0505-drm-amdgpu-remove-extra-parameters-from-scheduler-ca.patch
deleted file mode 100644
index d6fb1180..00000000
--- a/common/recipes-kernel/linux/files/0505-drm-amdgpu-remove-extra-parameters-from-scheduler-ca.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From bd755d08709f05a81104e8f81d721b5cc353a2b3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
-Date: Mon, 24 Aug 2015 14:57:26 +0200
-Subject: [PATCH 0505/1050] drm/amdgpu: remove extra parameters from scheduler
- callbacks
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Christian König <christian.koenig@amd.com>
-Acked-by: Alex Deucher <alexander.deucher@amd.com>
-Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
-Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 11 ++++-------
- drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 4 ++--
- drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 7 ++-----
- 3 files changed, 8 insertions(+), 14 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
-index 757058d..f93fb35 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
-@@ -27,13 +27,11 @@
- #include <drm/drmP.h>
- #include "amdgpu.h"
-
--static struct fence *amdgpu_sched_run_job(struct amd_gpu_scheduler *sched,
-- struct amd_sched_entity *entity,
-- struct amd_sched_job *job)
-+static struct fence *amdgpu_sched_run_job(struct amd_sched_job *job)
- {
-- int r = 0;
- struct amdgpu_job *sched_job;
- struct amdgpu_fence *fence;
-+ int r;
-
- if (!job) {
- DRM_ERROR("job is null\n");
-@@ -58,12 +56,11 @@ static struct fence *amdgpu_sched_run_job(struct amd_gpu_scheduler *sched,
- err:
- DRM_ERROR("Run job error\n");
- mutex_unlock(&sched_job->job_lock);
-- sched->ops->process_job(sched, (struct amd_sched_job *)sched_job);
-+ job->sched->ops->process_job(job);
- return NULL;
- }
-
--static void amdgpu_sched_process_job(struct amd_gpu_scheduler *sched,
-- struct amd_sched_job *job)
-+static void amdgpu_sched_process_job(struct amd_sched_job *job)
- {
- struct amdgpu_job *sched_job;
-
-diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
-index 4145365..6dfbdea 100644
---- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
-+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
-@@ -289,7 +289,7 @@ static void amd_sched_process_job(struct fence *f, struct fence_cb *cb)
- amd_sched_fence_signal(sched_job->s_fence);
- atomic_dec(&sched->hw_rq_count);
- fence_put(&sched_job->s_fence->base);
-- sched->ops->process_job(sched, sched_job);
-+ sched->ops->process_job(sched_job);
- wake_up_interruptible(&sched->wait_queue);
- }
-
-@@ -318,7 +318,7 @@ static int amd_sched_main(void *param)
- continue;
- atomic_inc(&sched->hw_rq_count);
-
-- fence = sched->ops->run_job(sched, c_entity, job);
-+ fence = sched->ops->run_job(job);
- if (fence) {
- r = fence_add_callback(fence, &job->cb,
- amd_sched_process_job);
-diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
-index 128f908..13349a6 100644
---- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
-+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
-@@ -90,11 +90,8 @@ static inline struct amd_sched_fence *to_amd_sched_fence(struct fence *f)
- * these functions should be implemented in driver side
- */
- struct amd_sched_backend_ops {
-- struct fence *(*run_job)(struct amd_gpu_scheduler *sched,
-- struct amd_sched_entity *c_entity,
-- struct amd_sched_job *job);
-- void (*process_job)(struct amd_gpu_scheduler *sched,
-- struct amd_sched_job *job);
-+ struct fence *(*run_job)(struct amd_sched_job *job);
-+ void (*process_job)(struct amd_sched_job *job);
- };
-
- /**
---
-1.9.1
-