[Armadeus-commitlog] SF.net SVN: armadeus:[1308] trunk/buildroot/target/device/armadeus/linux/ kern
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[1308] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.29
|
From: <ar...@us...> - 2009-05-26 17:49:08
|
Revision: 1308
http://armadeus.svn.sourceforge.net/armadeus/?rev=1308&view=rev
Author: artemys
Date: 2009-05-26 17:48:59 +0000 (Tue, 26 May 2009)
Log Message:
-----------
[LINUX] Renames/reorganizes some framebuffer related patches
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-pengu-imxfb-fix_margin_settings.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-improvements.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
Removed Paths:
-------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/013-armadeus-imxfb-improvements.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/326-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/328-pengu-imxfb-fix_margin_settings.patch
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/013-armadeus-imxfb-improvements.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/013-armadeus-imxfb-improvements.patch 2009-05-26 16:35:12 UTC (rev 1307)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/013-armadeus-imxfb-improvements.patch 2009-05-26 17:48:59 UTC (rev 1308)
@@ -1,44 +0,0 @@
-PWMR, LSCR1 and DMACR registers only need to be initialized once at startup,
-not every time imxfb_set_par()/imxfb_activate_var() are called (for example
-when using SDL).
-Setting these registers in imxfb_set_par()/imxfb_activate_var() has the side
-effect (for example) of shutting down the backlight when opening an 8bits
-SDL screen.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: linux-2.6.29/drivers/video/imxfb.c
-===================================================================
---- linux-2.6.29.orig/drivers/video/imxfb.c 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29/drivers/video/imxfb.c 2009-05-20 14:58:44.000000000 +0200
-@@ -437,6 +437,7 @@
- pr_debug("var: yres=%d vslen=%d um=%d bm=%d\n",
- var->yres, var->vsync_len,
- var->upper_margin, var->lower_margin);
-+ pr_debug("var: bpp=%d\n", var->bits_per_pixel);
-
- #if DEBUG_VAR
- if (var->xres < 16 || var->xres > 1024)
-@@ -478,9 +479,6 @@
- writel(SIZE_XMAX(var->xres) | SIZE_YMAX(var->yres),
- fbi->regs + LCDC_SIZE);
- writel(fbi->pcr, fbi->regs + LCDC_PCR);
-- writel(fbi->pwmr, fbi->regs + LCDC_PWMR);
-- writel(fbi->lscr1, fbi->regs + LCDC_LSCR1);
-- writel(fbi->dmacr, fbi->regs + LCDC_DMACR);
-
- return 0;
- }
-@@ -661,6 +659,12 @@
- goto failed_cmap;
-
- imxfb_set_par(info);
-+ /* JB: The following parameters are only needed once at startup and so
-+ removed from from imxfb_set_par()/imxfb_activate_var() */
-+ writel(fbi->pwmr, fbi->regs + LCDC_PWMR);
-+ writel(fbi->lscr1, fbi->regs + LCDC_LSCR1);
-+ writel(fbi->dmacr, fbi->regs + LCDC_DMACR);
-+
- ret = register_framebuffer(info);
- if (ret < 0) {
- dev_err(&pdev->dev, "failed to register framebuffer\n");
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/326-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/326-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch 2009-05-26 16:35:12 UTC (rev 1307)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/326-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch 2009-05-26 17:48:59 UTC (rev 1308)
@@ -1,24 +0,0 @@
-On most LCDs (at least Sharp's one) LCD logic needs to be activated before
-powering on the backlight, otherwise some display's startup artefacts
-will be seen.
-
-Signed-off-by: Nicolas Colombain <nic...@ar...>
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: linux-2.6.29/drivers/video/imxfb.c
-===================================================================
---- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-20 14:40:14.000000000 +0200
-+++ linux-2.6.29/drivers/video/imxfb.c 2009-05-20 14:40:14.000000000 +0200
-@@ -373,10 +373,10 @@
-
- writel(RMCR_LCDC_EN, fbi->regs + LCDC_RMCR);
-
-- if (fbi->backlight_power)
-- fbi->backlight_power(1);
- if (fbi->lcd_power)
- fbi->lcd_power(1);
-+ if (fbi->backlight_power)
-+ fbi->backlight_power(1);
- }
-
- static void imxfb_disable_controller(struct imxfb_info *fbi)
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-armadeus-imxfb-supports_8bpp_in_tft_mode.patch 2009-05-26 16:35:12 UTC (rev 1307)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-armadeus-imxfb-supports_8bpp_in_tft_mode.patch 2009-05-26 17:48:59 UTC (rev 1308)
@@ -1,56 +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 16:45:13.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-26 16:59:42.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 16:58:36.000000000 +0200
-+++ linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-26 16:59:23.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-26 16:45:14.000000000 +0200
-+++ linux-2.6.29/drivers/video/imxfb.c 2009-05-26 16:57:31.000000000 +0200
-@@ -497,7 +497,18 @@
-
- writel(SIZE_XMAX(var->xres) | SIZE_YMAX(var->yres),
- fbi->regs + LCDC_SIZE);
-- writel(fbi->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((fbi->pcr & (~PCR_BPIX_MASK)) |
-+ PCR_BPIX_8 |
-+ PCR_END_BYTE_SWAP,
-+ fbi->regs + LCDC_PCR);
-+ } else {
-+ writel(fbi->pcr, fbi->regs + LCDC_PCR);
-+ }
-+ writel(VPW_VPW(var->xres * var->bits_per_pixel / 8 / 4), fbi->regs + LCDC_VPW);
-
- return 0;
- }
Copied: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-pengu-imxfb-fix_margin_settings.patch (from rev 1305, trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/328-pengu-imxfb-fix_margin_settings.patch)
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-pengu-imxfb-fix_margin_settings.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-pengu-imxfb-fix_margin_settings.patch 2009-05-26 17:48:59 UTC (rev 1308)
@@ -0,0 +1,31 @@
+From: Sascha Hauer <s....@pe...>
+Date: Sat, 14 Feb 2009 15:29:38 +0000 (+0100)
+Subject: imxfb: Fix margin settings
+X-Git-Tag: v2.6.30-rc1~636^2~29^2~17
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=7e8549bcee00d92040904361cb1840c7a5eda615
+
+imxfb: Fix margin settings
+
+The var->hsync_len, var->right_margin and var->left_margin fields
+should contain the real values, not the hardware dependent values.
+
+Signed-off-by: Sascha Hauer <s....@pe...>
+---
+
+diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
+index 9dd2757..bd1cb75 100644
+--- a/drivers/video/imxfb.c
++++ b/drivers/video/imxfb.c
+@@ -495,9 +495,9 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
+ info->fix.id, var->lower_margin);
+ #endif
+
+- writel(HCR_H_WIDTH(var->hsync_len) |
+- HCR_H_WAIT_1(var->right_margin) |
+- HCR_H_WAIT_2(var->left_margin),
++ writel(HCR_H_WIDTH(var->hsync_len - 1) |
++ HCR_H_WAIT_1(var->right_margin - 1) |
++ HCR_H_WAIT_2(var->left_margin - 3),
+ fbi->regs + LCDC_HCR);
+
+ writel(VCR_V_WIDTH(var->vsync_len) |
Property changes on: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-pengu-imxfb-fix_margin_settings.patch
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/328-pengu-imxfb-fix_margin_settings.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/328-pengu-imxfb-fix_margin_settings.patch 2009-05-26 16:35:12 UTC (rev 1307)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/328-pengu-imxfb-fix_margin_settings.patch 2009-05-26 17:48:59 UTC (rev 1308)
@@ -1,31 +0,0 @@
-From: Sascha Hauer <s....@pe...>
-Date: Sat, 14 Feb 2009 15:29:38 +0000 (+0100)
-Subject: imxfb: Fix margin settings
-X-Git-Tag: v2.6.30-rc1~636^2~29^2~17
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=7e8549bcee00d92040904361cb1840c7a5eda615
-
-imxfb: Fix margin settings
-
-The var->hsync_len, var->right_margin and var->left_margin fields
-should contain the real values, not the hardware dependent values.
-
-Signed-off-by: Sascha Hauer <s....@pe...>
----
-
-diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
-index 9dd2757..bd1cb75 100644
---- a/drivers/video/imxfb.c
-+++ b/drivers/video/imxfb.c
-@@ -495,9 +495,9 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
- info->fix.id, var->lower_margin);
- #endif
-
-- writel(HCR_H_WIDTH(var->hsync_len) |
-- HCR_H_WAIT_1(var->right_margin) |
-- HCR_H_WAIT_2(var->left_margin),
-+ writel(HCR_H_WIDTH(var->hsync_len - 1) |
-+ HCR_H_WAIT_1(var->right_margin - 1) |
-+ HCR_H_WAIT_2(var->left_margin - 3),
- fbi->regs + LCDC_HCR);
-
- writel(VCR_V_WIDTH(var->vsync_len) |
Copied: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch (from rev 1305, trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/326-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch)
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch 2009-05-26 17:48:59 UTC (rev 1308)
@@ -0,0 +1,24 @@
+On most LCDs (at least Sharp's one) LCD logic needs to be activated before
+powering on the backlight, otherwise some display's startup artefacts
+will be seen.
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29/drivers/video/imxfb.c
+===================================================================
+--- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-26 19:35:11.000000000 +0200
++++ linux-2.6.29/drivers/video/imxfb.c 2009-05-26 19:37:34.000000000 +0200
+@@ -392,10 +392,10 @@
+
+ writel(RMCR_LCDC_EN, fbi->regs + LCDC_RMCR);
+
+- if (fbi->backlight_power)
+- fbi->backlight_power(1);
+ if (fbi->lcd_power)
+ fbi->lcd_power(1);
++ if (fbi->backlight_power)
++ fbi->backlight_power(1);
+ }
+
+ static void imxfb_disable_controller(struct imxfb_info *fbi)
Property changes on: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-improvements.patch (from rev 1305, trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/013-armadeus-imxfb-improvements.patch)
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-improvements.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-improvements.patch 2009-05-26 17:48:59 UTC (rev 1308)
@@ -0,0 +1,44 @@
+PWMR, LSCR1 and DMACR registers only need to be initialized once at startup,
+not every time imxfb_set_par()/imxfb_activate_var() are called (for example
+when using SDL).
+Setting these registers in imxfb_set_par()/imxfb_activate_var() has the side
+effect (for example) of shutting down the backlight when opening an 8bits
+SDL screen.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29/drivers/video/imxfb.c
+===================================================================
+--- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-26 19:35:11.000000000 +0200
++++ linux-2.6.29/drivers/video/imxfb.c 2009-05-26 19:37:20.000000000 +0200
+@@ -456,6 +456,7 @@
+ pr_debug("var: yres=%d vslen=%d um=%d bm=%d\n",
+ var->yres, var->vsync_len,
+ var->upper_margin, var->lower_margin);
++ pr_debug("var: bpp=%d\n", var->bits_per_pixel);
+
+ #if DEBUG_VAR
+ if (var->xres < 16 || var->xres > 1024)
+@@ -497,9 +498,6 @@
+ writel(SIZE_XMAX(var->xres) | SIZE_YMAX(var->yres),
+ fbi->regs + LCDC_SIZE);
+ writel(fbi->pcr, fbi->regs + LCDC_PCR);
+- writel(fbi->pwmr, fbi->regs + LCDC_PWMR);
+- writel(fbi->lscr1, fbi->regs + LCDC_LSCR1);
+- writel(fbi->dmacr, fbi->regs + LCDC_DMACR);
+
+ return 0;
+ }
+@@ -686,6 +684,12 @@
+ goto failed_cmap;
+
+ imxfb_set_par(info);
++ /* JB: The following parameters are only needed once at startup and so
++ removed from from imxfb_set_par()/imxfb_activate_var() */
++ writel(fbi->pwmr, fbi->regs + LCDC_PWMR);
++ writel(fbi->lscr1, fbi->regs + LCDC_LSCR1);
++ writel(fbi->dmacr, fbi->regs + LCDC_DMACR);
++
+ ret = register_framebuffer(info);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "failed to register framebuffer\n");
Property changes on: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-improvements.patch
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch (from rev 1306, trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-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 (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch 2009-05-26 17:48:59 UTC (rev 1308)
@@ -0,0 +1,56 @@
+
+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 16:45:13.000000000 +0200
++++ linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-26 16:59:42.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 16:58:36.000000000 +0200
++++ linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-26 16:59:23.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-26 16:45:14.000000000 +0200
++++ linux-2.6.29/drivers/video/imxfb.c 2009-05-26 16:57:31.000000000 +0200
+@@ -497,7 +497,18 @@
+
+ writel(SIZE_XMAX(var->xres) | SIZE_YMAX(var->yres),
+ fbi->regs + LCDC_SIZE);
+- writel(fbi->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((fbi->pcr & (~PCR_BPIX_MASK)) |
++ PCR_BPIX_8 |
++ PCR_END_BYTE_SWAP,
++ fbi->regs + LCDC_PCR);
++ } else {
++ writel(fbi->pcr, fbi->regs + LCDC_PCR);
++ }
++ writel(VPW_VPW(var->xres * var->bits_per_pixel / 8 / 4), fbi->regs + LCDC_VPW);
+
+ return 0;
+ }
Property changes on: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
___________________________________________________________________
Added: svn:mergeinfo
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
