2 files changed, 16 insertions, 12 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 25b6ca6ad081..3e470c8b4193 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -534,6 +534,12 @@ config FB_SUN3
         bool "Sun3 framebuffer support"
         depends on (FB = y) && (SUN3 || SUN3X) && BROKEN
 
+config FB_SBUS
+        bool "SBUS and UPA framebuffers"
+        depends on (FB = y) && (SPARC32 || SPARC64)
+        help
+          Say Y if you want support for SBUS or UPA based frame buffer device.
+
 config FB_BW2
         bool "BWtwo support"
         depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
@@ -546,6 +552,7 @@ config FB_BW2
 config FB_CG3
         bool "CGthree support"
         depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+        select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         help
@@ -1210,12 +1217,6 @@ config FB_AU1100
 
 source "drivers/video/geode/Kconfig"
 
-config FB_SBUS
-        bool "SBUS and UPA framebuffers"
-        depends on (FB = y) && (SPARC32 || SPARC64)
-        help
-          Say Y if you want support for SBUS or UPA based frame buffer device.
-
 config FB_FFB
         bool "Creator/Creator3D/Elite3D support"
         depends on FB_SBUS && SPARC64
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 2858c5c8ba3c..e0dbdfc0c8b4 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -404,7 +404,7 @@ struct cirrusfb_info {
         struct cirrusfb_regs currentmode;
         int blank_mode;
 
-        u32     pseudo_palette[17];
+        u32     pseudo_palette[16];
         struct { u8 red, green, blue, pad; } palette[256];
 
 #ifdef CONFIG_ZORRO
@@ -1603,14 +1603,14 @@ static int cirrusfb_setcolreg (unsigned regno, unsigned red, unsigned green,
 
                 switch (info->var.bits_per_pixel) {
                         case 8:
-                                ((u8*)(info->pseudo_palette))[regno] = v;
+                                cinfo->pseudo_palette[regno] = v;
                                 break;
                         case 16:
-                                ((u16*)(info->pseudo_palette))[regno] = v;
+                                cinfo->pseudo_palette[regno] = v;
                                 break;
                         case 24:
                         case 32:
-                                ((u32*)(info->pseudo_palette))[regno] = v;
+                                cinfo->pseudo_palette[regno] = v;
                                 break;
                 }
                 return 0;
@@ -2020,18 +2020,21 @@ static void cirrusfb_prim_fillrect(struct cirrusfb_info *cinfo,
                                    const struct fb_fillrect *region)
 {
         int m; /* bytes per pixel */
+        u32 color = (cinfo->info->fix.visual == FB_VISUAL_TRUECOLOR) ?
+                cinfo->pseudo_palette[region->color] : region->color;
+
         if(cinfo->info->var.bits_per_pixel == 1) {
                 cirrusfb_RectFill(cinfo->regbase, cinfo->info->var.bits_per_pixel,
                                   region->dx / 8, region->dy,
                                   region->width / 8, region->height,
-                                  region->color,
+                                  color,
                                   cinfo->currentmode.line_length);
         } else {
                 m = ( cinfo->info->var.bits_per_pixel + 7 ) / 8;
                 cirrusfb_RectFill(cinfo->regbase, cinfo->info->var.bits_per_pixel,
                                   region->dx * m, region->dy,
                                   region->width * m, region->height,
-                                  region->color,
+                                  color,
                                   cinfo->currentmode.line_length);
         }
         return;