diff options
| author | Andreas Heider <andreas@meetr.de> | 2012-05-20 19:14:51 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-05-24 02:56:36 -0400 |
| commit | 5c5ed6e2cd8b8f944cc7a27fb8a66b695dccf32f (patch) | |
| tree | 9b89f405badd9d4fb26fbdb5e819b39eceed99ae /drivers/gpu | |
| parent | 2f3787aa439ae0d34e4658400c1139a7541bec1d (diff) | |
drm/nouveau: Unregister switcheroo client on exit
Currently nouveau only registers as a vga_switcheroo client, but never
unregisters. This patch adds the necessary unregister calls.
Signed-off-by: Andreas Heider <andreas@meetr.de>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_state.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index e23c05348aa0..19706f0532ea 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c | |||
| @@ -840,6 +840,7 @@ out_bios: | |||
| 840 | out_display_early: | 840 | out_display_early: |
| 841 | engine->display.late_takedown(dev); | 841 | engine->display.late_takedown(dev); |
| 842 | out: | 842 | out: |
| 843 | vga_switcheroo_unregister_client(dev->pdev); | ||
| 843 | vga_client_register(dev->pdev, NULL, NULL, NULL); | 844 | vga_client_register(dev->pdev, NULL, NULL, NULL); |
| 844 | return ret; | 845 | return ret; |
| 845 | } | 846 | } |
| @@ -895,6 +896,7 @@ static void nouveau_card_takedown(struct drm_device *dev) | |||
| 895 | 896 | ||
| 896 | nouveau_irq_fini(dev); | 897 | nouveau_irq_fini(dev); |
| 897 | 898 | ||
| 899 | vga_switcheroo_unregister_client(dev->pdev); | ||
| 898 | vga_client_register(dev->pdev, NULL, NULL, NULL); | 900 | vga_client_register(dev->pdev, NULL, NULL, NULL); |
| 899 | } | 901 | } |
| 900 | 902 | ||
