aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0700-drm-scheduler-bind-job-earlier-to-scheduler.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0700-drm-scheduler-bind-job-earlier-to-scheduler.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0700-drm-scheduler-bind-job-earlier-to-scheduler.patch59
1 files changed, 59 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0700-drm-scheduler-bind-job-earlier-to-scheduler.patch b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0700-drm-scheduler-bind-job-earlier-to-scheduler.patch
new file mode 100644
index 00000000..12b50693
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0700-drm-scheduler-bind-job-earlier-to-scheduler.patch
@@ -0,0 +1,59 @@
+From 9025330fb27405eeeecfd940e84bdf4c238f8f74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
+Date: Mon, 6 Aug 2018 12:46:41 +0200
+Subject: [PATCH 0700/2940] drm/scheduler: bind job earlier to scheduler
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Update job earlier with the scheduler it is supposed to be scheduled on.
+
+Otherwise we could incorrectly optimize dependencies when moving an
+entity from one scheduler to another.
+
+Signed-off-by: Christian König <christian.koenig@amd.com>
+Reviewed-by: Nayan Deshmukh <nayan26deshmukh@gmail.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/scheduler/gpu_scheduler.c | 4 ++--
+ drivers/gpu/drm/scheduler/sched_fence.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler.c b/drivers/gpu/drm/scheduler/gpu_scheduler.c
+index 5ea3b0a24dca..65d22e11059e 100644
+--- a/drivers/gpu/drm/scheduler/gpu_scheduler.c
++++ b/drivers/gpu/drm/scheduler/gpu_scheduler.c
+@@ -565,8 +565,6 @@ drm_sched_entity_pop_job(struct drm_sched_entity *entity)
+ if (!sched_job)
+ return NULL;
+
+- sched_job->sched = sched;
+- sched_job->s_fence->sched = sched;
+ while ((entity->dependency = sched->ops->dependency(sched_job, entity))) {
+ if (drm_sched_entity_add_dependency_cb(entity)) {
+
+@@ -617,6 +615,8 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job,
+ spin_unlock(&entity->rq_lock);
+ }
+
++ sched_job->sched = entity->rq->sched;
++ sched_job->s_fence->sched = entity->rq->sched;
+ trace_drm_sched_job(sched_job, entity);
+ atomic_inc(&entity->rq->sched->num_jobs);
+ WRITE_ONCE(entity->last_user, current->group_leader);
+diff --git a/drivers/gpu/drm/scheduler/sched_fence.c b/drivers/gpu/drm/scheduler/sched_fence.c
+index d8d2dff9ea2f..20e4da377890 100644
+--- a/drivers/gpu/drm/scheduler/sched_fence.c
++++ b/drivers/gpu/drm/scheduler/sched_fence.c
+@@ -161,7 +161,7 @@ struct drm_sched_fence *drm_sched_fence_create(struct drm_sched_entity *entity,
+ return NULL;
+
+ fence->owner = owner;
+- fence->sched = entity->rq->sched;
++ fence->sched = NULL;
+ spin_lock_init(&fence->lock);
+
+ seq = atomic_inc_return(&entity->fence_seq);
+--
+2.17.1
+