Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 126389
b: refs/heads/master
c: 4fa34cd
h: refs/heads/master
i:
  126387: ca6423c
v: v3
  • Loading branch information
Hannes Eder authored and Linus Torvalds committed Jan 6, 2009
1 parent c0f61f2 commit 18a9bf3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 27ec937c4f455163d6b0ab2df7a7b0161367c067
refs/heads/master: 4fa34cd051db53a07e1004c7ab078ed13e721f21
18 changes: 12 additions & 6 deletions trunk/drivers/video/i810/i810_accel.c
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,10 @@ void i810fb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
u32 dx, dy, width, height, dest, rop = 0, color = 0;

if (!info->var.accel_flags || par->dev_flags & LOCKUP ||
par->depth == 4)
return cfb_fillrect(info, rect);
par->depth == 4) {
cfb_fillrect(info, rect);
return;
}

if (par->depth == 1)
color = rect->color;
Expand All @@ -327,8 +329,10 @@ void i810fb_copyarea(struct fb_info *info, const struct fb_copyarea *region)
u32 sx, sy, dx, dy, pitch, width, height, src, dest, xdir;

if (!info->var.accel_flags || par->dev_flags & LOCKUP ||
par->depth == 4)
return cfb_copyarea(info, region);
par->depth == 4) {
cfb_copyarea(info, region);
return;
}

dx = region->dx * par->depth;
sx = region->sx * par->depth;
Expand Down Expand Up @@ -366,8 +370,10 @@ void i810fb_imageblit(struct fb_info *info, const struct fb_image *image)
u32 fg = 0, bg = 0, size, dst;

if (!info->var.accel_flags || par->dev_flags & LOCKUP ||
par->depth == 4 || image->depth != 1)
return cfb_imageblit(info, image);
par->depth == 4 || image->depth != 1) {
cfb_imageblit(info, image);
return;
}

switch (info->var.bits_per_pixel) {
case 8:
Expand Down

0 comments on commit 18a9bf3

Please sign in to comment.