---

yaml --- r: 307569 b: refs/heads/master c: 2f3787a h: refs/heads/master i: 307567: 7de4552 v: v3
git-mirror · May 24, 2012 · 3f2398f · 3f2398f
1 parent 3a1d9b4
commit 3f2398f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42eddbd7b2b5cc9bbb4c918a3294b6ee9dd53c59
+refs/heads/master: 2f3787aa439ae0d34e4658400c1139a7541bec1d
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_acpi.c b/trunk/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 */