]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/xe: Send 'none' recovery method for XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET
authorRaag Jadav <raag.jadav@intel.com>
Thu, 5 Mar 2026 13:06:49 +0000 (18:36 +0530)
committerMatthew Brost <matthew.brost@intel.com>
Tue, 24 Mar 2026 05:00:40 +0000 (22:00 -0700)
XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET is intended for debugging hangs,
so wedge the device with 'none' recovery method and have it available
to the user for debugging.

Signed-off-by: Raag Jadav <raag.jadav@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patch.msgid.link/20260305130720.3685754-4-raag.jadav@intel.com
drivers/gpu/drm/xe/xe_device.c

index 3462645ca13c79b9cfed0de86cfffe150b51942a..4c77aad436dd18fa3d562b7add59a1c244839965 100644 (file)
@@ -1318,8 +1318,15 @@ void xe_device_declare_wedged(struct xe_device *xe)
                xe_gt_declare_wedged(gt);
 
        if (xe_device_wedged(xe)) {
+               /*
+                * XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET is intended for debugging
+                * hangs, so wedge the device with 'none' recovery method and have
+                * it available to the user for debugging.
+                */
+               if (xe->wedged.mode == XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET)
+                       xe_device_set_wedged_method(xe, DRM_WEDGE_RECOVERY_NONE);
                /* If no wedge recovery method is set, use default */
-               if (!xe->wedged.method)
+               else if (!xe->wedged.method)
                        xe_device_set_wedged_method(xe, DRM_WEDGE_RECOVERY_REBIND |
                                                    DRM_WEDGE_RECOVERY_BUS_RESET);