]> www.infradead.org Git - users/hch/misc.git/commitdiff
drm/xe: Set GT as wedged before sending wedged uevent
authorRiana Tauro <riana.tauro@intel.com>
Tue, 26 Aug 2025 06:34:10 +0000 (12:04 +0530)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 26 Aug 2025 14:11:34 +0000 (10:11 -0400)
Userspace should be notified after setting the device as wedged.
Re-order function calls to set gt wedged before sending uevent.

Cc: Matthew Brost <matthew.brost@intel.com>
Suggested-by: Raag Jadav <raag.jadav@intel.com>
Signed-off-by: Riana Tauro <riana.tauro@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://lore.kernel.org/r/20250826063419.3022216-4-riana.tauro@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/xe/xe_device.c

index 6f7f551bd263877a3204b61555d768479f429180..bc8be6fbd2e8d8cc61815038fe45da38ee963308 100644 (file)
@@ -1180,8 +1180,10 @@ static void xe_device_wedged_fini(struct drm_device *drm, void *arg)
  * xe_device_declare_wedged - Declare device wedged
  * @xe: xe device instance
  *
- * This is a final state that can only be cleared with a module
+ * This is a final state that can only be cleared with the recovery method
+ * specified in the drm wedged uevent. The default recovery method is
  * re-probe (unbind + bind).
+ *
  * In this state every IOCTL will be blocked so the GT cannot be used.
  * In general it will be called upon any critical error such as gt reset
  * failure or guc loading failure. Userspace will be notified of this state
@@ -1215,13 +1217,15 @@ void xe_device_declare_wedged(struct xe_device *xe)
                        "IOCTLs and executions are blocked. Only a rebind may clear the failure\n"
                        "Please file a _new_ bug report at https://gitlab.freedesktop.org/drm/xe/kernel/issues/new\n",
                        dev_name(xe->drm.dev));
+       }
+
+       for_each_gt(gt, xe, id)
+               xe_gt_declare_wedged(gt);
 
+       if (xe_device_wedged(xe)) {
                /* Notify userspace of wedged device */
                drm_dev_wedged_event(&xe->drm,
                                     DRM_WEDGE_RECOVERY_REBIND | DRM_WEDGE_RECOVERY_BUS_RESET,
                                     NULL);
        }
-
-       for_each_gt(gt, xe, id)
-               xe_gt_declare_wedged(gt);
 }