diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0699-drm-scheduler-fix-setting-the-priorty-for-entities-v.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0699-drm-scheduler-fix-setting-the-priorty-for-entities-v.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0699-drm-scheduler-fix-setting-the-priorty-for-entities-v.patch b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0699-drm-scheduler-fix-setting-the-priorty-for-entities-v.patch new file mode 100644 index 00000000..a3a29b0a --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0699-drm-scheduler-fix-setting-the-priorty-for-entities-v.patch @@ -0,0 +1,81 @@ +From 617cbf386585e944ef2b2e0d62fb7afe3ba85b30 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Wed, 1 Aug 2018 16:22:39 +0200 +Subject: [PATCH 0699/2940] drm/scheduler: fix setting the priorty for entities + (v2) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since we now deal with multiple rq we need to update all of them, not +just the current one. + +v2: Trivial: Removed unused variable (Alex) + +Signed-off-by: Christian König <christian.koenig@amd.com> +Acked-by: Nayan Deshmukh <nayan26deshmukh@gmail.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/scheduler/gpu_scheduler.c | 36 +++++++++++++++-------- + 1 file changed, 23 insertions(+), 13 deletions(-) + +diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler.c b/drivers/gpu/drm/scheduler/gpu_scheduler.c +index c1592ef07921..5ea3b0a24dca 100644 +--- a/drivers/gpu/drm/scheduler/gpu_scheduler.c ++++ b/drivers/gpu/drm/scheduler/gpu_scheduler.c +@@ -451,29 +451,39 @@ void drm_sched_entity_set_priority(struct drm_sched_entity *entity, + EXPORT_SYMBOL(drm_sched_entity_set_priority); + + /** +- * drm_sched_entity_set_rq - Sets the run queue for an entity ++ * drm_sched_entity_set_rq_priority - helper for drm_sched_entity_set_priority ++ */ ++static void drm_sched_entity_set_rq_priority(struct drm_sched_rq **rq, ++ enum drm_sched_priority priority) ++{ ++ *rq = &(*rq)->sched->sched_rq[priority]; ++} ++ ++/** ++ * drm_sched_entity_set_priority - Sets priority of the entity + * + * @entity: scheduler entity +- * @rq: scheduler run queue ++ * @priority: scheduler priority + * +- * Sets the run queue for an entity and removes the entity from the previous +- * run queue in which was present. ++ * Update the priority of runqueus used for the entity. + */ +-void drm_sched_entity_set_rq(struct drm_sched_entity *entity, +- struct drm_sched_rq *rq) ++void drm_sched_entity_set_priority(struct drm_sched_entity *entity, ++ enum drm_sched_priority priority) + { +- if (entity->rq == rq) +- return; +- +- BUG_ON(!rq); ++ unsigned int i; + + spin_lock(&entity->rq_lock); ++ ++ for (i = 0; i < entity->num_rq_list; ++i) ++ drm_sched_entity_set_rq_priority(&entity->rq_list[i], priority); ++ + drm_sched_rq_remove_entity(entity->rq, entity); +- entity->rq = rq; +- drm_sched_rq_add_entity(rq, entity); ++ drm_sched_entity_set_rq_priority(&entity->rq, priority); ++ drm_sched_rq_add_entity(entity->rq, entity); ++ + spin_unlock(&entity->rq_lock); + } +-EXPORT_SYMBOL(drm_sched_entity_set_rq); ++EXPORT_SYMBOL(drm_sched_entity_set_priority); + + /** + * drm_sched_dependency_optimized +-- +2.17.1 + |