[Armadeus-commitlog] SF.net SVN: armadeus:[1311] trunk/buildroot/target/device/armadeus/linux/ kern
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[1311] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.29
|
From: <ar...@us...> - 2009-05-27 20:52:30
|
Revision: 1311
http://armadeus.svn.sourceforge.net/armadeus/?rev=1311&view=rev
Author: artemys
Date: 2009-05-27 20:52:21 +0000 (Wed, 27 May 2009)
Log Message:
-----------
[LINUX] Rename some framebuffer related patches
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/333-armadeus-imxfb-makes_plat-mxc_imxfb_h_compatible_with_mx27.patch
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/334-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
Removed Paths:
-------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch 2009-05-27 17:59:13 UTC (rev 1310)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch 2009-05-27 20:52:21 UTC (rev 1311)
@@ -1,55 +0,0 @@
-
-When configured with a TFT LCD interface i.MX(1/2) LCD controller can support
-16, 12, 8 & 4bpp framebuffers with the same hardware interface (12 to 16 bits).
-So if userspace app wants a 8bpp screen, we switch to 8bpp. This can save
-ressources (mem + proc), when using SDL for example.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h
-===================================================================
---- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-26 19:52:33.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-27 09:15:52.000000000 +0200
-@@ -14,6 +14,7 @@
- #define PCR_BPIX_8 (3 << 25)
- #define PCR_BPIX_12 (4 << 25)
- #define PCR_BPIX_16 (4 << 25)
-+#define PCR_BPIX_MASK (7 << 25)
- #define PCR_PIXPOL (1 << 24)
- #define PCR_FLMPOL (1 << 23)
- #define PCR_LPPOL (1 << 22)
-Index: linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h
-===================================================================
---- linux-2.6.29.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-26 19:52:35.000000000 +0200
-+++ linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 09:15:52.000000000 +0200
-@@ -14,6 +14,7 @@
- #define PCR_BPIX_8 (3 << 25)
- #define PCR_BPIX_12 (4 << 25)
- #define PCR_BPIX_16 (4 << 25)
-+#define PCR_BPIX_MASK (7 << 25)
- #define PCR_PIXPOL (1 << 24)
- #define PCR_FLMPOL (1 << 23)
- #define PCR_LPPOL (1 << 22)
-Index: linux-2.6.29/drivers/video/imxfb.c
-===================================================================
---- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-27 09:15:03.000000000 +0200
-+++ linux-2.6.29/drivers/video/imxfb.c 2009-05-27 09:19:32.000000000 +0200
-@@ -523,7 +523,17 @@
- /* add sync polarities */
- pcr |= fbi->pcr & ~0x3F;
-
-- writel(pcr, fbi->regs + LCDC_PCR);
-+ /* i.MX LCD controller can support 8bpp even if configured to output 16 bits (TFT) */
-+ if ((var->bits_per_pixel == 8) && (fbi->pcr & PCR_TFT)) {
-+ pr_debug("Switching imxfb to 8bpp\n");
-+ writel((pcr & (~PCR_BPIX_MASK)) |
-+ PCR_BPIX_8 |
-+ PCR_END_BYTE_SWAP,
-+ fbi->regs + LCDC_PCR);
-+ } else {
-+ writel(pcr, fbi->regs + LCDC_PCR);
-+ }
-+ writel(VPW_VPW(var->xres * var->bits_per_pixel / 8 / 4), fbi->regs + LCDC_VPW);
-
- return 0;
- }
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/333-armadeus-imxfb-makes_plat-mxc_imxfb_h_compatible_with_mx27.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/333-armadeus-imxfb-makes_plat-mxc_imxfb_h_compatible_with_mx27.patch 2009-05-27 17:59:13 UTC (rev 1310)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/333-armadeus-imxfb-makes_plat-mxc_imxfb_h_compatible_with_mx27.patch 2009-05-27 20:52:21 UTC (rev 1311)
@@ -7,8 +7,8 @@
Index: linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h
===================================================================
---- linux-2.6.29.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 11:43:17.000000000 +0200
-+++ linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 11:49:26.000000000 +0200
+--- linux-2.6.29.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 20:07:19.000000000 +0200
++++ linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 21:09:24.000000000 +0200
@@ -13,7 +13,12 @@
#define PCR_BPIX_4 (2 << 25)
#define PCR_BPIX_8 (3 << 25)
@@ -19,15 +19,6 @@
+#define PCR_BPIX_16 (5 << 25)
+#define PCR_BPIX_18 (6 << 25)
+#endif
- #define PCR_BPIX_MASK (7 << 25)
#define PCR_PIXPOL (1 << 24)
#define PCR_FLMPOL (1 << 23)
-@@ -22,7 +27,7 @@
- #define PCR_OEPOL (1 << 20)
- #define PCR_SCLKIDLE (1 << 19)
- #define PCR_END_SEL (1 << 18)
--#define PCR_END_BYTE_SWAP ( 1<< 17)
-+#define PCR_END_BYTE_SWAP (1 << 17)
- #define PCR_REV_VS (1 << 16)
- #define PCR_ACD_SEL (1 << 15)
- #define PCR_ACD(x) (((x) & 0x7f) << 8)
+ #define PCR_LPPOL (1 << 22)
Copied: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/334-armadeus-imxfb-supports_8bpp_in_tft_mode.patch (from rev 1309, trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch)
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/334-armadeus-imxfb-supports_8bpp_in_tft_mode.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/334-armadeus-imxfb-supports_8bpp_in_tft_mode.patch 2009-05-27 20:52:21 UTC (rev 1311)
@@ -0,0 +1,55 @@
+
+When configured with a TFT LCD interface i.MX(1/2) LCD controller can support
+16, 12, 8 & 4bpp framebuffers with the same hardware interface (12 to 16 bits).
+So if userspace app wants a 8bpp screen, we switch to 8bpp. This can save
+ressources (mem + proc), when using SDL for example.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h
+===================================================================
+--- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-27 20:07:17.000000000 +0200
++++ linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-27 21:11:01.000000000 +0200
+@@ -14,6 +14,7 @@
+ #define PCR_BPIX_8 (3 << 25)
+ #define PCR_BPIX_12 (4 << 25)
+ #define PCR_BPIX_16 (4 << 25)
++#define PCR_BPIX_MASK (7 << 25)
+ #define PCR_PIXPOL (1 << 24)
+ #define PCR_FLMPOL (1 << 23)
+ #define PCR_LPPOL (1 << 22)
+Index: linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h
+===================================================================
+--- linux-2.6.29.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 21:09:24.000000000 +0200
++++ linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 21:11:39.000000000 +0200
+@@ -19,6 +19,7 @@
+ #define PCR_BPIX_16 (5 << 25)
+ #define PCR_BPIX_18 (6 << 25)
+ #endif
++#define PCR_BPIX_MASK (7 << 25)
+ #define PCR_PIXPOL (1 << 24)
+ #define PCR_FLMPOL (1 << 23)
+ #define PCR_LPPOL (1 << 22)
+Index: linux-2.6.29/drivers/video/imxfb.c
+===================================================================
+--- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-27 21:07:41.000000000 +0200
++++ linux-2.6.29/drivers/video/imxfb.c 2009-05-27 21:11:01.000000000 +0200
+@@ -523,7 +523,17 @@
+ /* add sync polarities */
+ pcr |= fbi->pcr & ~0x3F;
+
+- writel(pcr, fbi->regs + LCDC_PCR);
++ /* i.MX LCD controller can support 8bpp even if configured to output 16 bits (TFT) */
++ if ((var->bits_per_pixel == 8) && (fbi->pcr & PCR_TFT)) {
++ pr_debug("Switching imxfb to 8bpp\n");
++ writel((pcr & (~PCR_BPIX_MASK)) |
++ PCR_BPIX_8 |
++ PCR_END_BYTE_SWAP,
++ fbi->regs + LCDC_PCR);
++ } else {
++ writel(pcr, fbi->regs + LCDC_PCR);
++ }
++ writel(VPW_VPW(var->xres * var->bits_per_pixel / 8 / 4), fbi->regs + LCDC_VPW);
+
+ return 0;
+ }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
