Skip to contentSkip to conversation

Allow configfs to disable specific GT type(s)

PATCH Superseded Matt Roper 5 participants 7 messages Sep 18, 2025 – Sep 24, 2025

Subsystems (2)

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Matt Roper

author
#0 lore raw

cover Allow configfs to disable specific GT type(s)

During various debug or hardware bringup activities, it is often useful to completely disable one of the GTs to reduce the scope of the debug. Add a configfs attribute to make this easy to do in a standard manner, similar to the existing attribute we have to limit engines.

Note that in practice it only makes sense to disable the media GT at the moment. In the future, with a bit of additional driver refactoring, it should theoretically be possible to also disable the primary GT on igpu platforms, resulting in a media-only or a no-GT (display-only) config. But for now, the driver will refuse to probe the device if primary GT disabling is attempted. Also note that the requirement to keep the primary GT enabled will likely always be present for dgpu platforms since the driver relies on the BCS engines (part of the primary GT) for various vram clear+copy operations.

Matt Roper (2):
drm/xe/huc: Adjust HuC check on primary GT drm/xe/configfs: Add attribute to disable GT types

 drivers/gpu/drm/xe/xe_configfs.c | 119 +++++++++++++++++++++++++++++++
 drivers/gpu/drm/xe/xe_configfs.h |   2 +
 drivers/gpu/drm/xe/xe_huc.c      |  10 ++-
 drivers/gpu/drm/xe/xe_pci.c      |  18 +++++
 4 files changed, 146 insertions(+), 3 deletions(-)
Signature · 1 line
2.51.0
author
#1 lore raw

PATCH 1/2 drm/xe/huc: Adjust HuC check on primary GT

The HuC initialization code determines whether a platform can have a HuC on the primary GT by checking whether tile->media_gt is NULL; old Xe1 platforms that combined render+media into a single GT will always have a NULL media_gt pointer. However once we allow media to be disabled via configfs, there will also be cases where tile->media_gt is NULL on more modern platforms, causing this condition to behave incorrectly.

To handle cases where media gets disabled via configfs (or theoretical cases where media is truly fused off in hardware), change the condition to consider the graphics version of the primary GT; only the old Xe1 platforms with graphics versions 12.55 or earlier should try to initialize a HuC on the primary GT.

Cc Daniele Ceraolo Spurio <[email protected]>
---
 drivers/gpu/drm/xe/xe_huc.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/drm/xe/xe_huc.c +7 -3
index 7e43b2dd6a32..0a70c8924582 100644
@@ -66,14 +66,18 @@ static int huc_alloc_gsc_pkt(struct xe_huc *huc)
 int xe_huc_init(struct xe_huc *huc)
 {
 	struct xe_gt *gt = huc_to_gt(huc);
-	struct xe_tile *tile = gt_to_tile(gt);
 	struct xe_device *xe = gt_to_xe(gt);
 	int ret;
 
 	huc->fw.type = XE_UC_FW_TYPE_HUC;
 
-	/* On platforms with a media GT the HuC is only available there */
-	if (tile->media_gt && (gt != tile->media_gt)) {
+	/*
+	 * The HuC is only available on the media GT on most platforms.  The
+	 * exception to that rule are the old Xe1 platforms where there was
+	 * no separate GT for media IP, so the HuC was part of the primary
+	 * GT.  Such platforms have graphics versions 12.55 and earlier.
+	 */
+	if (!xe_gt_is_media_type(gt) && GRAPHICS_VERx100(xe) > 1255) {
 		xe_uc_fw_change_status(&huc->fw, XE_UC_FIRMWARE_NOT_SUPPORTED);
 		return 0;
 	}
Signature · 1 line
2.51.0
Reviewed-by on v1 1/2
#2 lore raw

RE: [PATCH 1/2] drm/xe/huc: Adjust HuC check on primary GT

Quoted 42 lines

-----Original Message-----
From: Intel-xe <[email protected]> On Behalf Of Matt Roper
Sent: 19 September 2025 02:43
To: [email protected]
Cc: Roper, Matthew D <[email protected]>; Ceraolo Spurio, Daniele <[email protected]>
Subject: [PATCH 1/2] drm/xe/huc: Adjust HuC check on primary GT

The HuC initialization code determines whether a platform can have a HuC on the primary GT by checking whether tile->media_gt is NULL; old Xe1 platforms that combined render+media into a single GT will always have a NULL media_gt pointer. However once we allow media to be disabled via configfs, there will also be cases where tile->media_gt is NULL on more modern platforms, causing this condition to behave incorrectly.

To handle cases where media gets disabled via configfs (or theoretical cases where media is truly fused off in hardware), change the condition to consider the graphics version of the primary GT; only the old Xe1 platforms with graphics versions 12.55 or earlier should try to initialize a HuC on the primary GT.

Cc Daniele Ceraolo Spurio <[email protected]>
---
 drivers/gpu/drm/xe/xe_huc.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/drm/xe/xe_huc.c +0 -1
index 7e43b2dd6a32..0a70c8924582 100644
@@ -66,14 +66,18 @@ static int huc_alloc_gsc_pkt(struct xe_huc *huc)  int
 xe_huc_init(struct xe_huc *huc)  {
 	struct xe_gt *gt = huc_to_gt(huc);
-	struct xe_tile *tile = gt_to_tile(gt);
 	struct xe_device *xe = gt_to_xe(gt);
 	int ret;
 
 	huc->fw.type = XE_UC_FW_TYPE_HUC;

drivers/gpu/drm/xe/xe_huc.c static int huc_alloc_gsc_pkt(struct xe_huc *huc) int · line 79

Quoted 10 lines
drivers/gpu/drm/xe/xe_huc.c +7 -2
 
-	/* On platforms with a media GT the HuC is only available there */
-	if (tile->media_gt && (gt != tile->media_gt)) {
+	/*
+	 * The HuC is only available on the media GT on most platforms.  The
+	 * exception to that rule are the old Xe1 platforms where there was
+	 * no separate GT for media IP, so the HuC was part of the primary
+	 * GT.  Such platforms have graphics versions 12.55 and earlier.
+	 */
+	if (!xe_gt_is_media_type(gt) && GRAPHICS_VERx100(xe) > 1255) {

LGTM,

Quoted 6 lines
drivers/gpu/drm/xe/xe_huc.c +0 -1
 		xe_uc_fw_change_status(&huc->fw,
 XE_UC_FIRMWARE_NOT_SUPPORTED);
 		return 0;
 	}
--

2.51.0

Reviewed-by on v1 1/2
#3 lore raw

Re: [PATCH 1/2] drm/xe/huc: Adjust HuC check on primary GT

In reply to Matt Roper
Quoted 32 lines · Matt Roper

The HuC initialization code determines whether a platform can have a HuC on the primary GT by checking whether tile->media_gt is NULL; old Xe1 platforms that combined render+media into a single GT will always have a NULL media_gt pointer. However once we allow media to be disabled via configfs, there will also be cases where tile->media_gt is NULL on more modern platforms, causing this condition to behave incorrectly.

To handle cases where media gets disabled via configfs (or theoretical cases where media is truly fused off in hardware), change the condition to consider the graphics version of the primary GT; only the old Xe1 platforms with graphics versions 12.55 or earlier should try to initialize a HuC on the primary GT.

Cc Daniele Ceraolo Spurio <[email protected]>
---
  drivers/gpu/drm/xe/xe_huc.c | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/drm/xe/xe_huc.c +0 -1
index 7e43b2dd6a32..0a70c8924582 100644
@@ -66,14 +66,18 @@ static int huc_alloc_gsc_pkt(struct xe_huc *huc)
  int xe_huc_init(struct xe_huc *huc)
  {
  	struct xe_gt *gt = huc_to_gt(huc);
-	struct xe_tile *tile = gt_to_tile(gt);
  	struct xe_device *xe = gt_to_xe(gt);
  	int ret;
 
  	huc->fw.type = XE_UC_FW_TYPE_HUC;

drivers/gpu/drm/xe/xe_huc.c static int huc_alloc_gsc_pkt(struct xe_huc *huc) · line 80

Quoted 10 lines
drivers/gpu/drm/xe/xe_huc.c +7 -2
 
-	/* On platforms with a media GT the HuC is only available there */
-	if (tile->media_gt && (gt != tile->media_gt)) {
+	/*
+	 * The HuC is only available on the media GT on most platforms.  The
+	 * exception to that rule are the old Xe1 platforms where there was
+	 * no separate GT for media IP, so the HuC was part of the primary
+	 * GT.  Such platforms have graphics versions 12.55 and earlier.
+	 */
+	if (!xe_gt_is_media_type(gt) && GRAPHICS_VERx100(xe) > 1255) {

Since we can now match a FW definition to a specific GT in the FW table, we could change the HuC FW defs for MTL+ from GT_TYPE_ANY to GT_TYPE_MEDIA and just remove this check here entirely. Just a thought, not a blocker.

Daniele

Quoted 3 lines
drivers/gpu/drm/xe/xe_huc.c +0 -0
  		xe_uc_fw_change_status(&huc->fw, XE_UC_FIRMWARE_NOT_SUPPORTED);
  		return 0;
  	}
author
#4 lore raw

PATCH 2/2 drm/xe/configfs: Add attribute to disable GT types

In reply to Matt Roper

Preventing the driver from initializing GTs of specific type(s) can be useful for debugging and early hardware bringup. Add a configfs attribute to allow this kind of control for debugging.

With today's platforms and software design, this configuration setting is only effective for disabling the media GT since the driver currently requires that there always be a primary GT to probe the device. However this might change in the future --- in theory it should be possible (with some additional driver work) to allow an igpu device to come up with only the media GT and no primary GT. Or to allow an igpu device to come up with no GTs at all (for display-only usage). A primary GT will likely always be required on dgpu platforms because we rely on the BCS engines inside the primary GT for various vram operations.

---
 drivers/gpu/drm/xe/xe_configfs.c | 119 +++++++++++++++++++++++++++++++
 drivers/gpu/drm/xe/xe_configfs.h |   2 +
 drivers/gpu/drm/xe/xe_pci.c      |  18 +++++
 3 files changed, 139 insertions(+)
drivers/gpu/drm/xe/xe_configfs.c +119 -0
index e52808e3199f..c675994439d4 100644
@@ -13,6 +13,7 @@
 #include <linux/string.h>
 
 #include "xe_configfs.h"
+#include "xe_gt_types.h"
 #include "xe_hw_engine_types.h"
 #include "xe_module.h"
 #include "xe_pci_types.h"
@@ -54,6 +55,7 @@
  *	:
  *	└── 0000:03:00.0
  *	    ├── survivability_mode
+ *	    ├── gt_types_allowed
  *	    ├── engines_allowed
  *	    └── enable_psmi
  *
@@ -77,6 +79,40 @@
  *
  * This attribute can only be set before binding to the device.
  *
+ * Allowed GT types:
+ * -----------------
+ *
+ * Allow only specific types of GTs to be detected and initialized by the
+ * driver.  Any combination of GT types can be enabled/disabled, although
+ * some settings will cause the device to fail to probe.
+ *
+ * Examples:
+ *
+ * Allow both primary and media GTs to be initialized and used.  This matches
+ * the driver's default behavior::
+ *
+ *	# echo 'primary,media' > /sys/kernel/config/xe/0000:03:00.0/gt_types_allowed
+ *
+ * Allow only the primary GT of each tile to be initialized and used,
+ * effectively disabling the media GT if it exists on the platform::
+ *
+ *	# echo 'primary' > /sys/kernel/config/xe/0000:03:00.0/gt_types_allowed
+ *
+ * Allow only the media GT of each tile to be initialized and used,
+ * effectively disabling the primary GT.  **This configuration will cause
+ * device probe failure on all current platforms, but may be allowed on
+ * igpu platforms in the future**::
+ *
+ *	# echo 'media' > /sys/kernel/config/xe/0000:03:00.0/gt_types_allowed
+ *
+ * Disable all GTs.  Only other GPU IP (such as display) is potentially usable.
+ * **This configuration will cause device probe failure on all current
+ * platforms, but may be allowed on igpu platforms in the future**::
+ *
+ *	# echo '' > /sys/kernel/config/xe/0000:03:00.0/gt_types_allowed
+ *
+ * This attribute can only be set before binding to the device.
+ *
  * Allowed engines:
  * ----------------
  *
@@ -127,6 +163,7 @@ struct xe_config_group_device {
 	struct config_group group;
 
 	struct xe_config_device {
+		u64 gt_types_allowed;
 		u64 engines_allowed;
 		bool survivability_mode;
 		bool enable_psmi;
@@ -139,6 +176,7 @@ struct xe_config_group_device {
 };
 
 static const struct xe_config_device device_defaults = {
+	.gt_types_allowed = U64_MAX,
 	.engines_allowed = U64_MAX,
 	.survivability_mode = false,
 	.enable_psmi = false,
@@ -157,6 +195,7 @@ struct engine_info {
 /* Some helpful macros to aid on the sizing of buffer allocation when parsing */
 #define MAX_ENGINE_CLASS_CHARS 5
 #define MAX_ENGINE_INSTANCE_CHARS 2
+#define MAX_GT_TYPE_CHARS 7
 
 static const struct engine_info engine_info[] = {
 	{ .cls = "rcs", .mask = XE_HW_ENGINE_RCS_MASK },
@@ -167,6 +206,14 @@ static const struct engine_info engine_info[] = {
 	{ .cls = "gsccs", .mask = XE_HW_ENGINE_GSCCS_MASK },
 };
 
+static const struct {
+	const char *name;
+	u64 type;
+} gt_types[] = {
+	{ .name = "primary", .type = XE_GT_TYPE_MAIN },
+	{ .name = "media", .type = XE_GT_TYPE_MEDIA },
+};
+
 static struct xe_config_group_device *to_xe_config_group_device(struct config_item *item)
 {
 	return container_of(to_config_group(item), struct xe_config_group_device, group);
@@ -229,6 +276,55 @@ static ssize_t survivability_mode_store(struct config_item *item, const char *pa
 	return len;
 }
 
+static ssize_t gt_types_allowed_show(struct config_item *item, char *page)
+{
+	struct xe_config_device *dev = to_xe_config_device(item);
+	char *p = page;
+
+	for (size_t i = 0; i < ARRAY_SIZE(gt_types); i++)
+		if (dev->gt_types_allowed & BIT_ULL(gt_types[i].type))
+			p += sprintf(p, "%s\n", gt_types[i].name);
+
+	return p - page;
+}
+
+static ssize_t gt_types_allowed_store(struct config_item *item, const char *page,
+				      size_t len)
+{
+	struct xe_config_group_device *dev = to_xe_config_group_device(item);
+	const char *p = page;
+	u64 typemask = 0;
+
+	while (p < page + len) {
+		size_t typelen = strcspn(p, ",\n");
+		bool matched = false;
+
+		if (typelen > MAX_GT_TYPE_CHARS)
+			return -EINVAL;
+
+		for (size_t i = 0; i < ARRAY_SIZE(gt_types); i++) {
+			if (strncmp(p, gt_types[i].name, typelen) == 0) {
+				typemask |= BIT(gt_types[i].type);
+				matched = true;
+				break;
+			}
+		}
+
+		if (!matched)
+			return -EINVAL;
+
+		p += typelen + 1;
+	}
+
+	guard(mutex)(&dev->lock);
+	if (is_bound(dev))
+		return -EBUSY;
+
+	dev->config.gt_types_allowed = typemask;
+
+	return len;
+}
+
 static ssize_t engines_allowed_show(struct config_item *item, char *page)
 {
 	struct xe_config_device *dev = to_xe_config_device(item);
@@ -342,11 +438,13 @@ static ssize_t enable_psmi_store(struct config_item *item, const char *page, siz
 }
 
 CONFIGFS_ATTR(, enable_psmi);
+CONFIGFS_ATTR(, gt_types_allowed);
 CONFIGFS_ATTR(, engines_allowed);
 CONFIGFS_ATTR(, survivability_mode);
 
 static struct configfs_attribute *xe_config_device_attrs[] = {
 	&attr_enable_psmi,
+	&attr_gt_types_allowed,
 	&attr_engines_allowed,
 	&attr_survivability_mode,
 	NULL,
@@ -513,6 +611,7 @@ static void dump_custom_dev_config(struct pci_dev *pdev,
 				 dev->config.attr_); \
 	} while (0)
 
+	PRI_CUSTOM_ATTR("%llx", gt_types_allowed);
 	PRI_CUSTOM_ATTR("%llx", engines_allowed);
 	PRI_CUSTOM_ATTR("%d", enable_psmi);
 	PRI_CUSTOM_ATTR("%d", survivability_mode);
@@ -563,6 +662,26 @@ bool xe_configfs_get_survivability_mode(struct pci_dev *pdev)
 	return mode;
 }
 
+/**
+ * xe_configfs_get_gt_types_allowed - get GT type allowed mask from configfs
+ * @pdev: pci device
+ *
+ * Return: GT type mask set in configfs
+ */
+u64 xe_configfs_get_gt_types_allowed(struct pci_dev *pdev)
+{
+	struct xe_config_group_device *dev = find_xe_config_group_device(pdev);
+	u64 mask;
+
+	if (!dev)
+		return device_defaults.gt_types_allowed;
+
+	mask = dev->config.gt_types_allowed;
+	config_group_put(&dev->group);
+
+	return mask;
+}
+
 /**
  * xe_configfs_get_engines_allowed - get engine allowed mask from configfs
  * @pdev: pci device
drivers/gpu/drm/xe/xe_configfs.h +2 -0
index 1402e863b71c..eddb66201edf 100644
@@ -15,6 +15,7 @@ int xe_configfs_init(void);
 void xe_configfs_exit(void);
 void xe_configfs_check_device(struct pci_dev *pdev);
 bool xe_configfs_get_survivability_mode(struct pci_dev *pdev);
+u64 xe_configfs_get_gt_types_allowed(struct pci_dev *pdev);
 u64 xe_configfs_get_engines_allowed(struct pci_dev *pdev);
 bool xe_configfs_get_psmi_enabled(struct pci_dev *pdev);
 #else
@@ -22,6 +23,7 @@ static inline int xe_configfs_init(void) { return 0; }
 static inline void xe_configfs_exit(void) { }
 static inline void xe_configfs_check_device(struct pci_dev *pdev) { }
 static inline bool xe_configfs_get_survivability_mode(struct pci_dev *pdev) { return false; }
+static inline u64 xe_configfs_get_gt_types_allowed(struct pci_dev *pdev) { return U64_MAX; }
 static inline u64 xe_configfs_get_engines_allowed(struct pci_dev *pdev) { return U64_MAX; }
 static inline bool xe_configfs_get_psmi_enabled(struct pci_dev *pdev) { return false; }
 #endif
drivers/gpu/drm/xe/xe_pci.c +18 -0
index 77bee811a150..f065b8ea5673 100644
@@ -668,8 +668,21 @@ static int xe_info_init(struct xe_device *xe,
 	const struct xe_media_desc *media_desc;
 	struct xe_tile *tile;
 	struct xe_gt *gt;
+	u64 gt_types_allowed;
 	u8 id;
 
+	/*
+	 * It's not currently possible to probe a device with the primary
+	 * GT disabled.  With some work, this may be future in the possible
+	 * for igpu platforms (although probably not for dgpu's since access
+	 * to the primary GT's BCS engines is required for VRAM management).
+	 */
+	gt_types_allowed = xe_configfs_get_gt_types_allowed(to_pci_dev(xe->drm.dev));
+	if ((gt_types_allowed & BIT_ULL(XE_GT_TYPE_MAIN)) == 0) {
+		drm_err(&xe->drm, "Cannot probe device with primary GT disabled via configfs\n");
+		return -ENODEV;
+	}
+
 	/*
 	 * If this platform supports GMD_ID, we'll detect the proper IP
 	 * descriptor to use from hardware registers.
@@ -761,6 +774,11 @@ static int xe_info_init(struct xe_device *xe,
 		if (MEDIA_VER(xe) < 13 || !media_desc)
 			continue;
 
+		if ((gt_types_allowed & BIT_ULL(XE_GT_TYPE_MEDIA)) == 0) {
+			drm_info(&xe->drm, "Media GT disabled via configfs\n");
+			continue;
+		}
+
 		/*
 		 * Allocate and setup media GT for platforms with standalone
 		 * media.
Signature · 1 line
2.51.0
#5 lore raw

Re: [PATCH 2/2] drm/xe/configfs: Add attribute to disable GT types

Quoting Matt Roper (2025-09-18 18:13:19-03:00)

Quoted 42 lines

Preventing the driver from initializing GTs of specific type(s) can be useful for debugging and early hardware bringup. Add a configfs attribute to allow this kind of control for debugging.

With today's platforms and software design, this configuration setting is only effective for disabling the media GT since the driver currently requires that there always be a primary GT to probe the device. However this might change in the future --- in theory it should be possible (with some additional driver work) to allow an igpu device to come up with only the media GT and no primary GT. Or to allow an igpu device to come up with no GTs at all (for display-only usage). A primary GT will likely always be required on dgpu platforms because we rely on the BCS engines inside the primary GT for various vram operations.

---

drivers/gpu/drm/xe/xe_configfs.c | 119 +++++++++++++++++++++++++++++++
drivers/gpu/drm/xe/xe_configfs.h |   2 +
drivers/gpu/drm/xe/xe_pci.c      |  18 +++++
3 files changed, 139 insertions(+)
drivers/gpu/drm/xe/xe_configfs.c +2 -0
index e52808e3199f..c675994439d4 100644
@@ -13,6 +13,7 @@
 #include <linux/string.h>
 
 #include "xe_configfs.h"
+#include "xe_gt_types.h"
 #include "xe_hw_engine_types.h"
 #include "xe_module.h"
 #include "xe_pci_types.h"
@@ -54,6 +55,7 @@
 *        :
 *        └── 0000:03:00.0
 *            ├── survivability_mode
+ *            ├── gt_types_allowed
 *            ├── engines_allowed
 *            └── enable_psmi
 *

drivers/gpu/drm/xe/xe_configfs.c line 87

Quoted 9 lines
drivers/gpu/drm/xe/xe_configfs.c +6 -0
@@ -77,6 +79,40 @@
 *
 * This attribute can only be set before binding to the device.
 *
+ * Allowed GT types:
+ * -----------------
+ *
+ * Allow only specific types of GTs to be detected and initialized by the
+ * driver.  Any combination of GT types can be enabled/disabled, although
+ * some settings will cause the device to fail to probe.

I think it would be nice to have a short description of input/output formats. Something like:

Writes support both comma- and newline-separated input format. Reads will always return one GT type per line. The supported GT types are primary and media.

Quoted 17 lines
drivers/gpu/drm/xe/xe_configfs.c +17 -0
+ *
+ * Examples:
+ *
+ * Allow both primary and media GTs to be initialized and used.  This matches
+ * the driver's default behavior::
+ *
+ *        # echo 'primary,media' > /sys/kernel/config/xe/0000:03:00.0/gt_types_allowed
+ *
+ * Allow only the primary GT of each tile to be initialized and used,
+ * effectively disabling the media GT if it exists on the platform::
+ *
+ *        # echo 'primary' > /sys/kernel/config/xe/0000:03:00.0/gt_types_allowed
+ *
+ * Allow only the media GT of each tile to be initialized and used,
+ * effectively disabling the primary GT.  **This configuration will cause
+ * device probe failure on all current platforms, but may be allowed on
+ * igpu platforms in the future**::

drivers/gpu/drm/xe/xe_configfs.c line 114

Quoted 10 lines
drivers/gpu/drm/xe/xe_configfs.c +10 -0
+ *
+ *        # echo 'media' > /sys/kernel/config/xe/0000:03:00.0/gt_types_allowed
+ *
+ * Disable all GTs.  Only other GPU IP (such as display) is potentially usable.
+ * **This configuration will cause device probe failure on all current
+ * platforms, but may be allowed on igpu platforms in the future**::
+ *
+ *        # echo '' > /sys/kernel/config/xe/0000:03:00.0/gt_types_allowed
+ *
+ * This attribute can only be set before binding to the device.

I think this line could appear before the examples.

Quoted 29 lines
drivers/gpu/drm/xe/xe_configfs.c +4 -0
+ *
 * Allowed engines:
 * ----------------
 *
@@ -127,6 +163,7 @@ struct xe_config_group_device {
        struct config_group group;
 
        struct xe_config_device {
+                u64 gt_types_allowed;
                u64 engines_allowed;
                bool survivability_mode;
                bool enable_psmi;
@@ -139,6 +176,7 @@ struct xe_config_group_device {
 };
 
 static const struct xe_config_device device_defaults = {
+        .gt_types_allowed = U64_MAX,
        .engines_allowed = U64_MAX,
        .survivability_mode = false,
        .enable_psmi = false,
@@ -157,6 +195,7 @@ struct engine_info {
 /* Some helpful macros to aid on the sizing of buffer allocation when parsing */
 #define MAX_ENGINE_CLASS_CHARS 5
 #define MAX_ENGINE_INSTANCE_CHARS 2
+#define MAX_GT_TYPE_CHARS 7
 
 static const struct engine_info engine_info[] = {
        { .cls = "rcs", .mask = XE_HW_ENGINE_RCS_MASK },

drivers/gpu/drm/xe/xe_configfs.c static const struct engine_info engine_info[] = { · line 210

Quoted 5 lines
drivers/gpu/drm/xe/xe_configfs.c +2 -0
@@ -167,6 +206,14 @@ static const struct engine_info engine_info[] = {
        { .cls = "gsccs", .mask = XE_HW_ENGINE_GSCCS_MASK },
 };
 
+static const struct {
+        const char *name;

I wonder if it would be good to use name[MAX_GT_TYPE_CHARS + 1] here. That way we get warnings if the strings don't match the expectation.

drivers/gpu/drm/xe/xe_configfs.c static const struct engine_info engine_info[] = { · line 211

Quoted 1 line
drivers/gpu/drm/xe/xe_configfs.c +1 -0
+        u64 type;

Hm... I would have gone with the enum type here. Any specific reason we chose u64 here?

Quoted 30 lines
drivers/gpu/drm/xe/xe_configfs.c +23 -0
+} gt_types[] = {
+        { .name = "primary", .type = XE_GT_TYPE_MAIN },
+        { .name = "media", .type = XE_GT_TYPE_MEDIA },
+};
+
 static struct xe_config_group_device *to_xe_config_group_device(struct config_item *item)
 {
        return container_of(to_config_group(item), struct xe_config_group_device, group);
@@ -229,6 +276,55 @@ static ssize_t survivability_mode_store(struct config_item *item, const char *pa
        return len;
 }
 
+static ssize_t gt_types_allowed_show(struct config_item *item, char *page)
+{
+        struct xe_config_device *dev = to_xe_config_device(item);
+        char *p = page;
+
+        for (size_t i = 0; i < ARRAY_SIZE(gt_types); i++)
+                if (dev->gt_types_allowed & BIT_ULL(gt_types[i].type))
+                        p += sprintf(p, "%s\n", gt_types[i].name);
+
+        return p - page;
+}
+
+static ssize_t gt_types_allowed_store(struct config_item *item, const char *page,
+                                      size_t len)
+{
+        struct xe_config_group_device *dev = to_xe_config_group_device(item);
+        const char *p = page;
+        u64 typemask = 0;

drivers/gpu/drm/xe/xe_configfs.c static ssize_t survivability_mode_store(struct config_item *item, const char *pa · line 306

Quoted 10 lines
drivers/gpu/drm/xe/xe_configfs.c +10 -0
+
+        while (p < page + len) {
+                size_t typelen = strcspn(p, ",\n");
+                bool matched = false;
+
+                if (typelen > MAX_GT_TYPE_CHARS)
+                        return -EINVAL;
+
+                for (size_t i = 0; i < ARRAY_SIZE(gt_types); i++) {
+                        if (strncmp(p, gt_types[i].name, typelen) == 0) {

I think we are allowing values like "pri", "me" etc in p to match gt_types[i].name here. Is that intentional?

Quoted 120 lines
drivers/gpu/drm/xe/xe_configfs.c +44 -0
+                                typemask |= BIT(gt_types[i].type);
+                                matched = true;
+                                break;
+                        }
+                }
+
+                if (!matched)
+                        return -EINVAL;
+
+                p += typelen + 1;
+        }
+
+        guard(mutex)(&dev->lock);
+        if (is_bound(dev))
+                return -EBUSY;
+
+        dev->config.gt_types_allowed = typemask;
+
+        return len;
+}
+
 static ssize_t engines_allowed_show(struct config_item *item, char *page)
 {
        struct xe_config_device *dev = to_xe_config_device(item);
@@ -342,11 +438,13 @@ static ssize_t enable_psmi_store(struct config_item *item, const char *page, siz
 }
 
 CONFIGFS_ATTR(, enable_psmi);
+CONFIGFS_ATTR(, gt_types_allowed);
 CONFIGFS_ATTR(, engines_allowed);
 CONFIGFS_ATTR(, survivability_mode);
 
 static struct configfs_attribute *xe_config_device_attrs[] = {
        &attr_enable_psmi,
+        &attr_gt_types_allowed,
        &attr_engines_allowed,
        &attr_survivability_mode,
        NULL,
@@ -513,6 +611,7 @@ static void dump_custom_dev_config(struct pci_dev *pdev,
                                 dev->config.attr_); \
        } while (0)
 
+        PRI_CUSTOM_ATTR("%llx", gt_types_allowed);
        PRI_CUSTOM_ATTR("%llx", engines_allowed);
        PRI_CUSTOM_ATTR("%d", enable_psmi);
        PRI_CUSTOM_ATTR("%d", survivability_mode);
@@ -563,6 +662,26 @@ bool xe_configfs_get_survivability_mode(struct pci_dev *pdev)
        return mode;
 }
 
+/**
+ * xe_configfs_get_gt_types_allowed - get GT type allowed mask from configfs
+ * @pdev: pci device
+ *
+ * Return: GT type mask set in configfs
+ */
+u64 xe_configfs_get_gt_types_allowed(struct pci_dev *pdev)
+{
+        struct xe_config_group_device *dev = find_xe_config_group_device(pdev);
+        u64 mask;
+
+        if (!dev)
+                return device_defaults.gt_types_allowed;
+
+        mask = dev->config.gt_types_allowed;
+        config_group_put(&dev->group);
+
+        return mask;
+}
+
 /**
 * xe_configfs_get_engines_allowed - get engine allowed mask from configfs
 * @pdev: pci device
drivers/gpu/drm/xe/xe_configfs.h +2 -0
index 1402e863b71c..eddb66201edf 100644
@@ -15,6 +15,7 @@ int xe_configfs_init(void);
 void xe_configfs_exit(void);
 void xe_configfs_check_device(struct pci_dev *pdev);
 bool xe_configfs_get_survivability_mode(struct pci_dev *pdev);
+u64 xe_configfs_get_gt_types_allowed(struct pci_dev *pdev);
 u64 xe_configfs_get_engines_allowed(struct pci_dev *pdev);
 bool xe_configfs_get_psmi_enabled(struct pci_dev *pdev);
 #else
@@ -22,6 +23,7 @@ static inline int xe_configfs_init(void) { return 0; }
 static inline void xe_configfs_exit(void) { }
 static inline void xe_configfs_check_device(struct pci_dev *pdev) { }
 static inline bool xe_configfs_get_survivability_mode(struct pci_dev *pdev) { return false; }
+static inline u64 xe_configfs_get_gt_types_allowed(struct pci_dev *pdev) { return U64_MAX; }
 static inline u64 xe_configfs_get_engines_allowed(struct pci_dev *pdev) { return U64_MAX; }
 static inline bool xe_configfs_get_psmi_enabled(struct pci_dev *pdev) { return false; }
 #endif
drivers/gpu/drm/xe/xe_pci.c +13 -0
index 77bee811a150..f065b8ea5673 100644
@@ -668,8 +668,21 @@ static int xe_info_init(struct xe_device *xe,
        const struct xe_media_desc *media_desc;
        struct xe_tile *tile;
        struct xe_gt *gt;
+        u64 gt_types_allowed;
        u8 id;
 
+        /*
+         * It's not currently possible to probe a device with the primary
+         * GT disabled.  With some work, this may be future in the possible
+         * for igpu platforms (although probably not for dgpu's since access
+         * to the primary GT's BCS engines is required for VRAM management).
+         */
+        gt_types_allowed = xe_configfs_get_gt_types_allowed(to_pci_dev(xe->drm.dev));
+        if ((gt_types_allowed & BIT_ULL(XE_GT_TYPE_MAIN)) == 0) {
+                drm_err(&xe->drm, "Cannot probe device with primary GT disabled via configfs\n");
+                return -ENODEV;
+        }
+
        /*
         * If this platform supports GMD_ID, we'll detect the proper IP
         * descriptor to use from hardware registers.

drivers/gpu/drm/xe/xe_pci.c static int xe_info_init(struct xe_device *xe, · line 781

Quoted 8 lines
drivers/gpu/drm/xe/xe_pci.c +5 -0
@@ -761,6 +774,11 @@ static int xe_info_init(struct xe_device *xe,
                if (MEDIA_VER(xe) < 13 || !media_desc)
                        continue;
 
+                if ((gt_types_allowed & BIT_ULL(XE_GT_TYPE_MEDIA)) == 0) {
+                        drm_info(&xe->drm, "Media GT disabled via configfs\n");
+                        continue;
+                }
+

Shouldn't we do this before updating gt->info.engine_mask (where gt is the primary GT)?

--
Gustavo Sousa

Quoted 6 lines
drivers/gpu/drm/xe/xe_pci.c +0 -0
                /*
                 * Allocate and setup media GT for platforms with standalone
                 * media.
Signature · 1 line
2.51.0
maintainer
#6 lore raw

Re: [PATCH 2/2] drm/xe/configfs: Add attribute to disable GT types

In reply to Matt Roper
Quoted 4 lines · Matt Roper

Preventing the driver from initializing GTs of specific type(s) can be useful for debugging and early hardware bringup. Add a configfs attribute to allow this kind of control for debugging.

Quoted 8 lines

With today's platforms and software design, this configuration setting is only effective for disabling the media GT since the driver currently requires that there always be a primary GT to probe the device. However this might change in the future --- in theory it should be possible (with some additional driver work) to allow an igpu device to come up with only the media GT and no primary GT. Or to allow an igpu device to come up with no GTs at all (for display-only usage). A primary GT will likely always be required on dgpu platforms because we rely on the BCS

iGPU uses BCS for clears and VM binds (currently, may drop for a pure CPU implementation). So a few more road blocks here.

Matt

Quoted 275 lines

engines inside the primary GT for various vram operations.

---
 drivers/gpu/drm/xe/xe_configfs.c | 119 +++++++++++++++++++++++++++++++
 drivers/gpu/drm/xe/xe_configfs.h |   2 +
 drivers/gpu/drm/xe/xe_pci.c      |  18 +++++
 3 files changed, 139 insertions(+)
drivers/gpu/drm/xe/xe_configfs.c +119 -0
index e52808e3199f..c675994439d4 100644
@@ -13,6 +13,7 @@
 #include <linux/string.h>
 
 #include "xe_configfs.h"
+#include "xe_gt_types.h"
 #include "xe_hw_engine_types.h"
 #include "xe_module.h"
 #include "xe_pci_types.h"
@@ -54,6 +55,7 @@
  *	:
  *	└── 0000:03:00.0
  *	    ├── survivability_mode
+ *	    ├── gt_types_allowed
  *	    ├── engines_allowed
  *	    └── enable_psmi
  *
@@ -77,6 +79,40 @@
  *
  * This attribute can only be set before binding to the device.
  *
+ * Allowed GT types:
+ * -----------------
+ *
+ * Allow only specific types of GTs to be detected and initialized by the
+ * driver.  Any combination of GT types can be enabled/disabled, although
+ * some settings will cause the device to fail to probe.
+ *
+ * Examples:
+ *
+ * Allow both primary and media GTs to be initialized and used.  This matches
+ * the driver's default behavior::
+ *
+ *	# echo 'primary,media' > /sys/kernel/config/xe/0000:03:00.0/gt_types_allowed
+ *
+ * Allow only the primary GT of each tile to be initialized and used,
+ * effectively disabling the media GT if it exists on the platform::
+ *
+ *	# echo 'primary' > /sys/kernel/config/xe/0000:03:00.0/gt_types_allowed
+ *
+ * Allow only the media GT of each tile to be initialized and used,
+ * effectively disabling the primary GT.  **This configuration will cause
+ * device probe failure on all current platforms, but may be allowed on
+ * igpu platforms in the future**::
+ *
+ *	# echo 'media' > /sys/kernel/config/xe/0000:03:00.0/gt_types_allowed
+ *
+ * Disable all GTs.  Only other GPU IP (such as display) is potentially usable.
+ * **This configuration will cause device probe failure on all current
+ * platforms, but may be allowed on igpu platforms in the future**::
+ *
+ *	# echo '' > /sys/kernel/config/xe/0000:03:00.0/gt_types_allowed
+ *
+ * This attribute can only be set before binding to the device.
+ *
  * Allowed engines:
  * ----------------
  *
@@ -127,6 +163,7 @@ struct xe_config_group_device {
 	struct config_group group;
 
 	struct xe_config_device {
+		u64 gt_types_allowed;
 		u64 engines_allowed;
 		bool survivability_mode;
 		bool enable_psmi;
@@ -139,6 +176,7 @@ struct xe_config_group_device {
 };
 
 static const struct xe_config_device device_defaults = {
+	.gt_types_allowed = U64_MAX,
 	.engines_allowed = U64_MAX,
 	.survivability_mode = false,
 	.enable_psmi = false,
@@ -157,6 +195,7 @@ struct engine_info {
 /* Some helpful macros to aid on the sizing of buffer allocation when parsing */
 #define MAX_ENGINE_CLASS_CHARS 5
 #define MAX_ENGINE_INSTANCE_CHARS 2
+#define MAX_GT_TYPE_CHARS 7
 
 static const struct engine_info engine_info[] = {
 	{ .cls = "rcs", .mask = XE_HW_ENGINE_RCS_MASK },
@@ -167,6 +206,14 @@ static const struct engine_info engine_info[] = {
 	{ .cls = "gsccs", .mask = XE_HW_ENGINE_GSCCS_MASK },
 };
 
+static const struct {
+	const char *name;
+	u64 type;
+} gt_types[] = {
+	{ .name = "primary", .type = XE_GT_TYPE_MAIN },
+	{ .name = "media", .type = XE_GT_TYPE_MEDIA },
+};
+
 static struct xe_config_group_device *to_xe_config_group_device(struct config_item *item)
 {
 	return container_of(to_config_group(item), struct xe_config_group_device, group);
@@ -229,6 +276,55 @@ static ssize_t survivability_mode_store(struct config_item *item, const char *pa
 	return len;
 }
 
+static ssize_t gt_types_allowed_show(struct config_item *item, char *page)
+{
+	struct xe_config_device *dev = to_xe_config_device(item);
+	char *p = page;
+
+	for (size_t i = 0; i < ARRAY_SIZE(gt_types); i++)
+		if (dev->gt_types_allowed & BIT_ULL(gt_types[i].type))
+			p += sprintf(p, "%s\n", gt_types[i].name);
+
+	return p - page;
+}
+
+static ssize_t gt_types_allowed_store(struct config_item *item, const char *page,
+				      size_t len)
+{
+	struct xe_config_group_device *dev = to_xe_config_group_device(item);
+	const char *p = page;
+	u64 typemask = 0;
+
+	while (p < page + len) {
+		size_t typelen = strcspn(p, ",\n");
+		bool matched = false;
+
+		if (typelen > MAX_GT_TYPE_CHARS)
+			return -EINVAL;
+
+		for (size_t i = 0; i < ARRAY_SIZE(gt_types); i++) {
+			if (strncmp(p, gt_types[i].name, typelen) == 0) {
+				typemask |= BIT(gt_types[i].type);
+				matched = true;
+				break;
+			}
+		}
+
+		if (!matched)
+			return -EINVAL;
+
+		p += typelen + 1;
+	}
+
+	guard(mutex)(&dev->lock);
+	if (is_bound(dev))
+		return -EBUSY;
+
+	dev->config.gt_types_allowed = typemask;
+
+	return len;
+}
+
 static ssize_t engines_allowed_show(struct config_item *item, char *page)
 {
 	struct xe_config_device *dev = to_xe_config_device(item);
@@ -342,11 +438,13 @@ static ssize_t enable_psmi_store(struct config_item *item, const char *page, siz
 }
 
 CONFIGFS_ATTR(, enable_psmi);
+CONFIGFS_ATTR(, gt_types_allowed);
 CONFIGFS_ATTR(, engines_allowed);
 CONFIGFS_ATTR(, survivability_mode);
 
 static struct configfs_attribute *xe_config_device_attrs[] = {
 	&attr_enable_psmi,
+	&attr_gt_types_allowed,
 	&attr_engines_allowed,
 	&attr_survivability_mode,
 	NULL,
@@ -513,6 +611,7 @@ static void dump_custom_dev_config(struct pci_dev *pdev,
 				 dev->config.attr_); \
 	} while (0)
 
+	PRI_CUSTOM_ATTR("%llx", gt_types_allowed);
 	PRI_CUSTOM_ATTR("%llx", engines_allowed);
 	PRI_CUSTOM_ATTR("%d", enable_psmi);
 	PRI_CUSTOM_ATTR("%d", survivability_mode);
@@ -563,6 +662,26 @@ bool xe_configfs_get_survivability_mode(struct pci_dev *pdev)
 	return mode;
 }
 
+/**
+ * xe_configfs_get_gt_types_allowed - get GT type allowed mask from configfs
+ * @pdev: pci device
+ *
+ * Return: GT type mask set in configfs
+ */
+u64 xe_configfs_get_gt_types_allowed(struct pci_dev *pdev)
+{
+	struct xe_config_group_device *dev = find_xe_config_group_device(pdev);
+	u64 mask;
+
+	if (!dev)
+		return device_defaults.gt_types_allowed;
+
+	mask = dev->config.gt_types_allowed;
+	config_group_put(&dev->group);
+
+	return mask;
+}
+
 /**
  * xe_configfs_get_engines_allowed - get engine allowed mask from configfs
  * @pdev: pci device
drivers/gpu/drm/xe/xe_configfs.h +2 -0
index 1402e863b71c..eddb66201edf 100644
@@ -15,6 +15,7 @@ int xe_configfs_init(void);
 void xe_configfs_exit(void);
 void xe_configfs_check_device(struct pci_dev *pdev);
 bool xe_configfs_get_survivability_mode(struct pci_dev *pdev);
+u64 xe_configfs_get_gt_types_allowed(struct pci_dev *pdev);
 u64 xe_configfs_get_engines_allowed(struct pci_dev *pdev);
 bool xe_configfs_get_psmi_enabled(struct pci_dev *pdev);
 #else
@@ -22,6 +23,7 @@ static inline int xe_configfs_init(void) { return 0; }
 static inline void xe_configfs_exit(void) { }
 static inline void xe_configfs_check_device(struct pci_dev *pdev) { }
 static inline bool xe_configfs_get_survivability_mode(struct pci_dev *pdev) { return false; }
+static inline u64 xe_configfs_get_gt_types_allowed(struct pci_dev *pdev) { return U64_MAX; }
 static inline u64 xe_configfs_get_engines_allowed(struct pci_dev *pdev) { return U64_MAX; }
 static inline bool xe_configfs_get_psmi_enabled(struct pci_dev *pdev) { return false; }
 #endif
drivers/gpu/drm/xe/xe_pci.c +18 -0
index 77bee811a150..f065b8ea5673 100644
@@ -668,8 +668,21 @@ static int xe_info_init(struct xe_device *xe,
 	const struct xe_media_desc *media_desc;
 	struct xe_tile *tile;
 	struct xe_gt *gt;
+	u64 gt_types_allowed;
 	u8 id;
 
+	/*
+	 * It's not currently possible to probe a device with the primary
+	 * GT disabled.  With some work, this may be future in the possible
+	 * for igpu platforms (although probably not for dgpu's since access
+	 * to the primary GT's BCS engines is required for VRAM management).
+	 */
+	gt_types_allowed = xe_configfs_get_gt_types_allowed(to_pci_dev(xe->drm.dev));
+	if ((gt_types_allowed & BIT_ULL(XE_GT_TYPE_MAIN)) == 0) {
+		drm_err(&xe->drm, "Cannot probe device with primary GT disabled via configfs\n");
+		return -ENODEV;
+	}
+
 	/*
 	 * If this platform supports GMD_ID, we'll detect the proper IP
 	 * descriptor to use from hardware registers.
@@ -761,6 +774,11 @@ static int xe_info_init(struct xe_device *xe,
 		if (MEDIA_VER(xe) < 13 || !media_desc)
 			continue;
 
+		if ((gt_types_allowed & BIT_ULL(XE_GT_TYPE_MEDIA)) == 0) {
+			drm_info(&xe->drm, "Media GT disabled via configfs\n");
+			continue;
+		}
+
 		/*
 		 * Allocate and setup media GT for platforms with standalone
 		 * media.
Signature · 1 line
2.51.0