diff options
Diffstat (limited to 'drivers/video/nvidia/nv_accel.c')
-rw-r--r-- | drivers/video/nvidia/nv_accel.c | 12 |
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) | |||
300 | { | 300 | { |
301 | struct nvidia_par *par = info->par; | 301 | struct nvidia_par *par = info->par; |
302 | 302 | ||
303 | if (info->state != FBINFO_STATE_RUNNING) | ||
304 | return 0; | ||
305 | |||
303 | if (!par->lockup) | 306 | if (!par->lockup) |
304 | NVFlush(par); | 307 | NVFlush(par); |
305 | 308 | ||
@@ -313,6 +316,9 @@ void nvidiafb_copyarea(struct fb_info *info, const struct fb_copyarea *region) | |||
313 | { | 316 | { |
314 | struct nvidia_par *par = info->par; | 317 | struct nvidia_par *par = info->par; |
315 | 318 | ||
319 | if (info->state != FBINFO_STATE_RUNNING) | ||
320 | return; | ||
321 | |||
316 | if (par->lockup) | 322 | if (par->lockup) |
317 | return cfb_copyarea(info, region); | 323 | return cfb_copyarea(info, region); |
318 | 324 | ||
@@ -329,6 +335,9 @@ void nvidiafb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) | |||
329 | struct nvidia_par *par = info->par; | 335 | struct nvidia_par *par = info->par; |
330 | u32 color; | 336 | u32 color; |
331 | 337 | ||
338 | if (info->state != FBINFO_STATE_RUNNING) | ||
339 | return; | ||
340 | |||
332 | if (par->lockup) | 341 | if (par->lockup) |
333 | return cfb_fillrect(info, rect); | 342 | return cfb_fillrect(info, rect); |
334 | 343 | ||
@@ -412,6 +421,9 @@ void nvidiafb_imageblit(struct fb_info *info, const struct fb_image *image) | |||
412 | { | 421 | { |
413 | struct nvidia_par *par = info->par; | 422 | struct nvidia_par *par = info->par; |
414 | 423 | ||
424 | if (info->state != FBINFO_STATE_RUNNING) | ||
425 | return; | ||
426 | |||
415 | if (image->depth == 1 && !par->lockup) | 427 | if (image->depth == 1 && !par->lockup) |
416 | nvidiafb_mono_color_expand(info, image); | 428 | nvidiafb_mono_color_expand(info, image); |
417 | else | 429 | else |