]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/xe/guc: Ensure CT state transitions via STOP before DISABLED
authorZhanjun Dong <zhanjun.dong@intel.com>
Tue, 10 Mar 2026 22:50:37 +0000 (18:50 -0400)
committerThomas Hellström <thomas.hellstrom@linux.intel.com>
Thu, 19 Mar 2026 13:22:39 +0000 (14:22 +0100)
The GuC CT state transition requires moving to the STOP state before
entering the DISABLED state. Update the driver teardown sequence to make
the proper state machine transitions.

Fixes: ee4b32220a6b ("drm/xe/guc: Add devm release action to safely tear down CT")
Cc: stable@vger.kernel.org
Signed-off-by: Zhanjun Dong <zhanjun.dong@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patch.msgid.link/20260310225039.1320161-6-zhanjun.dong@intel.com
(cherry picked from commit dace8cb0032f57ea67c87b3b92ad73c89dd2db44)
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
drivers/gpu/drm/xe/xe_guc_ct.c

index d04589140b776f45fe63ab44ed38c83db79bbefd..c80082b4c876c731b4d5d4db2a5478e6f84cadff 100644 (file)
@@ -345,6 +345,7 @@ static void guc_action_disable_ct(void *arg)
 {
        struct xe_guc_ct *ct = arg;
 
+       xe_guc_ct_stop(ct);
        guc_ct_change_state(ct, XE_GUC_CT_STATE_DISABLED);
 }