Commit 52a7a1ce authored by Daniel Mack's avatar Daniel Mack Committed by Eric Miao

[ARM] pxafb: add accelerator ID for PXA3xx GCU

Add ID 99 for PXA3xx frame buffers and report it in the pxa frame buffer
conditionally, depending on a new flag in struct pxafb_mach_info.
Signed-off-by: default avatarDaniel Mack <daniel@caiaq.de>
Cc: linux-fbdev-devel@lists.sourceforge.net
Cc: Dennis Oliver Kropp <dok@directfb.org>
Cc: Sven Neumann <s.neumann@raumfeld.com>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent a75d048e
...@@ -118,7 +118,8 @@ struct pxafb_mach_info { ...@@ -118,7 +118,8 @@ struct pxafb_mach_info {
u_int fixed_modes:1, u_int fixed_modes:1,
cmap_inverse:1, cmap_inverse:1,
cmap_static:1, cmap_static:1,
unused:29; acceleration_enabled:1,
unused:28;
/* The following should be defined in LCCR0 /* The following should be defined in LCCR0
* LCCR0_Act or LCCR0_Pas Active or Passive * LCCR0_Act or LCCR0_Pas Active or Passive
......
...@@ -2083,6 +2083,9 @@ static int __devinit pxafb_probe(struct platform_device *dev) ...@@ -2083,6 +2083,9 @@ static int __devinit pxafb_probe(struct platform_device *dev)
goto failed; goto failed;
} }
if (cpu_is_pxa3xx() && inf->acceleration_enabled)
fbi->fb.fix.accel = FB_ACCEL_PXA3XX;
fbi->backlight_power = inf->pxafb_backlight_power; fbi->backlight_power = inf->pxafb_backlight_power;
fbi->lcd_power = inf->pxafb_lcd_power; fbi->lcd_power = inf->pxafb_lcd_power;
......
...@@ -133,6 +133,7 @@ struct dentry; ...@@ -133,6 +133,7 @@ struct dentry;
#define FB_ACCEL_NEOMAGIC_NM2230 96 /* NeoMagic NM2230 */ #define FB_ACCEL_NEOMAGIC_NM2230 96 /* NeoMagic NM2230 */
#define FB_ACCEL_NEOMAGIC_NM2360 97 /* NeoMagic NM2360 */ #define FB_ACCEL_NEOMAGIC_NM2360 97 /* NeoMagic NM2360 */
#define FB_ACCEL_NEOMAGIC_NM2380 98 /* NeoMagic NM2380 */ #define FB_ACCEL_NEOMAGIC_NM2380 98 /* NeoMagic NM2380 */
#define FB_ACCEL_PXA3XX 99 /* PXA3xx */
#define FB_ACCEL_SAVAGE4 0x80 /* S3 Savage4 */ #define FB_ACCEL_SAVAGE4 0x80 /* S3 Savage4 */
#define FB_ACCEL_SAVAGE3D 0x81 /* S3 Savage3D */ #define FB_ACCEL_SAVAGE3D 0x81 /* S3 Savage3D */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment