Skip to contentSkip to conversation

video: add PXA3xx accelerator ID [v2]

PATCH New Daniel Mack 3 participants 5 messages Sep 10, 2009 – Sep 11, 2009 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 video: add PXA3xx accelerator ID [v2]

Ok, here goes a new patch as just discussed.
Does that look good to everyone?

Thanks,
Daniel

#1 lore raw

PATCH 1/1 video: add PXA3xx accelerator ID [v2]

Quoted 44 lines · Daniel Mack

Ok, here goes a new patch as just discussed.
Does that look good to everyone?

Thanks,
Daniel

Quoted 1 line

From 32b1fa824cd78f9ba6169b90c5d01870de05c86f Mon Sep 17 00:00:00 2001

From: Daniel Mack <[email protected]>
Date: Mon, 20 Jul 2009 11:18:43 +0200
Subject: [PATCH] video: add PXA3xx accelerator ID

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.

Cc Eric Miao <[email protected]>
Cc linux-fbdev-devel at lists.sourceforge.net
Cc Dennis Oliver Kropp <[email protected]>
Cc Sven Neumann <[email protected]>
---
 arch/arm/mach-pxa/include/mach/pxafb.h |    3 ++-
 drivers/video/pxafb.c                  |    3 +++
 include/linux/fb.h                     |    1 +
 3 files changed, 6 insertions(+), 1 deletions(-)
arch/arm/mach-pxa/include/mach/pxafb.h +2 -1
index 6932720..f73061c 100644
@@ -118,7 +118,8 @@ struct pxafb_mach_info {
 	u_int		fixed_modes:1,
 			cmap_inverse:1,
 			cmap_static:1,
-			unused:29;
+			acceleration_enabled:1,
+			unused:28;
 
 	/* The following should be defined in LCCR0
 	 *      LCCR0_Act or LCCR0_Pas          Active or Passive
drivers/video/pxafb.c +0 -0
index 3951cc5..b65cc2d 100644

drivers/video/pxafb.c static int __devinit pxafb_probe(struct platform_device *dev) · line 2088

Quoted 6 lines
drivers/video/pxafb.c +3 -0
@@ -2083,6 +2083,9 @@ static int __devinit pxafb_probe(struct platform_device *dev)
 		goto failed;
 	}
 
+	if (cpu_is_pxa3xx() && inf->acceleration_enabled)
+		fbi->fb.fix.accel = FB_ACCEL_PXA3XX;
+

Ok, now remove 'cpu_is_pxa3xx() && ' above and you should be good to go:-) What if tomorrow pxa4xx comes (ok, Eric will disagree, but wtill:-))

Quoted 18 lines
drivers/video/pxafb.c +0 -0
 	fbi->backlight_power = inf->pxafb_backlight_power;
 	fbi->lcd_power = inf->pxafb_lcd_power;
 
include/linux/fb.h +1 -0
index f847df9..a34bdf5 100644
@@ -133,6 +133,7 @@ struct dentry;
 #define FB_ACCEL_NEOMAGIC_NM2230 96	/* NeoMagic NM2230              */
 #define FB_ACCEL_NEOMAGIC_NM2360 97	/* NeoMagic NM2360              */
 #define FB_ACCEL_NEOMAGIC_NM2380 98	/* NeoMagic NM2380              */
+#define FB_ACCEL_PXA3XX		 99	/* PXA3xx			*/
 
 #define FB_ACCEL_SAVAGE4        0x80	/* S3 Savage4                   */
 #define FB_ACCEL_SAVAGE3D       0x81	/* S3 Savage3D                  */
Signature · 1 line
1.6.3.3

Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

#2 lore raw

PATCH 1/1 video: add PXA3xx accelerator ID [v2]

Quoted 6 lines · Guennadi Liakhovetski

Review

Quoted 3 lines
(quoted diff) +3 -0
+	if (cpu_is_pxa3xx() && inf->acceleration_enabled)
+		fbi->fb.fix.accel = FB_ACCEL_PXA3XX;
+

Ok, now remove 'cpu_is_pxa3xx() && ' above and you should be good to go:-) What if tomorrow pxa4xx comes (ok, Eric will disagree, but wtill:-))

Don't know. I left it in there intentionally, but I'm fine to remove it. Or Eric does it when applying ;) Eric?

Daniel

#3 lore raw

PATCH 1/1 video: add PXA3xx accelerator ID [v2]

Quoted 10 lines · Daniel Mack
Quoted 6 lines · Guennadi Liakhovetski

Review

Quoted 3 lines
(quoted diff) +3 -0
+	if (cpu_is_pxa3xx() && inf->acceleration_enabled)
+		fbi->fb.fix.accel = FB_ACCEL_PXA3XX;
+

Ok, now remove 'cpu_is_pxa3xx() && ' above and you should be good to go:-) What if tomorrow pxa4xx comes (ok, Eric will disagree, but wtill:-))

Don't know. I left it in there intentionally, but I'm fine to remove it. Or Eric does it when applying ;) Eric?

What I was considering are cases where a kernel binary that works on both PXA3xx and other PXAs shares the same pxafb_mach_info struct across different board support code. The accel flag would then be set for wrong platforms.

But this might be academic, that's why I don't have a strong opinion on that :)

Daniel

#4 lore raw

PATCH 1/1 video: add PXA3xx accelerator ID [v2]

In reply to Guennadi Liakhovetski
Quoted 2 lines

Ok, now remove 'cpu_is_pxa3xx() && ' above and you should be good to go:-) What if tomorrow pxa4xx comes (ok, Eric will disagree, but wtill:-))

It is not likely to be pxa4xx, (chinese people don't like '4', and there are a lot chinese in Marvell, Shhh..... don't let them know I said this ;-)

Still, I guess having a cpu_is_pxa3xx() should be OK here.

Quoted 27 lines
Quoted 14 lines

? ? ? fbi->backlight_power = inf->pxafb_backlight_power; ? ? ? fbi->lcd_power = inf->pxafb_lcd_power;

include/linux/fb.h +0 -0
index f847df9..a34bdf5 100644
@@ -133,6 +133,7 @@ struct dentry;

?#define FB_ACCEL_NEOMAGIC_NM2230 96 ?/* NeoMagic NM2230 ? ? ? ? ? ? ?*/ ?#define FB_ACCEL_NEOMAGIC_NM2360 97 ?/* NeoMagic NM2360 ? ? ? ? ? ? ?*/ ?#define FB_ACCEL_NEOMAGIC_NM2380 98 ?/* NeoMagic NM2380 ? ? ? ? ? ? ?*/ +#define FB_ACCEL_PXA3XX ? ? ? ? ? ? ? 99 ? ? /* PXA3xx ? ? ? ? ? ? ? ? ? ? ? */

Quoted 5 lines

?#define FB_ACCEL_SAVAGE4 ? ? ? ?0x80 /* S3 Savage4 ? ? ? ? ? ? ? ? ? */ ?#define FB_ACCEL_SAVAGE3D ? ? ? 0x81 /* S3 Savage3D ? ? ? ? ? ? ? ? ?*/ --
1.6.3.3

Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/