|
@@ -300,8 +300,10 @@ void nvidiafb_copyarea(struct fb_info *info, const struct fb_copyarea *region)
|
|
if (info->state != FBINFO_STATE_RUNNING)
|
|
if (info->state != FBINFO_STATE_RUNNING)
|
|
return;
|
|
return;
|
|
|
|
|
|
- if (par->lockup)
|
|
|
|
- return cfb_copyarea(info, region);
|
|
|
|
|
|
+ if (par->lockup) {
|
|
|
|
+ cfb_copyarea(info, region);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
|
|
NVDmaStart(info, par, BLIT_POINT_SRC, 3);
|
|
NVDmaStart(info, par, BLIT_POINT_SRC, 3);
|
|
NVDmaNext(par, (region->sy << 16) | region->sx);
|
|
NVDmaNext(par, (region->sy << 16) | region->sx);
|
|
@@ -319,8 +321,10 @@ void nvidiafb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
|
|
if (info->state != FBINFO_STATE_RUNNING)
|
|
if (info->state != FBINFO_STATE_RUNNING)
|
|
return;
|
|
return;
|
|
|
|
|
|
- if (par->lockup)
|
|
|
|
- return cfb_fillrect(info, rect);
|
|
|
|
|
|
+ if (par->lockup) {
|
|
|
|
+ cfb_fillrect(info, rect);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
|
|
if (info->var.bits_per_pixel == 8)
|
|
if (info->var.bits_per_pixel == 8)
|
|
color = rect->color;
|
|
color = rect->color;
|