From 4f848fe0e1280635137d0dccb5854d2a73b80699 Mon Sep 17 00:00:00 2001 From: jsg Date: Thu, 4 Apr 2024 08:07:39 +0000 Subject: [PATCH] drm/i915/gt: Reset queue_priority_hint on parking From Chris Wilson 3b031e4fcb2740988143c303f81f69f18ce86325 in linux-6.6.y/6.6.24 4a3859ea5240365d21f6053ee219bb240d520895 in mainline linux --- sys/dev/pci/drm/i915/gt/intel_engine_pm.c | 3 --- sys/dev/pci/drm/i915/gt/intel_execlists_submission.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/pci/drm/i915/gt/intel_engine_pm.c b/sys/dev/pci/drm/i915/gt/intel_engine_pm.c index b538b5c0494..a95615b345c 100644 --- a/sys/dev/pci/drm/i915/gt/intel_engine_pm.c +++ b/sys/dev/pci/drm/i915/gt/intel_engine_pm.c @@ -278,9 +278,6 @@ static int __engine_park(struct intel_wakeref *wf) intel_engine_park_heartbeat(engine); intel_breadcrumbs_park(engine->breadcrumbs); - /* Must be reset upon idling, or we may miss the busy wakeup. */ - GEM_BUG_ON(engine->sched_engine->queue_priority_hint != INT_MIN); - if (engine->park) engine->park(engine); diff --git a/sys/dev/pci/drm/i915/gt/intel_execlists_submission.c b/sys/dev/pci/drm/i915/gt/intel_execlists_submission.c index 7f1f04000d7..c3afa008460 100644 --- a/sys/dev/pci/drm/i915/gt/intel_execlists_submission.c +++ b/sys/dev/pci/drm/i915/gt/intel_execlists_submission.c @@ -3279,6 +3279,9 @@ static void execlists_park(struct intel_engine_cs *engine) { cancel_timer(&engine->execlists.timer); cancel_timer(&engine->execlists.preempt); + + /* Reset upon idling, or we may delay the busy wakeup. */ + WRITE_ONCE(engine->sched_engine->queue_priority_hint, INT_MIN); } static void add_to_engine(struct i915_request *rq) -- 2.20.1