viafb: fix hardware acceleration for suspend & resume

This patch splits the acceleration initialization in two parts:
The first is only called during probe and is used to allocate
resources. The second part is also called on resume to reinitalize
the 2D engine. This should fix all acceleration issues after resume
most notable an "invisible" cursor and as we do nothing special it is
reasonable to assume that it works on all supported IGPs.

Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Cc: Joseph Chan <JosephChan@via.com.tw>

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 4e9e105a6c78..6c651e401dc6 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -1695,6 +1695,8 @@ int viafb_resume(struct pci_dev *pdev)
         if (pci_enable_device(pdev))
                 goto fail;
         pci_set_master(pdev);
+        if (viaparinfo->shared->vdev->engine_mmio)
+                viafb_reset_engine(viaparinfo);
         viafb_set_par(viafbinfo);
         if (viafb_dual_fb)
                 viafb_set_par(viafbinfo1);
@@ -1766,7 +1768,7 @@ int __devinit via_fb_pci_probe(struct viafb_dev *vdev)
         viafbinfo->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
 
         viafbinfo->pseudo_palette = pseudo_pal;
-        if (viafb_accel && !viafb_init_engine(viafbinfo)) {
+        if (viafb_accel && !viafb_setup_engine(viafbinfo)) {
                 viafbinfo->flags |= FBINFO_HWACCEL_COPYAREA |
                         FBINFO_HWACCEL_FILLRECT |  FBINFO_HWACCEL_IMAGEBLIT;
                 default_var.accel_flags = FB_ACCELF_TEXT;