aboutsummaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2010-04-26 16:37:53 +0000
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2010-10-24 13:04:47 +0000
commitb75f2c01de34daf0b25cbd75fcf00511548ffa1e (patch)
tree1a1af575f3aed3264bd3348edc7207e1e61ec7d4 /drivers/video
parent3fd9b6cc38028ea64e9a39c6af9d5ad928594be6 (diff)
viafb: restore display on resume
This patch makes viafb restore the display on resume by calling viafb_set_par. Resumeing has still its issues: - will probably freeze most machines (for me on VX800 reliable on the second resume) - under some configurations the screen appears on the wrong output device (reason unknown) 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')
-rw-r--r--drivers/video/via/viafbdev.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 596235b5a5f..6a7327eaf86 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -1705,6 +1705,9 @@ int viafb_resume(struct pci_dev *pdev)
viaparinfo->shared->saved_regs,
0x100 * sizeof(u32));
+ viafb_set_par(viafbinfo);
+ if (viafb_dual_fb)
+ viafb_set_par(viafbinfo1);
fb_set_suspend(viafbinfo, 0);
fail: