diff options
| author | Deepak Saxena <dsaxena@laptop.org> | 2010-04-08 11:15:41 -0600 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2010-10-24 13:04:46 +0000 |
| commit | 3fd9b6cc38028ea64e9a39c6af9d5ad928594be6 (patch) | |
| tree | c61d7bbb85d98cc78bd5e8011de8a52bac9e698f /drivers/video/via/via-core.c | |
| parent | efd4f6398dc92b5bf392670df862f42a19f34cf2 (diff) | |
| download | op-kernel-dev-3fd9b6cc38028ea64e9a39c6af9d5ad928594be6.zip op-kernel-dev-3fd9b6cc38028ea64e9a39c6af9d5ad928594be6.tar.gz | |
Minimal support for viafb suspend/resume
This patch adds minimal support for suspend/resume of the
VIA framebuffer device. It requires a version of OFW
that restores the video mode.
This patch is OLPC-specific as the proper upstream solution
is to move the VIA video path to using the kernel modesetting
infrastructure and doing a proper save/restore in the kernel.
[jc: extensive changes for 2.6.34 merge]
Signed-off-by: Deepak Saxena <dsaxena@laptop.org>
[fts: viafb_driver moved from viafbdev.c to via-core.c]
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Cc: Joseph Chan <JosephChan@via.com.tw>
Diffstat (limited to 'drivers/video/via/via-core.c')
| -rw-r--r-- | drivers/video/via/via-core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/via/via-core.c b/drivers/video/via/via-core.c index 69101ab..9b487a6 100644 --- a/drivers/video/via/via-core.c +++ b/drivers/video/via/via-core.c @@ -644,6 +644,10 @@ static struct pci_driver via_driver = { .id_table = via_pci_table, .probe = via_pci_probe, .remove = __devexit_p(via_pci_remove), +#ifdef CONFIG_PM + .suspend = viafb_suspend, + .resume = viafb_resume, +#endif }; static int __init via_core_init(void) |
