diff options
author | Steve French <sfrench@us.ibm.com> | 2011-01-31 04:17:03 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2011-01-31 04:17:03 +0000 |
commit | 58b8a5b45a097b477c037bc376e65dc5f214bf3d (patch) | |
tree | 9fa2538a113fbd3aaa322d9c972aca3ca16b7e30 /drivers/gpu/drm/nouveau/nouveau_drv.c | |
parent | ffeb414a59291d5891f09727beb793c109f19f08 (diff) | |
parent | 70d1f365568e0cdbc9f4ab92428e1830fdb09ab0 (diff) |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c index 13bb672a16f4..f658a04eecf9 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.c +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c @@ -234,9 +234,9 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state) pci_set_power_state(pdev, PCI_D3hot); } - acquire_console_sem(); + console_lock(); nouveau_fbcon_set_suspend(dev, 1); - release_console_sem(); + console_unlock(); nouveau_fbcon_restore_accel(dev); return 0; @@ -359,9 +359,9 @@ nouveau_pci_resume(struct pci_dev *pdev) nv_crtc->lut.depth = 0; } - acquire_console_sem(); + console_lock(); nouveau_fbcon_set_suspend(dev, 0); - release_console_sem(); + console_unlock(); nouveau_fbcon_zfill_all(dev); |