aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/i810/i810_accel.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
index 76764ea3486a..f5bedee4310a 100644
--- a/drivers/video/i810/i810_accel.c
+++ b/drivers/video/i810/i810_accel.c
@@ -301,8 +301,10 @@ void i810fb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
301 u32 dx, dy, width, height, dest, rop = 0, color = 0; 301 u32 dx, dy, width, height, dest, rop = 0, color = 0;
302 302
303 if (!info->var.accel_flags || par->dev_flags & LOCKUP || 303 if (!info->var.accel_flags || par->dev_flags & LOCKUP ||
304 par->depth == 4) 304 par->depth == 4) {
305 return cfb_fillrect(info, rect); 305 cfb_fillrect(info, rect);
306 return;
307 }
306 308
307 if (par->depth == 1) 309 if (par->depth == 1)
308 color = rect->color; 310 color = rect->color;
@@ -327,8 +329,10 @@ void i810fb_copyarea(struct fb_info *info, const struct fb_copyarea *region)
327 u32 sx, sy, dx, dy, pitch, width, height, src, dest, xdir; 329 u32 sx, sy, dx, dy, pitch, width, height, src, dest, xdir;
328 330
329 if (!info->var.accel_flags || par->dev_flags & LOCKUP || 331 if (!info->var.accel_flags || par->dev_flags & LOCKUP ||
330 par->depth == 4) 332 par->depth == 4) {
331 return cfb_copyarea(info, region); 333 cfb_copyarea(info, region);
334 return;
335 }
332 336
333 dx = region->dx * par->depth; 337 dx = region->dx * par->depth;
334 sx = region->sx * par->depth; 338 sx = region->sx * par->depth;
@@ -366,8 +370,10 @@ void i810fb_imageblit(struct fb_info *info, const struct fb_image *image)
366 u32 fg = 0, bg = 0, size, dst; 370 u32 fg = 0, bg = 0, size, dst;
367 371
368 if (!info->var.accel_flags || par->dev_flags & LOCKUP || 372 if (!info->var.accel_flags || par->dev_flags & LOCKUP ||
369 par->depth == 4 || image->depth != 1) 373 par->depth == 4 || image->depth != 1) {
370 return cfb_imageblit(info, image); 374 cfb_imageblit(info, image);
375 return;
376 }
371 377
372 switch (info->var.bits_per_pixel) { 378 switch (info->var.bits_per_pixel) {
373 case 8: 379 case 8: