From 3f2398f611bffc4bfc356ea0d3976065a3c3d6c5 Mon Sep 17 00:00:00 2001 From: Andreas Heider Date: Mon, 21 May 2012 00:14:50 +0100 Subject: [PATCH] --- yaml --- r: 307569 b: refs/heads/master c: 2f3787aa439ae0d34e4658400c1139a7541bec1d h: refs/heads/master i: 307567: 7de455206a7e326db05bf9321c005965ec452ca4 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_acpi.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dfff254900ca..a99cd0ee4856 100644 --- 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 index 284bd25d5d21..fc841e87b343 100644 --- 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 */