[PATCH] nvidiafb: add suspend and resume hooks

Add suspend and resume hooks to make software suspend more reliable.  Resuming
from standby should generally work.  Resuming from mem and from disk requires
that the GPU is disabled.  Adding these to the suspend script...

fbset -accel false -a
/* suspend here */
fbset -accel true -a

...  should generally work.  In addition, resuming from mem requires that the
video card has to be POSTed by the BIOS or some other utility.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/video/nvidia/nv_accel.c b/drivers/video/nvidia/nv_accel.c
index f377a29ec97a..4aefb8f41637 100644
--- a/drivers/video/nvidia/nv_accel.c
+++ b/drivers/video/nvidia/nv_accel.c
@@ -300,6 +300,9 @@ int nvidiafb_sync(struct fb_info *info)
 {
         struct nvidia_par *par = info->par;
 
+        if (info->state != FBINFO_STATE_RUNNING)
+                return 0;
+
         if (!par->lockup)
                 NVFlush(par);
 
@@ -313,6 +316,9 @@ void nvidiafb_copyarea(struct fb_info *info, const struct fb_copyarea *region)
 {
         struct nvidia_par *par = info->par;
 
+        if (info->state != FBINFO_STATE_RUNNING)
+                return;
+
         if (par->lockup)
                 return cfb_copyarea(info, region);
 
@@ -329,6 +335,9 @@ void nvidiafb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
         struct nvidia_par *par = info->par;
         u32 color;
 
+        if (info->state != FBINFO_STATE_RUNNING)
+                return;
+
         if (par->lockup)
                 return cfb_fillrect(info, rect);
 
@@ -412,6 +421,9 @@ void nvidiafb_imageblit(struct fb_info *info, const struct fb_image *image)
 {
         struct nvidia_par *par = info->par;
 
+        if (info->state != FBINFO_STATE_RUNNING)
+                return;
+
         if (image->depth == 1 && !par->lockup)
                 nvidiafb_mono_color_expand(info, image);
         else