Skip to contentSkip to conversation

drm/amd/amdgpu: Add modeset module parameter support

PATCH In review Zhen Ni 2 participants 2 messages Aug 29, 2022

Subsystems (2)
lore
Share & tools
lore

Zhen Ni

author
#0 lore raw

PATCH 1/1 drm/amd/amdgpu: Add modeset module parameter support

Nomodeset kernel parameter is for all graphics cards. Amdgpu cannot be set separately in some scenarios, such as hybrid graphics(i + a). Add modeset module parameter for amdgpu to set kernel mode separately.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +12 -1
index 429fcdf28836..856a70370e3c 100644
@@ -107,6 +107,7 @@
 #define KMS_DRIVER_MINOR	48
 #define KMS_DRIVER_PATCHLEVEL	0
 
+int amdgpu_modeset = -1;
 int amdgpu_vram_limit;
 int amdgpu_vis_vram_limit;
 int amdgpu_gart_size = -1; /* auto */
@@ -199,6 +200,13 @@ struct amdgpu_watchdog_timer amdgpu_watchdog_timer = {
 	.period = 0x0, /* default to 0x0 (timeout disable) */
 };
 
+/**
+ * DOC: modeset (int)
+ * Disable/Enable kernel modesetting (1 = enable, 0 = disable, -1 = auto (default)).
+ */
+MODULE_PARM_DESC(modeset, "Disable/Enable kernel modesetting");
+module_param_named(modeset, amdgpu_modeset, int, 0400);
+
 /**
  * DOC: vramlimit (int)
  * Restrict the total amount of VRAM in MiB for testing.  The default is 0 (Use full VRAM).
@@ -2753,7 +2761,10 @@ static int __init amdgpu_init(void)
 {
 	int r;
 
-	if (drm_firmware_drivers_only())
+	if (drm_firmware_drivers_only() && amdgpu_modeset == -1)
+		amdgpu_modeset = 0;
+
+	if (amdgpu_modeset == 0)
 		return -EINVAL;
 
 	r = amdgpu_sync_init();
Signature · 1 line
2.20.1
#1 lore raw
Quoted 6 lines · Zhen Ni

Nomodeset kernel parameter is for all graphics cards. Amdgpu cannot be set separately in some scenarios, such as hybrid graphics(i + a). Add modeset module parameter for amdgpu to set kernel mode separately.

amdgpu didn't support this option since it never supported the legacy drm mode that other older drivers did. If you just want the option to keep the driver from loading, you can already do this by blacklisting the driver. E.g.,
modprobe.blacklist=amdgpu

Alex

Quoted 45 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +12 -2
index 429fcdf28836..856a70370e3c 100644
@@ -107,6 +107,7 @@
 #define KMS_DRIVER_MINOR       48
 #define KMS_DRIVER_PATCHLEVEL  0
 
+int amdgpu_modeset = -1;
 int amdgpu_vram_limit;
 int amdgpu_vis_vram_limit;
 int amdgpu_gart_size = -1; /* auto */
@@ -199,6 +200,13 @@ struct amdgpu_watchdog_timer amdgpu_watchdog_timer = {
        .period = 0x0, /* default to 0x0 (timeout disable) */
 };
 
+/**
+ * DOC: modeset (int)
+ * Disable/Enable kernel modesetting (1 = enable, 0 = disable, -1 = auto (default)).
+ */
+MODULE_PARM_DESC(modeset, "Disable/Enable kernel modesetting");
+module_param_named(modeset, amdgpu_modeset, int, 0400);
+
 /**
  * DOC: vramlimit (int)
  * Restrict the total amount of VRAM in MiB for testing.  The default is 0 (Use full VRAM).
@@ -2753,7 +2761,10 @@ static int __init amdgpu_init(void)
 {
        int r;
 
-       if (drm_firmware_drivers_only())
+       if (drm_firmware_drivers_only() && amdgpu_modeset == -1)
+               amdgpu_modeset = 0;
+
+       if (amdgpu_modeset == 0)
                return -EINVAL;
 
        r = amdgpu_sync_init();
--

2.20.1