Skip to content

Commit

Permalink
drm/nouveau: Check dsm on switcheroo unregister
Browse files Browse the repository at this point in the history
Currently vga_switcheroo_unregister_handler is called unconditionally when
nouveau is unloaded, even when nouveau never registered a handler. This
interferes with other switcheroo handlers, as vga_switcheroo doesn't check who
called unregister_handler, but simply unregisters the current handler. This
patch adds a check so unregister is only called if a handler was registered by
nouveau before.

Signed-off-by: Andreas Heider <andreas@meetr.de>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  • Loading branch information
Andreas Heider authored and Ben Skeggs committed May 24, 2012
1 parent 42eddbd commit 2f3787a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/gpu/drm/nouveau/nouveau_acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 2f3787a

Please sign in to comment.