diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-03-01 16:22:38 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-01 16:22:38 +1000 |
| commit | 1c62233508ef7104f8a78e571fdf5c72d0dc0200 (patch) | |
| tree | 31e19cbff5c1080d3015d20b24dd43ee95f4ed8c /drivers/gpu/drm/nouveau/nouveau_drv.c | |
| parent | 6d9c13513661c1991bf5f4e6e1363c721292d819 (diff) | |
| parent | 6a9ee8af344e3bd7dbd61e67037096cdf7f83289 (diff) | |
| download | kernel_samsung_smdk4412-1c62233508ef7104f8a78e571fdf5c72d0dc0200.zip kernel_samsung_smdk4412-1c62233508ef7104f8a78e571fdf5c72d0dc0200.tar.gz kernel_samsung_smdk4412-1c62233508ef7104f8a78e571fdf5c72d0dc0200.tar.bz2 | |
Merge branch 'gpu-switcher' of /ssd/git//linux-2.6 into drm-next-stage
* 'gpu-switcher' of /ssd/git//linux-2.6:
vga_switcheroo: initial implementation (v15)
fb: for framebuffer handover don't exit the loop early.
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/radeon/Makefile
drivers/gpu/drm/radeon/radeon.h
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c index 874adf5..30cc09e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.c +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c @@ -135,7 +135,7 @@ nouveau_pci_remove(struct pci_dev *pdev) drm_put_dev(dev); } -static int +int nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state) { struct drm_device *dev = pci_get_drvdata(pdev); @@ -233,7 +233,7 @@ out_abort: return ret; } -static int +int nouveau_pci_resume(struct pci_dev *pdev) { struct drm_device *dev = pci_get_drvdata(pdev); @@ -402,8 +402,10 @@ static int __init nouveau_init(void) nouveau_modeset = 1; } - if (nouveau_modeset == 1) + if (nouveau_modeset == 1) { driver.driver_features |= DRIVER_MODESET; + nouveau_register_dsm_handler(); + } return drm_init(&driver); } @@ -411,6 +413,7 @@ static int __init nouveau_init(void) static void __exit nouveau_exit(void) { drm_exit(&driver); + nouveau_unregister_dsm_handler(); } module_init(nouveau_init); |