diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-18 15:02:19 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-18 15:02:19 -0400 |
| commit | c1a952f48517b5545075d8eb1a5d543099bd2ae1 (patch) | |
| tree | 7bdf2761b8508109c8f28abcfb2f213ebce299ac /drivers/video/sysimgblt.c | |
| parent | 4fcd294d4a6e156cccd077f24c6a255298df0fd8 (diff) | |
| parent | 21f184dabe444d353e9fbba4bef608af0d31227a (diff) | |
Merge branch 'omap-edid' of git://git.linaro.org/people/doanac/linux-linaro-2.6.38 into linaro-2.6.38
Diffstat (limited to 'drivers/video/sysimgblt.c')
| -rw-r--r-- | drivers/video/sysimgblt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/sysimgblt.c b/drivers/video/sysimgblt.c index 186c6f607be..bdc45dca24e 100644 --- a/drivers/video/sysimgblt.c +++ b/drivers/video/sysimgblt.c @@ -14,6 +14,7 @@ #include <linux/string.h> #include <linux/fb.h> #include <asm/types.h> +#include "fb_draw.h" #define DEBUG @@ -80,6 +81,7 @@ static void color_imageblit(const struct fb_image *image, struct fb_info *p, else color = *src; color <<= FB_LEFT_POS(p, bpp); + color = solid_color(p, color); val |= FB_SHIFT_HIGH(p, color, shift); if (shift >= null_bits) { *dst++ = val; @@ -265,8 +267,8 @@ void sys_imageblit(struct fb_info *p, const struct fb_image *image) fgcolor = ((u32*)(p->pseudo_palette))[image->fg_color]; bgcolor = ((u32*)(p->pseudo_palette))[image->bg_color]; } else { - fgcolor = image->fg_color; - bgcolor = image->bg_color; + fgcolor = solid_color(p, image->fg_color); + bgcolor = solid_color(p, image->bg_color); } if (32 % bpp == 0 && !start_index && !pitch_index && |