summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZsolt Kajtar <soci@c64.rulez.org>2025-09-03 21:14:15 +0200
committerHelge Deller <deller@gmx.de>2025-09-30 23:21:34 +0200
commit2e3da8cfe3b281d503ef0e968af131323562ae7c (patch)
treeb265156ae365653d378c9409e2c08e1e22a9066d
parent4d23d9f7fa7c9ed10b5b32a4e4871ddce02b2337 (diff)
fbdev: s3fb: Revert mclk stop in suspend
There are systems which want to wait for as long as it takes for the stopped video memory to answer. Mapping it out helps to avoid that while the system is running but standby still hangs somehow. So just leave the memory on in standby same as it was before my change. Signed-off-by: Zsolt Kajtar <soci@c64.rulez.org> Signed-off-by: Helge Deller <deller@gmx.de>
-rw-r--r--drivers/video/fbdev/s3fb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/s3fb.c b/drivers/video/fbdev/s3fb.c
index a6cfed0a87fa..ba30e5568cab 100644
--- a/drivers/video/fbdev/s3fb.c
+++ b/drivers/video/fbdev/s3fb.c
@@ -1510,7 +1510,7 @@ static int __maybe_unused s3_pci_suspend(struct device *dev)
fb_set_suspend(info, 1);
svga_wseq_mask(par->state.vgabase, 0x18, 0x20, 0x20);
- svga_wseq_mask(par->state.vgabase, 0x14, 0x03, 0x03);
+ svga_wseq_mask(par->state.vgabase, 0x14, 0x01, 0x01);
mutex_unlock(&(par->open_lock));
console_unlock();
@@ -1539,7 +1539,7 @@ static int __maybe_unused s3_pci_resume(struct device *dev)
vga_wseq(par->state.vgabase, 0x08, 0x06);
svga_wseq_mask(par->state.vgabase, 0x18, 0x00, 0x20);
- svga_wseq_mask(par->state.vgabase, 0x14, 0x00, 0x03);
+ svga_wseq_mask(par->state.vgabase, 0x14, 0x00, 0x01);
s3fb_set_par(info);
fb_set_suspend(info, 0);