Skip to content

Commit 2e3da8c

Browse files
soci64hdeller
authored andcommitted
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 <[email protected]> Signed-off-by: Helge Deller <[email protected]>
1 parent 4d23d9f commit 2e3da8c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/video/fbdev/s3fb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1510,7 +1510,7 @@ static int __maybe_unused s3_pci_suspend(struct device *dev)
15101510

15111511
fb_set_suspend(info, 1);
15121512
svga_wseq_mask(par->state.vgabase, 0x18, 0x20, 0x20);
1513-
svga_wseq_mask(par->state.vgabase, 0x14, 0x03, 0x03);
1513+
svga_wseq_mask(par->state.vgabase, 0x14, 0x01, 0x01);
15141514

15151515
mutex_unlock(&(par->open_lock));
15161516
console_unlock();
@@ -1539,7 +1539,7 @@ static int __maybe_unused s3_pci_resume(struct device *dev)
15391539

15401540
vga_wseq(par->state.vgabase, 0x08, 0x06);
15411541
svga_wseq_mask(par->state.vgabase, 0x18, 0x00, 0x20);
1542-
svga_wseq_mask(par->state.vgabase, 0x14, 0x00, 0x03);
1542+
svga_wseq_mask(par->state.vgabase, 0x14, 0x00, 0x01);
15431543
s3fb_set_par(info);
15441544
fb_set_suspend(info, 0);
15451545

0 commit comments

Comments
 (0)