Skip to content

Commit 77a0d4d

Browse files
committed
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>
1 parent 9f7ceec commit 77a0d4d

File tree

2 files changed

+0
-29
lines changed

2 files changed

+0
-29
lines changed

drivers/gpu/drm/xe/xe_gt.c

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -589,20 +589,6 @@ static int do_gt_restart(struct xe_gt *gt)
589589
return 0;
590590
}
591591

592-
static void xe_uevent_gt_reset_failure(struct pci_dev *pdev, u8 tile_id, u8 gt_id)
593-
{
594-
char *reset_event[4];
595-
596-
reset_event[0] = DRM_XE_RESET_FAILED_UEVENT "=NEEDS_RESET";
597-
reset_event[1] = kasprintf(GFP_KERNEL, "TILE_ID=%d", tile_id);
598-
reset_event[2] = kasprintf(GFP_KERNEL, "GT_ID=%d", gt_id);
599-
reset_event[3] = NULL;
600-
kobject_uevent_env(&pdev->dev.kobj, KOBJ_CHANGE, reset_event);
601-
602-
kfree(reset_event[1]);
603-
kfree(reset_event[2]);
604-
}
605-
606592
static int gt_reset(struct xe_gt *gt)
607593
{
608594
int err;
@@ -659,10 +645,6 @@ static int gt_reset(struct xe_gt *gt)
659645
err_fail:
660646
xe_gt_err(gt, "reset failed (%pe)\n", ERR_PTR(err));
661647

662-
/* Notify userspace about gt reset failure */
663-
xe_uevent_gt_reset_failure(to_pci_dev(gt_to_xe(gt)->drm.dev),
664-
gt_to_tile(gt)->id, gt->info.id);
665-
666648
gt_to_xe(gt)->needs_flr_on_fini = true;
667649

668650
return err;

include/uapi/drm/xe_drm.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ extern "C" {
2020
* 2. Extension definition and helper structs
2121
* 3. IOCTL's Query structs in the order of the Query's entries.
2222
* 4. The rest of IOCTL structs in the order of IOCTL declaration.
23-
* 5. uEvents
2423
*/
2524

2625
/**
@@ -1341,16 +1340,6 @@ struct drm_xe_wait_user_fence {
13411340
__u64 reserved[2];
13421341
};
13431342

1344-
/**
1345-
* DOC: uevent generated by xe on it's pci node.
1346-
*
1347-
* DRM_XE_RESET_FAILED_UEVENT - Event is generated when attempt to reset gt
1348-
* fails. The value supplied with the event is always "NEEDS_RESET".
1349-
* Additional information supplied is tile id and gt id of the gt unit for
1350-
* which reset has failed.
1351-
*/
1352-
#define DRM_XE_RESET_FAILED_UEVENT "DEVICE_STATUS"
1353-
13541343
#if defined(__cplusplus)
13551344
}
13561345
#endif

0 commit comments

Comments
 (0)