From: Greg Kroah-Hartman Date: Tue, 8 Oct 2024 10:27:42 +0000 (+0200) Subject: 6.10-stable patches X-Git-Tag: v6.6.55~32 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ed94d46b863a95f388490db7090b67ae6a9a4c9;p=thirdparty%2Fkernel%2Fstable-queue.git 6.10-stable patches added patches: drm-sched-revert-always-increment-correct-scheduler-score.patch --- diff --git a/queue-6.10/drm-sched-revert-always-increment-correct-scheduler-score.patch b/queue-6.10/drm-sched-revert-always-increment-correct-scheduler-score.patch new file mode 100644 index 00000000000..3678490c2a4 --- /dev/null +++ b/queue-6.10/drm-sched-revert-always-increment-correct-scheduler-score.patch @@ -0,0 +1,46 @@ +From abf201f6ce14c4ceeccde5471bdf59614b83a3d8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= +Date: Mon, 30 Sep 2024 15:07:49 +0200 +Subject: drm/sched: revert "Always increment correct scheduler score" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Christian König + +commit abf201f6ce14c4ceeccde5471bdf59614b83a3d8 upstream. + +This reverts commit 087913e0ba2b3b9d7ccbafb2acf5dab9e35ae1d5. + +It turned out that the original code was correct since the rq can only +change when there is no armed job for an entity. + +This change here broke the logic since we only incremented the counter +for the first job, so revert it. + +Signed-off-by: Christian König +Acked-by: Tvrtko Ursulin +Link: https://patchwork.freedesktop.org/patch/msgid/20240930131451.536150-1-christian.koenig@amd.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/scheduler/sched_entity.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/scheduler/sched_entity.c ++++ b/drivers/gpu/drm/scheduler/sched_entity.c +@@ -586,6 +586,7 @@ void drm_sched_entity_push_job(struct dr + ktime_t submit_ts; + + trace_drm_sched_job(sched_job, entity); ++ atomic_inc(entity->rq->sched->score); + WRITE_ONCE(entity->last_user, current->group_leader); + + /* +@@ -613,7 +614,6 @@ void drm_sched_entity_push_job(struct dr + rq = entity->rq; + sched = rq->sched; + +- atomic_inc(sched->score); + drm_sched_rq_add_entity(rq, entity); + spin_unlock(&entity->rq_lock); + diff --git a/queue-6.10/series b/queue-6.10/series index 0ad41f665fc..488fc0bcc4c 100644 --- a/queue-6.10/series +++ b/queue-6.10/series @@ -472,3 +472,4 @@ acpi-battery-simplify-battery-hook-locking.patch acpi-battery-fix-possible-crash-when-unregistering-a.patch drm-rockchip-vop-enable-vop_feature_internal_rgb-on-rk3066.patch revert-drm-amd-display-skip-recompute-dsc-params-if-no-stream-on-link.patch +drm-sched-revert-always-increment-correct-scheduler-score.patch