Skip to content

Commit

Permalink
viafb: make suspend and resume work (on all machines?)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Florian Tobias Schandinat authored and Florian Tobias Schandinat committed Oct 24, 2010
1 parent b75f2c0 commit 466bc7f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 deletions.
10 changes: 0 additions & 10 deletions drivers/video/via/viafbdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
3 changes: 0 additions & 3 deletions drivers/video/via/viafbdev.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 466bc7f

Please sign in to comment.