projects/linux·commit 0f1493a6

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6

0f1493a6 · Linus Torvalds <[email protected]> · 2011-05-25 08:42:37 -07:00

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6: (126 commits)
  sh_mobile_meram: Safely disable MERAM operation when not initialized
  video: mb862xxfb: add support for L1 displaying
  video: mb862xx: add support for controller's I2C bus adapter
  video: mb862xxfb: relocate register space to get contiguous vram
  video: mb862xxfb: use pre-initialized configuration for PCI GDCs
  video: mb862xxfb: correct fix.smem_len field initialization
  video: s3c-fb: correct transparency checking in 32bpp
  video: s3c-fb: add gpio setup function to resume function
  fbdev/amifb: Remove superfluous alignment of frame buffer memory
  fbdev/amifb: Do not call panic() if there's not enough Chip RAM
  fbdev/amifb: Correct check for video memory size
  video: mb862xxfb: Require either FB_MB862XX_PCI_GDC or FB_MB862XX_LIME
  video: s3c-fb: add window variant information for S5P
  video: s3c-fb: add additional validate bpps
  video: s3c-fb: correct window osd size offset values
  udlfb: include prefetch.h explicitly
  drivers/video/s3c2410fb.c: Convert release_resource to release_mem_region
  drivers/video/sm501fb.c: Convert release_resource to release_mem_region
  drivers/video: Convert release_resource to release_mem_region
  video, udlfb: Fix two build warnings about 'ignoring return value'
  ...
Commit
0f1493a60167cf6333626456d3fc8aff4e6fa237
Parents
023bc8e7 · 087faf77

Merge commit. Changes below are compared with the first parent: 023bc8e7.

Changes

82 files changed · +6771 −2272

FileStatusAddDelContent
arch/arm/mach-omap2/board-3430sdp.cmodified+2−2View file
arch/arm/mach-omap2/board-4430sdp.cmodified+10−1View file
arch/arm/mach-omap2/board-am3517evm.cmodified+2−2View file
arch/arm/mach-omap2/board-cm-t35.cmodified+2−2View file
arch/arm/mach-omap2/board-devkit8000.cmodified+2−2View file
arch/arm/mach-omap2/board-igep0020.cmodified+2−2View file
arch/arm/mach-omap2/board-omap3beagle.cmodified+2−2View file
arch/arm/mach-omap2/board-omap3evm.cmodified+2−2View file
arch/arm/mach-omap2/board-omap3pandora.cmodified+1−1View file
arch/arm/mach-omap2/board-omap3stalker.cmodified+2−2View file
arch/arm/mach-omap2/board-omap4panda.cmodified+2−2View file
arch/arm/mach-omap2/board-overo.cmodified+2−2View file
arch/arm/mach-omap2/board-rx51-video.cmodified+1−1View file
arch/arm/mach-omap2/board-zoom-display.cmodified+1−1View file
arch/arm/mach-omap2/display.cmodified+50−27View file
arch/arm/mach-omap2/include/mach/board-zoom.hmodified+1−1View file
drivers/media/video/omap/omap_vout.cmodified+1−1View file
drivers/media/video/omap/omap_voutdef.hmodified+1−1View file
drivers/video/Kconfigmodified+38−4View file
drivers/video/Makefilemodified+1−0View file
drivers/video/amifb.cmodified+16−11View file
drivers/video/da8xx-fb.cmodified+2−2View file
drivers/video/efifb.cmodified+2−2View file
drivers/video/mb862xx/Makefilemodified+4−1View file
drivers/video/mb862xx/mb862xx-i2c.cadded+177−0View file
drivers/video/mb862xx/mb862xx_reg.hmodified+54−4View file
drivers/video/mb862xx/mb862xxfb.hmodified+36−0View file
drivers/video/mb862xx/mb862xxfb.c → drivers/video/mb862xx/mb862xxfbdrv.crenamed+145−7View file
drivers/video/omap/dispc.cmodified+2−2View file
drivers/video/omap/omapfb_main.cmodified+1−1View file
drivers/video/omap/rfbi.cmodified+1−1View file
drivers/video/omap2/Makefilemodified+2−2View file
drivers/video/omap2/displays/Kconfigmodified+5−4View file
drivers/video/omap2/displays/panel-acx565akm.cmodified+1−1View file
drivers/video/omap2/displays/panel-generic-dpi.cmodified+54−3View file
drivers/video/omap2/displays/panel-lgphilips-lb035q02.cmodified+1−1View file
drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.cmodified+1−1View file
drivers/video/omap2/displays/panel-sharp-ls037v7dw01.cmodified+3−3View file
drivers/video/omap2/displays/panel-taal.cmodified+446−90View file
drivers/video/omap2/displays/panel-tpo-td043mtea1.cmodified+6−4View file
drivers/video/omap2/dss/Kconfigmodified+24−9View file
drivers/video/omap2/dss/core.cmodified+8−7View file
drivers/video/omap2/dss/dispc.cmodified+870−682View file
drivers/video/omap2/dss/dispc.hadded+691−0View file
drivers/video/omap2/dss/display.cmodified+30−16View file
drivers/video/omap2/dss/dpi.cmodified+68−45View file
drivers/video/omap2/dss/dsi.cmodified+1590−777View file
drivers/video/omap2/dss/dss.cmodified+82−36View file
drivers/video/omap2/dss/dss.hmodified+61−37View file
drivers/video/omap2/dss/dss_features.cmodified+84−21View file
drivers/video/omap2/dss/dss_features.hmodified+25−14View file
drivers/video/omap2/dss/hdmi.cmodified+446−15View file
drivers/video/omap2/dss/hdmi.hmodified+219−3View file
drivers/video/omap2/dss/hdmi_omap4_panel.cmodified+1−1View file
drivers/video/omap2/dss/manager.cmodified+12−2View file
drivers/video/omap2/dss/overlay.cmodified+31−12View file
drivers/video/omap2/dss/rfbi.cmodified+30−146View file
drivers/video/omap2/dss/sdi.cmodified+1−1View file
drivers/video/omap2/dss/venc.cmodified+16−7View file
drivers/video/omap2/omapfb/omapfb-ioctl.cmodified+11−3View file
drivers/video/omap2/omapfb/omapfb-main.cmodified+131−100View file
drivers/video/omap2/omapfb/omapfb-sysfs.cmodified+15−8View file
drivers/video/omap2/omapfb/omapfb.hmodified+5−3View file
drivers/video/s3c-fb.cmodified+95−26View file
drivers/video/s3c2410fb.cmodified+3−5View file
drivers/video/s3fb.cmodified+202−7View file
drivers/video/savage/savagefb-i2c.cmodified+2−0View file
drivers/video/savage/savagefb.hmodified+5−3View file
drivers/video/savage/savagefb_driver.cmodified+10−5View file
drivers/video/sh7760fb.cmodified+2−4View file
drivers/video/sh_mobile_hdmi.cmodified+8−2View file
drivers/video/sh_mobile_lcdcfb.cmodified+106−20View file
drivers/video/sh_mobile_lcdcfb.hmodified+1−0View file
drivers/video/sh_mobile_meram.cadded+567−0View file
drivers/video/sh_mobile_meram.hadded+41−0View file
drivers/video/sm501fb.cmodified+12−12View file
drivers/video/udlfb.cmodified+17−3View file
arch/arm/plat-omap/include/plat/panel-generic-dpi.h → include/video/omap-panel-generic-dpi.hrenamed+4−4View file
arch/arm/plat-omap/include/plat/nokia-dsi-panel.h → include/video/omap-panel-nokia-dsi.hrenamed+8−6View file
arch/arm/plat-omap/include/plat/display.h → include/video/omapdss.hrenamed+82−32View file
include/video/sh_mobile_lcdc.hmodified+3−0View file
include/video/sh_mobile_meram.hadded+68−0View file

Only the first 600 diff lines are shown. Download the complete patch.

arch/arm/mach-omap2/board-3430sdp.c

View file
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 9afd087..23244cd 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -37,8 +37,8 @@
#include <plat/common.h>
#include <plat/dma.h>
#include <plat/gpmc.h>
-#include <plat/display.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omapdss.h>
+#include <video/omap-panel-generic-dpi.h>
#include <plat/gpmc-smc91x.h>

arch/arm/mach-omap2/board-4430sdp.c

View file
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 56702c5..93edd7f 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -36,7 +36,7 @@
#include <plat/usb.h>
#include <plat/mmc.h>
#include <plat/omap4-keypad.h>
-#include <plat/display.h>
+#include <video/omapdss.h>
#include "mux.h"
#include "hsmmc.h"
@@ -680,6 +680,15 @@ static struct omap_dss_device sdp4430_hdmi_device = {
.name = "hdmi",
.driver_name = "hdmi_panel",
.type = OMAP_DISPLAY_TYPE_HDMI,
+ .clocks = {
+ .dispc = {
+ .dispc_fclk_src = OMAP_DSS_CLK_SRC_FCK,
+ },
+ .hdmi = {
+ .regn = 15,
+ .regm2 = 1,
+ },
+ },
.platform_enable = sdp4430_panel_enable_hdmi,
.platform_disable = sdp4430_panel_disable_hdmi,
.channel = OMAP_DSS_CHANNEL_DIGIT,

arch/arm/mach-omap2/board-am3517evm.c

View file
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c
index ce7d5e6..ff8c59b 100644
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@ -34,8 +34,8 @@
#include <plat/board.h>
#include <plat/common.h>
#include <plat/usb.h>
-#include <plat/display.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omapdss.h>
+#include <video/omap-panel-generic-dpi.h>
#include "mux.h"
#include "control.h"

arch/arm/mach-omap2/board-cm-t35.c

View file
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 02a12b4..9340f6a 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -45,8 +45,8 @@
#include <plat/nand.h>
#include <plat/gpmc.h>
#include <plat/usb.h>
-#include <plat/display.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omapdss.h>
+#include <video/omap-panel-generic-dpi.h>
#include <plat/mcspi.h>
#include <mach/hardware.h>

arch/arm/mach-omap2/board-devkit8000.c

View file
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c
index 65f9fde..1d1b56a 100644
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@ -45,8 +45,8 @@
#include <plat/gpmc.h>
#include <plat/nand.h>
#include <plat/usb.h>
-#include <plat/display.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omapdss.h>
+#include <video/omap-panel-generic-dpi.h>
#include <plat/mcspi.h>
#include <linux/input/matrix_keypad.h>

arch/arm/mach-omap2/board-igep0020.c

View file
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 34cf982..3da64d3 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -31,8 +31,8 @@
#include <plat/common.h>
#include <plat/gpmc.h>
#include <plat/usb.h>
-#include <plat/display.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omapdss.h>
+#include <video/omap-panel-generic-dpi.h>
#include <plat/onenand.h>
#include "mux.h"

arch/arm/mach-omap2/board-omap3beagle.c

View file
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 33007fd..97750d4 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -41,8 +41,8 @@
#include <plat/board.h>
#include <plat/common.h>
-#include <plat/display.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omapdss.h>
+#include <video/omap-panel-generic-dpi.h>
#include <plat/gpmc.h>
#include <plat/nand.h>
#include <plat/usb.h>

arch/arm/mach-omap2/board-omap3evm.c

View file
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 5a1a916..7f94ccc 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -44,8 +44,8 @@
#include <plat/usb.h>
#include <plat/common.h>
#include <plat/mcspi.h>
-#include <plat/display.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omapdss.h>
+#include <video/omap-panel-generic-dpi.h>
#include "mux.h"
#include "sdram-micron-mt46h32m32lf-6.h"

arch/arm/mach-omap2/board-omap3pandora.c

View file
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index 07dba88..1db1549 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -46,7 +46,7 @@
#include <mach/hardware.h>
#include <plat/mcspi.h>
#include <plat/usb.h>
-#include <plat/display.h>
+#include <video/omapdss.h>
#include <plat/nand.h>
#include "mux.h"

arch/arm/mach-omap2/board-omap3stalker.c

View file
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index a6e0b91..a72c90a 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -39,8 +39,8 @@
#include <plat/gpmc.h>
#include <plat/nand.h>
#include <plat/usb.h>
-#include <plat/display.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omapdss.h>
+#include <video/omap-panel-generic-dpi.h>
#include <plat/mcspi.h>
#include <linux/input/matrix_keypad.h>

arch/arm/mach-omap2/board-omap4panda.c

View file
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index f3a7b10..e4973ac 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -34,13 +34,13 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
-#include <plat/display.h>
+#include <video/omapdss.h>
#include <plat/board.h>
#include <plat/common.h>
#include <plat/usb.h>
#include <plat/mmc.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omap-panel-generic-dpi.h>
#include "timer-gp.h"
#include "hsmmc.h"

arch/arm/mach-omap2/board-overo.c

View file
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 59ca333..9d192ff 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -43,8 +43,8 @@
#include <plat/board.h>
#include <plat/common.h>
-#include <plat/display.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omapdss.h>
+#include <video/omap-panel-generic-dpi.h>
#include <mach/gpio.h>
#include <plat/gpmc.h>
#include <mach/hardware.h>

arch/arm/mach-omap2/board-rx51-video.c

View file
diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c
index 89a66db..2df10b6 100644
--- a/arch/arm/mach-omap2/board-rx51-video.c
+++ b/arch/arm/mach-omap2/board-rx51-video.c
@@ -15,7 +15,7 @@
#include <linux/spi/spi.h>
#include <linux/mm.h>
#include <asm/mach-types.h>
-#include <plat/display.h>
+#include <video/omapdss.h>
#include <plat/vram.h>
#include <plat/mcspi.h>

arch/arm/mach-omap2/board-zoom-display.c

View file
diff --git a/arch/arm/mach-omap2/board-zoom-display.c b/arch/arm/mach-omap2/board-zoom-display.c
index 37b84c2..60e8645 100644
--- a/arch/arm/mach-omap2/board-zoom-display.c
+++ b/arch/arm/mach-omap2/board-zoom-display.c
@@ -15,7 +15,7 @@
#include <linux/i2c/twl.h>
#include <linux/spi/spi.h>
#include <plat/mcspi.h>
-#include <plat/display.h>
+#include <video/omapdss.h>
#define LCD_PANEL_RESET_GPIO_PROD 96
#define LCD_PANEL_RESET_GPIO_PILOT 55

arch/arm/mach-omap2/display.c

View file
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index 256d23f..543fcb8 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -22,7 +22,7 @@
#include <linux/clk.h>
#include <linux/err.h>
-#include <plat/display.h>
+#include <video/omapdss.h>
#include <plat/omap_hwmod.h>
#include <plat/omap_device.h>
@@ -56,37 +56,58 @@ static bool opt_clock_available(const char *clk_role)
return false;
}
+struct omap_dss_hwmod_data {
+ const char *oh_name;
+ const char *dev_name;
+ const int id;
+};
+
+static const struct omap_dss_hwmod_data omap2_dss_hwmod_data[] __initdata = {
+ { "dss_core", "omapdss_dss", -1 },
+ { "dss_dispc", "omapdss_dispc", -1 },
+ { "dss_rfbi", "omapdss_rfbi", -1 },
+ { "dss_venc", "omapdss_venc", -1 },
+};
+
+static const struct omap_dss_hwmod_data omap3_dss_hwmod_data[] __initdata = {
+ { "dss_core", "omapdss_dss", -1 },
+ { "dss_dispc", "omapdss_dispc", -1 },
+ { "dss_rfbi", "omapdss_rfbi", -1 },
+ { "dss_venc", "omapdss_venc", -1 },
+ { "dss_dsi1", "omapdss_dsi1", -1 },
+};
+
+static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = {
+ { "dss_core", "omapdss_dss", -1 },
+ { "dss_dispc", "omapdss_dispc", -1 },
+ { "dss_rfbi", "omapdss_rfbi", -1 },
+ { "dss_venc", "omapdss_venc", -1 },
+ { "dss_dsi1", "omapdss_dsi1", -1 },
+ { "dss_dsi2", "omapdss_dsi2", -1 },
+ { "dss_hdmi", "omapdss_hdmi", -1 },
+};
+
int __init omap_display_init(struct omap_dss_board_info *board_data)
{
int r = 0;
struct omap_hwmod *oh;
struct omap_device *od;
- int i;
+ int i, oh_count;
struct omap_display_platform_data pdata;
-
- /*
- * omap: valid DSS hwmod names
- * omap2,3,4: dss_core, dss_dispc, dss_rfbi, dss_venc
- * omap3,4: dss_dsi1
- * omap4: dss_dsi2, dss_hdmi
- */
- char *oh_name[] = { "dss_core", "dss_dispc", "dss_rfbi", "dss_venc",
- "dss_dsi1", "dss_dsi2", "dss_hdmi" };
- char *dev_name[] = { "omapdss_dss", "omapdss_dispc", "omapdss_rfbi",
- "omapdss_venc", "omapdss_dsi1", "omapdss_dsi2",
- "omapdss_hdmi" };
- int oh_count;
+ const struct omap_dss_hwmod_data *curr_dss_hwmod;
memset(&pdata, 0, sizeof(pdata));
- if (cpu_is_omap24xx())
- oh_count = ARRAY_SIZE(oh_name) - 3;
- /* last 3 hwmod dev in oh_name are not available for omap2 */
- else if (cpu_is_omap44xx())
- oh_count = ARRAY_SIZE(oh_name);
- else
- oh_count = ARRAY_SIZE(oh_name) - 2;
- /* last 2 hwmod dev in oh_name are not available for omap3 */
+ if (cpu_is_omap24xx()) {
+ curr_dss_hwmod = omap2_dss_hwmod_data;
+ oh_count = ARRAY_SIZE(omap2_dss_hwmod_data);
+ } else if (cpu_is_omap34xx()) {
+ curr_dss_hwmod = omap3_dss_hwmod_data;
+ oh_count = ARRAY_SIZE(omap3_dss_hwmod_data);
+ } else {
+ curr_dss_hwmod = omap4_dss_hwmod_data;
+ oh_count = ARRAY_SIZE(omap4_dss_hwmod_data);
+ }
/* opt_clks are always associated with dss hwmod */
oh_core = omap_hwmod_lookup("dss_core");
@@ -100,19 +121,21 @@ int __init omap_display_init(struct omap_dss_board_info *board_data)
pdata.opt_clock_available = opt_clock_available;
for (i = 0; i < oh_count; i++) {
- oh = omap_hwmod_lookup(oh_name[i]);
+ oh = omap_hwmod_lookup(curr_dss_hwmod[i].oh_name);
if (!oh) {
- pr_err("Could not look up %s\n", oh_name[i]);
+ pr_err("Could not look up %s\n",
+ curr_dss_hwmod[i].oh_name);
return -ENODEV;
}
- od = omap_device_build(dev_name[i], -1, oh, &pdata,
+ od = omap_device_build(curr_dss_hwmod[i].dev_name,
+ curr_dss_hwmod[i].id, oh, &pdata,
sizeof(struct omap_display_platform_data),
omap_dss_latency,
ARRAY_SIZE(omap_dss_latency), 0);
if (WARN((IS_ERR(od)), "Could not build omap_device for %s\n",
- oh_name[i]))
+ curr_dss_hwmod[i].oh_name))
return -ENODEV;
}
omap_display_device.dev.platform_data = board_data;

arch/arm/mach-omap2/include/mach/board-zoom.h

View file
diff --git a/arch/arm/mach-omap2/include/mach/board-zoom.h b/arch/arm/mach-omap2/include/mach/board-zoom.h
index d20bd9c..775fdc3 100644
--- a/arch/arm/mach-omap2/include/mach/board-zoom.h
+++ b/arch/arm/mach-omap2/include/mach/board-zoom.h
@@ -1,7 +1,7 @@
/*
* Defines for zoom boards
*/
-#include <plat/display.h>
+#include <video/omapdss.h>
#define ZOOM_NAND_CS 0

drivers/media/video/omap/omap_vout.c

View file
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
index d4fe7bc..4ada9be 100644
--- a/drivers/media/video/omap/omap_vout.c
+++ b/drivers/media/video/omap/omap_vout.c
@@ -47,7 +47,7 @@
#include <plat/dma.h>
#include <plat/vram.h>
#include <plat/vrfb.h>
-#include <plat/display.h>
+#include <video/omapdss.h>
#include "omap_voutlib.h"
#include "omap_voutdef.h"

drivers/media/video/omap/omap_voutdef.h

View file
diff --git a/drivers/media/video/omap/omap_voutdef.h b/drivers/media/video/omap/omap_voutdef.h
index ea3a047..659497b 100644
--- a/drivers/media/video/omap/omap_voutdef.h
+++ b/drivers/media/video/omap/omap_voutdef.h
@@ -11,7 +11,7 @@
#ifndef OMAP_VOUTDEF_H
#define OMAP_VOUTDEF_H
-#include <plat/display.h>
+#include <video/omapdss.h>
#define YUYV_BPP 2
#define RGB565_BPP 2

drivers/video/Kconfig

View file
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index f9916ca..549b960 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1460,6 +1460,14 @@ config FB_S3
---help---
Driver for graphics boards with S3 Trio / S3 Virge chip.
+config FB_S3_DDC
+ bool "DDC for S3 support"
+ depends on FB_S3
+ select FB_DDC
+ default y
+ help
+ Say Y here if you want DDC support for your S3 graphics card.
+
config FB_SAVAGE
tristate "S3 Savage support"
depends on FB && PCI && EXPERIMENTAL
@@ -1983,6 +1991,18 @@ config FB_SH_MOBILE_HDMI
---help---
Driver for the on-chip SH-Mobile HDMI controller.
+config FB_SH_MOBILE_MERAM
+ tristate "SuperH Mobile MERAM read ahead support for LCDC"
+ depends on FB_SH_MOBILE_LCDC
+ default y
+ ---help---
+ Enable MERAM support for the SH-Mobile LCD controller.
+
+ This will allow for caching of the framebuffer to provide more
+ reliable access under heavy main memory bus traffic situations.
+ Up to 4 memory channels can be configured, allowing 4 RGB or
+ 2 YCbCr framebuffers to be configured.
+
config FB_TMIO
tristate "Toshiba Mobile IO FrameBuffer support"
depends on FB && MFD_CORE
@@ -2246,29 +2266,43 @@ config FB_METRONOME
config FB_MB862XX
tristate "Fujitsu MB862xx GDC support"
depends on FB
+ depends on PCI || (OF && PPC)
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
---help---
Frame buffer driver for Fujitsu Carmine/Coral-P(A)/Lime controllers.
+choice
+ prompt "GDC variant"
+ depends on FB_MB862XX
+
config FB_MB862XX_PCI_GDC
bool "Carmine/Coral-P(A) GDC"
- depends on PCI && FB_MB862XX
+ depends on PCI
---help---
This enables framebuffer support for Fujitsu Carmine/Coral-P(A)
PCI graphics controller devices.
config FB_MB862XX_LIME
bool "Lime GDC"
- depends on FB_MB862XX
- depends on OF && !FB_MB862XX_PCI_GDC
- depends on PPC
+ depends on OF && PPC
select FB_FOREIGN_ENDIAN
select FB_LITTLE_ENDIAN
---help---
Framebuffer support for Fujitsu Lime GDC on host CPU bus.
+endchoice
+
+config FB_MB862XX_I2C
+ bool "Support I2C bus on MB862XX GDC"
+ depends on FB_MB862XX && I2C
+ default y
+ help
+ Selecting this option adds Coral-P(A)/Lime GDC I2C bus adapter
+ driver to support accessing I2C devices on controller's I2C bus.
+ These are usually some video decoder chips.
+
config FB_EP93XX
tristate "EP93XX frame buffer support"
depends on FB && ARCH_EP93XX

drivers/video/Makefile

View file
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 2ea44b6..8b83129 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -130,6 +130,7 @@ obj-$(CONFIG_FB_UDL) += udlfb.o
obj-$(CONFIG_FB_XILINX) += xilinxfb.o
obj-$(CONFIG_SH_MIPI_DSI) += sh_mipi_dsi.o
obj-$(CONFIG_FB_SH_MOBILE_HDMI) += sh_mobile_hdmi.o
+obj-$(CONFIG_FB_SH_MOBILE_MERAM) += sh_mobile_meram.o
obj-$(CONFIG_FB_SH_MOBILE_LCDC) += sh_mobile_lcdcfb.o
obj-$(CONFIG_FB_OMAP) += omap/
obj-y += omap2/

drivers/video/amifb.c

View file
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index e5d6b56..5ea6596 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -2224,22 +2224,23 @@ static int amifb_ioctl(struct fb_info *info,
* Allocate, Clear and Align a Block of Chip Memory
*/
-static u_long unaligned_chipptr = 0;
+static void *aligned_chipptr;
static inline u_long __init chipalloc(u_long size)
{
- size += PAGE_SIZE-1;
- if (!(unaligned_chipptr = (u_long)amiga_chip_alloc(size,
- "amifb [RAM]")))
- panic("No Chip RAM for frame buffer");
- memset((void *)unaligned_chipptr, 0, size);
- return PAGE_ALIGN(unaligned_chipptr);
+ aligned_chipptr = amiga_chip_alloc(size, "amifb [RAM]");
+ if (!aligned_chipptr) {
+ pr_err("amifb: No Chip RAM for frame buffer");
+ return 0;
+ }
+ memset(aligned_chipptr, 0, size);
+ return (u_long)aligned_chipptr;
}
static inline void chipfree(void)
{
- if (unaligned_chipptr)
- amiga_chip_free((void *)unaligned_chipptr);
+ if (aligned_chipptr)
+ amiga_chip_free(aligned_chipptr);
}
@@ -2295,7 +2296,7 @@ default_chipset:
defmode = amiga_vblank == 50 ? DEFMODE_PAL
: DEFMODE_NTSC;
if (amiga_chip_avail()-CHIPRAM_SAFETY_LIMIT >
- VIDEOMEMSIZE_ECS_1M)
+ VIDEOMEMSIZE_ECS_2M)
fb_info.fix.smem_len = VIDEOMEMSIZE_ECS_2M;
else
fb_info.fix.smem_len = VIDEOMEMSIZE_ECS_1M;
@@ -2312,7 +2313,7 @@ default_chipset:
maxfmode = TAG_FMODE_4;
defmode = DEFMODE_AGA;
if (amiga_chip_avail()-CHIPRAM_SAFETY_LIMIT >
- VIDEOMEMSIZE_AGA_1M)
+ VIDEOMEMSIZE_AGA_2M)
fb_info.fix.smem_len = VIDEOMEMSIZE_AGA_2M;
else
fb_info.fix.smem_len = VIDEOMEMSIZE_AGA_1M;
@@ -2385,6 +2386,10 @@ default_chipset:
DUMMYSPRITEMEMSIZE+
COPINITSIZE+
4*COPLISTSIZE);
+ if (!chipptr) {
+ err = -ENOMEM;
+ goto amifb_error;
+ }
assignchunk(videomemory, u_long, chipptr, fb_info.fix.smem_len);
assignchunk(spritememory, u_long, chipptr, SPRITEMEMSIZE);

drivers/video/da8xx-fb.c

View file
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index 8b7d473..fcdac87 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -899,7 +899,7 @@ static struct fb_ops da8xx_fb_ops = {
.fb_blank = cfb_blank,
};
-static int __init fb_probe(struct platform_device *device)
+static int __devinit fb_probe(struct platform_device *device)
{
struct da8xx_lcdc_platform_data *fb_pdata =
device->dev.platform_data;
@@ -1165,7 +1165,7 @@ static int fb_resume(struct platform_device *dev)
static struct platform_driver da8xx_fb_driver = {
.probe = fb_probe,
- .remove = fb_remove,
+ .remove = __devexit_p(fb_remove),
.suspend = fb_suspend,
.resume = fb_resume,
.driver = {

drivers/video/efifb.c

View file
diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c
index 4eb38db..fb20584 100644
--- a/drivers/video/efifb.c
+++ b/drivers/video/efifb.c
@@ -242,9 +242,9 @@ static int set_system(const struct dmi_system_id *id)
return 0;
}
- printk(KERN_INFO "efifb: dmi detected %s - framebuffer at %p "
+ printk(KERN_INFO "efifb: dmi detected %s - framebuffer at 0x%08x "
"(%dx%d, stride %d)\n", id->ident,
- (void *)screen_info.lfb_base, screen_info.lfb_width,
+ screen_info.lfb_base, screen_info.lfb_width,
screen_info.lfb_height, screen_info.lfb_linelength);

drivers/video/mb862xx/Makefile

View file
diff --git a/drivers/video/mb862xx/Makefile b/drivers/video/mb862xx/Makefile
index d777771..5707ed0 100644
--- a/drivers/video/mb862xx/Makefile
+++ b/drivers/video/mb862xx/Makefile
@@ -2,4 +2,7 @@
# Makefile for the MB862xx framebuffer driver
#
-obj-$(CONFIG_FB_MB862XX) := mb862xxfb.o mb862xxfb_accel.o
+obj-$(CONFIG_FB_MB862XX) += mb862xxfb.o
+
+mb862xxfb-y := mb862xxfbdrv.o mb862xxfb_accel.o
+mb862xxfb-$(CONFIG_FB_MB862XX_I2C) += mb862xx-i2c.o

drivers/video/mb862xx/mb862xx-i2c.c

View file
diff --git a/drivers/video/mb862xx/mb862xx-i2c.c b/drivers/video/mb862xx/mb862xx-i2c.c
new file mode 100644
index 0000000..cb77d3b

This diff is incomplete. Download the complete patch.

drivers/video/mb862xx/mb862xx_reg.h

View file

This diff is incomplete. Download the complete patch.

drivers/video/mb862xx/mb862xxfb.h

View file

This diff is incomplete. Download the complete patch.

drivers/video/mb862xx/mb862xxfbdrv.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap/dispc.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap/omapfb_main.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap/rfbi.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/Makefile

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/displays/Kconfig

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/displays/panel-acx565akm.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/displays/panel-generic-dpi.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/displays/panel-lgphilips-lb035q02.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/displays/panel-taal.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/displays/panel-tpo-td043mtea1.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/dss/Kconfig

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/dss/core.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/dss/dispc.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/dss/dispc.h

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/dss/display.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/dss/dpi.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/dss/dsi.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/dss/dss.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/dss/dss.h

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/dss/dss_features.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/dss/dss_features.h

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/dss/hdmi.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/dss/hdmi.h

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/dss/hdmi_omap4_panel.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/dss/manager.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/dss/overlay.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/dss/rfbi.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/dss/sdi.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/dss/venc.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/omapfb/omapfb-ioctl.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/omapfb/omapfb-main.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/omapfb/omapfb-sysfs.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/omap2/omapfb/omapfb.h

View file

This diff is incomplete. Download the complete patch.

drivers/video/s3c-fb.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/s3c2410fb.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/s3fb.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/savage/savagefb-i2c.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/savage/savagefb.h

View file

This diff is incomplete. Download the complete patch.

drivers/video/savage/savagefb_driver.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/sh7760fb.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/sh_mobile_hdmi.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/sh_mobile_lcdcfb.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/sh_mobile_lcdcfb.h

View file

This diff is incomplete. Download the complete patch.

drivers/video/sh_mobile_meram.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/sh_mobile_meram.h

View file

This diff is incomplete. Download the complete patch.

drivers/video/sm501fb.c

View file

This diff is incomplete. Download the complete patch.

drivers/video/udlfb.c

View file

This diff is incomplete. Download the complete patch.

include/video/omap-panel-generic-dpi.h

View file

This diff is incomplete. Download the complete patch.

include/video/omap-panel-nokia-dsi.h

View file

This diff is incomplete. Download the complete patch.

include/video/omapdss.h

View file

This diff is incomplete. Download the complete patch.

include/video/sh_mobile_lcdc.h

View file

This diff is incomplete. Download the complete patch.

include/video/sh_mobile_meram.h

View file

This diff is incomplete. Download the complete patch.