diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2010-04-26 17:08:00 +0000 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2010-10-24 13:04:51 +0000 |
| commit | 466bc7fc4246d95cbd37edd169eafb8185e41941 (patch) | |
| tree | 1905418fda1b3dde93a27bdd143ec5adb3a8665c | |
| parent | b75f2c01de34daf0b25cbd75fcf00511548ffa1e (diff) | |
| download | op-kernel-dev-466bc7fc4246d95cbd37edd169eafb8185e41941.zip op-kernel-dev-466bc7fc4246d95cbd37edd169eafb8185e41941.tar.gz | |
viafb: make suspend and resume work (on all machines?)
This patch removes the dangerous suspend and resume code that was
developed for VX855 only. After this the framebuffer is expected to
cause no longer serious (freezing) issues on any machines.
However the hardware acceleration is broken now so only doing resume
with unaccelerated framebuffers is save. This did not work previously
as the 2D engine is not mapped if the framebuffer is not accelerated.
The acceleration issue will be addressed later.
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Cc: Joseph Chan <JosephChan@via.com.tw>
| -rw-r--r-- | drivers/video/via/viafbdev.c | 10 | ||||
| -rw-r--r-- | drivers/video/via/viafbdev.h | 3 |
2 files changed, 0 insertions, 13 deletions
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c index 6a7327e..4e9e105 100644 --- a/drivers/video/via/viafbdev.c +++ b/drivers/video/via/viafbdev.c @@ -1674,11 +1674,6 @@ int viafb_suspend(struct pci_dev *pdev, pm_message_t state) { if (state.event == PM_EVENT_SUSPEND) { acquire_console_sem(); - - memcpy_fromio(viaparinfo->shared->saved_regs, - viaparinfo->shared->vdev->engine_mmio + 0x100, - 0xff * sizeof(u32)); - fb_set_suspend(viafbinfo, 1); viafb_sync(viafbinfo); @@ -1700,11 +1695,6 @@ int viafb_resume(struct pci_dev *pdev) if (pci_enable_device(pdev)) goto fail; pci_set_master(pdev); - - memcpy_toio(viaparinfo->shared->vdev->engine_mmio + 0x100, - viaparinfo->shared->saved_regs, - 0x100 * sizeof(u32)); - viafb_set_par(viafbinfo); if (viafb_dual_fb) viafb_set_par(viafbinfo1); diff --git a/drivers/video/via/viafbdev.h b/drivers/video/via/viafbdev.h index 29a8c6c..4960e3d 100644 --- a/drivers/video/via/viafbdev.h +++ b/drivers/video/via/viafbdev.h @@ -62,9 +62,6 @@ struct viafb_shared { u8 dst_bpp, u32 dst_addr, u32 dst_pitch, u32 dst_x, u32 dst_y, u32 *src_mem, u32 src_addr, u32 src_pitch, u32 src_x, u32 src_y, u32 fg_color, u32 bg_color, u8 fill_rop); - - /* For suspend/resume */ - u32 saved_regs[0x100]; }; struct viafb_par { |
