[PATCH 1/4] Revert "drm/xe: Enable SR-IOV for ADL/ATSM"

[Michal Wajdeczko]

This reverts commit bbd6af134c0cf7934985fe2b4a5841f91760d61b.
This commit is from CI-topic branch and will be applied again.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
---
 drivers/gpu/drm/xe/xe_module.c | 10 +---------
 drivers/gpu/drm/xe/xe_pci.c    |  4 ----
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_module.c b/drivers/gpu/drm/xe/xe_module.c
index 064093bf1adc..107ffe87808c 100644
--- a/drivers/gpu/drm/xe/xe_module.c
+++ b/drivers/gpu/drm/xe/xe_module.c
@@ -20,12 +20,8 @@
 
 #if IS_ENABLED(CONFIG_DRM_XE_DEBUG)
 #define DEFAULT_GUC_LOG_LEVEL		3
-#define DEFAULT_MAX_VFS			~0
-#define DEFAULT_MAX_VFS_STR		"unlimited"
 #else
 #define DEFAULT_GUC_LOG_LEVEL		1
-#define DEFAULT_MAX_VFS			0
-#define DEFAULT_MAX_VFS_STR		__stringify(DEFAULT_MAX_VFS)
 #endif
 
 #define DEFAULT_PROBE_DISPLAY		true
@@ -38,9 +34,6 @@ struct xe_modparam xe_modparam = {
 	.probe_display =	DEFAULT_PROBE_DISPLAY,
 	.guc_log_level =	DEFAULT_GUC_LOG_LEVEL,
 	.force_probe =		DEFAULT_FORCE_PROBE,
-#ifdef CONFIG_PCI_IOV
-	.max_vfs =		DEFAULT_MAX_VFS,
-#endif
 	.wedged_mode =		DEFAULT_WEDGED_MODE,
 	.svm_notifier_size =	DEFAULT_SVM_NOTIFIER_SIZE,
 	/* the rest are 0 by default */
@@ -86,8 +79,7 @@ MODULE_PARM_DESC(force_probe,
 module_param_named(max_vfs, xe_modparam.max_vfs, uint, 0400);
 MODULE_PARM_DESC(max_vfs,
 		 "Limit number of Virtual Functions (VFs) that could be managed. "
-		 "(0=no VFs; N=allow up to N VFs "
-		 "[default=" DEFAULT_MAX_VFS_STR "])");
+		 "(0 = no VFs [default]; N = allow up to N VFs)");
 #endif
 
 module_param_named_unsafe(wedged_mode, xe_modparam.wedged_mode, int, 0600);
diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
index dc4c8e861a84..53d45779cbe9 100644
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@ -193,7 +193,6 @@ static const struct xe_device_desc adl_s_desc = {
 	.dma_mask_size = 39,
 	.has_display = true,
 	.has_llc = true,
-	.has_sriov = IS_ENABLED(CONFIG_DRM_XE_DEBUG),
 	.max_gt_per_tile = 1,
 	.require_force_probe = true,
 	.subplatforms = (const struct xe_subplatform_desc[]) {
@@ -211,7 +210,6 @@ static const struct xe_device_desc adl_p_desc = {
 	.dma_mask_size = 39,
 	.has_display = true,
 	.has_llc = true,
-	.has_sriov = IS_ENABLED(CONFIG_DRM_XE_DEBUG),
 	.max_gt_per_tile = 1,
 	.require_force_probe = true,
 	.subplatforms = (const struct xe_subplatform_desc[]) {
@@ -227,7 +225,6 @@ static const struct xe_device_desc adl_n_desc = {
 	.dma_mask_size = 39,
 	.has_display = true,
 	.has_llc = true,
-	.has_sriov = IS_ENABLED(CONFIG_DRM_XE_DEBUG),
 	.max_gt_per_tile = 1,
 	.require_force_probe = true,
 };
@@ -273,7 +270,6 @@ static const struct xe_device_desc ats_m_desc = {
 
 	DG2_FEATURES,
 	.has_display = false,
-	.has_sriov = IS_ENABLED(CONFIG_DRM_XE_DEBUG),
 };
 
 static const struct xe_device_desc dg2_desc = {
-- 
2.47.1