Commit 2e3da8cf authored by Zsolt Kajtar's avatar Zsolt Kajtar Committed by Helge Deller
Browse files

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: default avatarZsolt Kajtar <soci@c64.rulez.org>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 4d23d9f7

drivers/video/fbdev/s3fb.c

+2 −2
Original line number Diff line number Diff line
@@ -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);