1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
index 284bd25d5d21..fc841e87b343 100644
--- a/drivers/gpu/drm/nouveau/nouveau_acpi.c
+++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
@@ -338,7 +338,8 @@ void nouveau_switcheroo_optimus_dsm(void)
 
 void nouveau_unregister_dsm_handler(void)
 {
-        vga_switcheroo_unregister_handler();
+        if (nouveau_dsm_priv.optimus_detected || nouveau_dsm_priv.dsm_detected)
+                vga_switcheroo_unregister_handler();
 }
 
 /* retrieve the ROM in 4k blocks */