diff for duplicates of <20090910132630.GZ9410@buzzloop.caiaq.de> diff --git a/a/1.txt b/N1/1.txt index 7210cb5..8597bc7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,65 +3,3 @@ Does that look good to everyone? Thanks, Daniel - -From 32b1fa824cd78f9ba6169b90c5d01870de05c86f Mon Sep 17 00:00:00 2001 -From: Daniel Mack <daniel@caiaq.de> -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. - -Signed-off-by: Daniel Mack <daniel@caiaq.de> -Cc: Eric Miao <eric.miao@marvell.com> -Cc: linux-fbdev-devel@lists.sourceforge.net -Cc: Dennis Oliver Kropp <dok@directfb.org> -Cc: Sven Neumann <s.neumann@raumfeld.com> ---- - 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(-) - -diff --git a/arch/arm/mach-pxa/include/mach/pxafb.h b/arch/arm/mach-pxa/include/mach/pxafb.h -index 6932720..f73061c 100644 ---- a/arch/arm/mach-pxa/include/mach/pxafb.h -+++ b/arch/arm/mach-pxa/include/mach/pxafb.h -@@ -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 -diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c -index 3951cc5..b65cc2d 100644 ---- a/drivers/video/pxafb.c -+++ b/drivers/video/pxafb.c -@@ -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; -+ - fbi->backlight_power = inf->pxafb_backlight_power; - fbi->lcd_power = inf->pxafb_lcd_power; - -diff --git a/include/linux/fb.h b/include/linux/fb.h -index f847df9..a34bdf5 100644 ---- a/include/linux/fb.h -+++ b/include/linux/fb.h -@@ -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 */ --- -1.6.3.3 diff --git a/a/content_digest b/N1/content_digest index 65a7366..7cbad6f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,80 +1,13 @@ - "From\0Daniel Mack <daniel@caiaq.de>\0" + "From\0daniel@caiaq.de (Daniel Mack)\0" "Subject\0[PATCH] video: add PXA3xx accelerator ID [v2]\0" "Date\0Thu, 10 Sep 2009 15:26:30 +0200\0" - "To\0Eric Miao <eric.y.miao@gmail.com>\0" - "Cc\0linux-fbdev-devel@lists.sourceforge.net" - Sven Neumann <s.neumann@raumfeld.com> - Guennadi Liakhovetski <g.liakhovetski@gmx.de> - linux-arm-kernel <linux-arm-kernel@lists.infradead.org> - " Dennis Oliver Kropp <dok@directfb.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Ok, here goes a new patch as just discussed.\n" "Does that look good to everyone?\n" "\n" "Thanks,\n" - "Daniel\n" - "\n" - "From 32b1fa824cd78f9ba6169b90c5d01870de05c86f Mon Sep 17 00:00:00 2001\n" - "From: Daniel Mack <daniel@caiaq.de>\n" - "Date: Mon, 20 Jul 2009 11:18:43 +0200\n" - "Subject: [PATCH] video: add PXA3xx accelerator ID\n" - "\n" - "Add ID 99 for PXA3xx frame buffers and report it in the pxa frame buffer\n" - "conditionally, depending on a new flag in struct pxafb_mach_info.\n" - "\n" - "Signed-off-by: Daniel Mack <daniel@caiaq.de>\n" - "Cc: Eric Miao <eric.miao@marvell.com>\n" - "Cc: linux-fbdev-devel@lists.sourceforge.net\n" - "Cc: Dennis Oliver Kropp <dok@directfb.org>\n" - "Cc: Sven Neumann <s.neumann@raumfeld.com>\n" - "---\n" - " arch/arm/mach-pxa/include/mach/pxafb.h | 3 ++-\n" - " drivers/video/pxafb.c | 3 +++\n" - " include/linux/fb.h | 1 +\n" - " 3 files changed, 6 insertions(+), 1 deletions(-)\n" - "\n" - "diff --git a/arch/arm/mach-pxa/include/mach/pxafb.h b/arch/arm/mach-pxa/include/mach/pxafb.h\n" - "index 6932720..f73061c 100644\n" - "--- a/arch/arm/mach-pxa/include/mach/pxafb.h\n" - "+++ b/arch/arm/mach-pxa/include/mach/pxafb.h\n" - "@@ -118,7 +118,8 @@ struct pxafb_mach_info {\n" - " \tu_int\t\tfixed_modes:1,\n" - " \t\t\tcmap_inverse:1,\n" - " \t\t\tcmap_static:1,\n" - "-\t\t\tunused:29;\n" - "+\t\t\tacceleration_enabled:1,\n" - "+\t\t\tunused:28;\n" - " \n" - " \t/* The following should be defined in LCCR0\n" - " \t * LCCR0_Act or LCCR0_Pas Active or Passive\n" - "diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c\n" - "index 3951cc5..b65cc2d 100644\n" - "--- a/drivers/video/pxafb.c\n" - "+++ b/drivers/video/pxafb.c\n" - "@@ -2083,6 +2083,9 @@ static int __devinit pxafb_probe(struct platform_device *dev)\n" - " \t\tgoto failed;\n" - " \t}\n" - " \n" - "+\tif (cpu_is_pxa3xx() && inf->acceleration_enabled)\n" - "+\t\tfbi->fb.fix.accel = FB_ACCEL_PXA3XX;\n" - "+\n" - " \tfbi->backlight_power = inf->pxafb_backlight_power;\n" - " \tfbi->lcd_power = inf->pxafb_lcd_power;\n" - " \n" - "diff --git a/include/linux/fb.h b/include/linux/fb.h\n" - "index f847df9..a34bdf5 100644\n" - "--- a/include/linux/fb.h\n" - "+++ b/include/linux/fb.h\n" - "@@ -133,6 +133,7 @@ struct dentry;\n" - " #define FB_ACCEL_NEOMAGIC_NM2230 96\t/* NeoMagic NM2230 */\n" - " #define FB_ACCEL_NEOMAGIC_NM2360 97\t/* NeoMagic NM2360 */\n" - " #define FB_ACCEL_NEOMAGIC_NM2380 98\t/* NeoMagic NM2380 */\n" - "+#define FB_ACCEL_PXA3XX\t\t 99\t/* PXA3xx\t\t\t*/\n" - " \n" - " #define FB_ACCEL_SAVAGE4 0x80\t/* S3 Savage4 */\n" - " #define FB_ACCEL_SAVAGE3D 0x81\t/* S3 Savage3D */\n" - "-- \n" - 1.6.3.3 + Daniel -25603e79eb54fbe4a410fce05fa04839b59f3fa627dd67745ab246e9563f08f5 +b2ddbcd98f61e34be81038a4e231fc382edfc5c447fa5a92361903ed2b41df77
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.