diff options
| -rw-r--r-- | drivers/video/aty/mach64_accel.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/video/aty/mach64_accel.c b/drivers/video/aty/mach64_accel.c index 51fcc0a2c94a..e45833ce975b 100644 --- a/drivers/video/aty/mach64_accel.c +++ b/drivers/video/aty/mach64_accel.c | |||
| @@ -242,7 +242,7 @@ void atyfb_copyarea(struct fb_info *info, const struct fb_copyarea *area) | |||
| 242 | void atyfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) | 242 | void atyfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) |
| 243 | { | 243 | { |
| 244 | struct atyfb_par *par = (struct atyfb_par *) info->par; | 244 | struct atyfb_par *par = (struct atyfb_par *) info->par; |
| 245 | u32 color = rect->color, dx = rect->dx, width = rect->width, rotation = 0; | 245 | u32 color, dx = rect->dx, width = rect->width, rotation = 0; |
| 246 | 246 | ||
| 247 | if (par->asleep) | 247 | if (par->asleep) |
| 248 | return; | 248 | return; |
| @@ -253,8 +253,11 @@ void atyfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) | |||
| 253 | return; | 253 | return; |
| 254 | } | 254 | } |
| 255 | 255 | ||
| 256 | color |= (rect->color << 8); | 256 | if (info->fix.visual == FB_VISUAL_TRUECOLOR || |
| 257 | color |= (rect->color << 16); | 257 | info->fix.visual == FB_VISUAL_DIRECTCOLOR) |
| 258 | color = ((u32 *)(info->pseudo_palette))[rect->color]; | ||
| 259 | else | ||
| 260 | color = rect->color; | ||
| 258 | 261 | ||
| 259 | if (info->var.bits_per_pixel == 24) { | 262 | if (info->var.bits_per_pixel == 24) { |
| 260 | /* In 24 bpp, the engine is in 8 bpp - this requires that all */ | 263 | /* In 24 bpp, the engine is in 8 bpp - this requires that all */ |
