git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
video
/
nvidia
/
nv_accel.c
diff --git
a/drivers/video/nvidia/nv_accel.c
b/drivers/video/nvidia/nv_accel.c
index
f377a29
..
4aefb8f
100644
(file)
--- 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;
{
struct nvidia_par *par = info->par;
+ if (info->state != FBINFO_STATE_RUNNING)
+ return 0;
+
if (!par->lockup)
NVFlush(par);
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;
{
struct nvidia_par *par = info->par;
+ if (info->state != FBINFO_STATE_RUNNING)
+ return;
+
if (par->lockup)
return cfb_copyarea(info, region);
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;
struct nvidia_par *par = info->par;
u32 color;
+ if (info->state != FBINFO_STATE_RUNNING)
+ return;
+
if (par->lockup)
return cfb_fillrect(info, rect);
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;
{
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
if (image->depth == 1 && !par->lockup)
nvidiafb_mono_color_expand(info, image);
else