drm/xe/uapi: Remove reset uevent for now

This kernel uevent is getting removed for now. It will come
back later with a better future proof name.

v2: Rebase (Francois Dugast)

Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Francois Dugast <francois.dugast@intel.com>
Cc: Aravind Iddamsetty <aravind.iddamsetty@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: José Roberto de Souza <jose.souza@intel.com>
Acked-by: Mateusz Naklicki <mateusz.naklicki@intel.com>
Signed-off-by: Francois Dugast <francois.dugast@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
index f5d18e98f8b6c7322a4a1c1b909e66b87e43b4af..3af2adec129561850bfb378c04ca2d7caacdf325 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -589,20 +589,6 @@ static int do_gt_restart(struct xe_gt *gt)
        return 0;
 }
 
-static void xe_uevent_gt_reset_failure(struct pci_dev *pdev, u8 tile_id, u8 gt_id)
-{
-       char *reset_event[4];
-
-       reset_event[0] = DRM_XE_RESET_FAILED_UEVENT "=NEEDS_RESET";
-       reset_event[1] = kasprintf(GFP_KERNEL, "TILE_ID=%d", tile_id);
-       reset_event[2] = kasprintf(GFP_KERNEL, "GT_ID=%d", gt_id);
-       reset_event[3] = NULL;
-       kobject_uevent_env(&pdev->dev.kobj, KOBJ_CHANGE, reset_event);
-
-       kfree(reset_event[1]);
-       kfree(reset_event[2]);
-}
-
 static int gt_reset(struct xe_gt *gt)
 {
        int err;
@@ -659,10 +645,6 @@ err_msg:
 err_fail:
        xe_gt_err(gt, "reset failed (%pe)\n", ERR_PTR(err));
 
-       /* Notify userspace about gt reset failure */
-       xe_uevent_gt_reset_failure(to_pci_dev(gt_to_xe(gt)->drm.dev),
-                                  gt_to_tile(gt)->id, gt->info.id);
-
        gt_to_xe(gt)->needs_flr_on_fini = true;
 
        return err;

diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
index 919aa72c44816cf2dc13073cab89d46b15f0098b..9fa3ae324731a6a96d47d81e18566b321f2f0bca 100644 (file)
--- a/include/uapi/drm/xe_drm.h
+++ b/include/uapi/drm/xe_drm.h
@@ -20,7 +20,6 @@ extern "C" {
  *   2. Extension definition and helper structs
  *   3. IOCTL's Query structs in the order of the Query's entries.
  *   4. The rest of IOCTL structs in the order of IOCTL declaration.
- *   5. uEvents
  */
 
 /**
@@ -1341,16 +1340,6 @@ struct drm_xe_wait_user_fence {
        __u64 reserved[2];
 };
 
-/**
- * DOC: uevent generated by xe on it's pci node.
- *
- * DRM_XE_RESET_FAILED_UEVENT - Event is generated when attempt to reset gt
- * fails. The value supplied with the event is always "NEEDS_RESET".
- * Additional information supplied is tile id and gt id of the gt unit for
- * which reset has failed.
- */
-#define DRM_XE_RESET_FAILED_UEVENT "DEVICE_STATUS"
-
 #if defined(__cplusplus)
 }
 #endif