This is a note to let you know that I've just added the patch titled
drm/xe/guc: Only take actions in CT irq handler if CTs are enabled
to the 6.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-xe-guc-only-take-actions-in-ct-irq-handler-if-ct.patch
and it can be found in the queue-6.8 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit d430e04a614582ebc96d24ddbb01f0624b3fbb30
Author: Matthew Brost <matthew.brost@xxxxxxxxx>
Date: Tue Jan 2 12:35:38 2024 -0800
drm/xe/guc: Only take actions in CT irq handler if CTs are enabled
[ Upstream commit 5030e16140b655ba00217d47680e697480ac3587 ]
Protect entire IRQ handler by CT being enabled rather than just G2H
handler.
v2: Return on not enabled in CT irq handler (Michal)
Suggested-by: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx>
Signed-off-by: Matthew Brost <matthew.brost@xxxxxxxxx>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx>
Stable-dep-of: c002bfe644a2 ("drm/xe: Use ordered WQ for G2H handler")
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/drivers/gpu/drm/xe/xe_guc_ct.h b/drivers/gpu/drm/xe/xe_guc_ct.h
index f15f8a4857e07..9ecb67db8ec40 100644
--- a/drivers/gpu/drm/xe/xe_guc_ct.h
+++ b/drivers/gpu/drm/xe/xe_guc_ct.h
@@ -24,9 +24,11 @@ void xe_guc_ct_print(struct xe_guc_ct *ct, struct drm_printer *p, bool atomic);
static inline void xe_guc_ct_irq_handler(struct xe_guc_ct *ct)
{
+ if (!ct->enabled)
+ return;
+
wake_up_all(&ct->wq);
- if (ct->enabled)
- queue_work(system_unbound_wq, &ct->g2h_worker);
+ queue_work(system_unbound_wq, &ct->g2h_worker);
xe_guc_ct_fast_path(ct);
}
