From: Zsolt Kajtar Date: Wed, 3 Sep 2025 19:14:15 +0000 (+0200) Subject: fbdev: s3fb: Revert mclk stop in suspend X-Git-Tag: v6.18-rc1~24^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e3da8cfe3b281d503ef0e968af131323562ae7c;p=thirdparty%2Fkernel%2Flinux.git 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 Signed-off-by: Helge Deller --- diff --git a/drivers/video/fbdev/s3fb.c b/drivers/video/fbdev/s3fb.c index a6cfed0a87fad..ba30e5568cabc 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);