2 files changed, 10 insertions, 2 deletions

diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 15e2e6bfcbff..e9a2661669eb 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -519,6 +519,7 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,
         int yres;
         /* memory size in pixels */
         unsigned pixels = info->screen_size * 8 / var->bits_per_pixel;
+        struct cirrusfb_info *cinfo = info->par;
 
         switch (var->bits_per_pixel) {
         case 1:
@@ -627,6 +628,9 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,
         if (cirrusfb_check_pixclock(var, info))
                 return -EINVAL;
 
+        if (!is_laguna(cinfo))
+                var->accel_flags = FB_ACCELF_TEXT;
+
         return 0;
 }
 
@@ -2029,8 +2033,12 @@ static int __devinit cirrusfb_set_fbinfo(struct fb_info *info)
                     | FBINFO_HWACCEL_FILLRECT
                     | FBINFO_HWACCEL_IMAGEBLIT
                     | FBINFO_HWACCEL_COPYAREA;
-        if (noaccel || is_laguna(cinfo))
+        if (noaccel || is_laguna(cinfo)) {
                 info->flags |= FBINFO_HWACCEL_DISABLED;
+                info->fix.accel = FB_ACCEL_NONE;
+        } else
+                info->fix.accel = FB_ACCEL_CIRRUS_ALPINE;
+
         info->fbops = &cirrusfb_ops;
 
         if (cinfo->btype == BT_GD5480) {
@@ -2056,7 +2064,6 @@ static int __devinit cirrusfb_set_fbinfo(struct fb_info *info)
 
         /* FIXME: map region at 0xB8000 if available, fill in here */
         info->fix.mmio_len   = 0;
-        info->fix.accel = FB_ACCEL_NONE;
 
         fb_alloc_cmap(&info->cmap, 256, 0);
 
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 31527e17076b..fe7d0d7907ab 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -123,6 +123,7 @@ struct dentry;
 #define FB_ACCEL_TRIDENT_3DIMAGE 51     /* Trident 3DImage              */
 #define FB_ACCEL_TRIDENT_BLADE3D 52     /* Trident Blade3D              */
 #define FB_ACCEL_TRIDENT_BLADEXP 53     /* Trident BladeXP              */
+#define FB_ACCEL_CIRRUS_ALPINE   53     /* Cirrus Logic 543x/544x/5480  */
 #define FB_ACCEL_NEOMAGIC_NM2070 90     /* NeoMagic NM2070              */
 #define FB_ACCEL_NEOMAGIC_NM2090 91     /* NeoMagic NM2090              */
 #define FB_ACCEL_NEOMAGIC_NM2093 92     /* NeoMagic NM2093              */