Add i.MX51/53 IPU framebuffer support

The IPU is the Image Processing Unit found on i.MX51/53 SoCs. It features several units for image processing, this patch adds support for the units needed for Framebuffer support, namely:

- Display Controller (dc)
- Display Interface (di)
- Display Multi Fifo Controller (dmfc)
- Display Processor (dp)
- Image DMA Controller (idmac)

This patch is based on the Freescale driver, but follows a different approach. The Freescale code implements logical idmac channels and the handling of the subunits is hidden in common idmac code pathes in big switch/case statements. This patch instead just provides code and resource management for the different subunits. The user, in this case the framebuffer driver, decides how the different units play together.

The IPU has other units missing in this patch:

- CMOS Sensor Interface (csi)
- Video Deinterlacer (vdi)
- Sensor Multi FIFO Controler (smfc)
- Image Converter (ic)
- Image Rotator (irt)

So expect more files to come in this directory.

Signed-off-by Sascha Hauer <[email protected]>

Cc [email protected]

Cc [email protected]

Cc Paul Mundt <[email protected]>

Cc Samuel Ortiz <[email protected]>

---
 arch/arm/plat-mxc/include/mach/ipu-v3.h |   49 +++
 drivers/video/Kconfig                   |    2 +
 drivers/video/Makefile                  |    1 +
 drivers/video/imx-ipu-v3/Makefile       |    3 +
 drivers/video/imx-ipu-v3/ipu-common.c   |  708 +++++++++++++++++++++++++++++++
 drivers/video/imx-ipu-v3/ipu-cpmem.c    |  612 ++++++++++++++++++++++++++
 drivers/video/imx-ipu-v3/ipu-dc.c       |  364 ++++++++++++++++
 drivers/video/imx-ipu-v3/ipu-di.c       |  550 ++++++++++++++++++++++++
 drivers/video/imx-ipu-v3/ipu-dmfc.c     |  355 ++++++++++++++++
 drivers/video/imx-ipu-v3/ipu-dp.c       |  476 +++++++++++++++++++++
 drivers/video/imx-ipu-v3/ipu-prv.h      |  216 ++++++++++
 include/linux/mfd/imx-ipu-v3.h          |  219 ++++++++++
 12 files changed, 3555 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/plat-mxc/include/mach/ipu-v3.h
 create mode 100644 drivers/video/imx-ipu-v3/Makefile
 create mode 100644 drivers/video/imx-ipu-v3/ipu-common.c
 create mode 100644 drivers/video/imx-ipu-v3/ipu-cpmem.c
 create mode 100644 drivers/video/imx-ipu-v3/ipu-dc.c
 create mode 100644 drivers/video/imx-ipu-v3/ipu-di.c
 create mode 100644 drivers/video/imx-ipu-v3/ipu-dmfc.c
 create mode 100644 drivers/video/imx-ipu-v3/ipu-dp.c
 create mode 100644 drivers/video/imx-ipu-v3/ipu-prv.h
 create mode 100644 include/linux/mfd/imx-ipu-v3.h

Quoted 6 lines

drivers/video/Kconfig +0 -0

index 6bafb51b..ffdb37a 100644
@@ -26,6 +26,8 @@ source "drivers/gpu/drm/Kconfig"
 

drivers/video/Kconfig source "drivers/gpu/drm/Kconfig" · line 30

Quoted 4 lines

drivers/video/Kconfig +2 -0

 source "drivers/gpu/stub/Kconfig"
 
+source "drivers/video/imx-ipu-v3/Kconfig"
+

I don't see such a Kconfig file in this patch. Got lost while moving from mfd to video ?

Quoted 10 lines

drivers/video/Kconfig +0 -0

 config VGASTATE
        tristate
        default n

drivers/video/Makefile +0 -0

index 8c8fabd..f4921ab 100644

drivers/video/Makefile obj-$(CONFIG_FB_BFIN_T350MCQB) += bfin-t350mcqb-fb.o · line 156

Quoted 4 lines

drivers/video/Makefile +1 -0

@@ -153,6 +153,7 @@ obj-$(CONFIG_FB_BFIN_T350MCQB)	  += bfin-t350mcqb-fb.o
 obj-$(CONFIG_FB_BFIN_7393)        += bfin_adv7393fb.o
 obj-$(CONFIG_FB_MX3)		  += mx3fb.o
 obj-$(CONFIG_FB_DA8XX)		  += da8xx-fb.o
+obj-$(CONFIG_MFD_IMX_IPU_V3)	  += imx-ipu-v3/

Now that files are in drivers/video, do we want to keep MFD in the name ?

Quoted 6 lines · Arnaud Patard

Quoted 6 lines

drivers/video/Kconfig +0 -0

index 6bafb51b..ffdb37a 100644
@@ -26,6 +26,8 @@ source "drivers/gpu/drm/Kconfig"
 

Quoted 7 lines

drivers/video/Kconfig source "drivers/gpu/drm/Kconfig" · line 30

Quoted 4 lines

drivers/video/Kconfig +2 -0

 source "drivers/gpu/stub/Kconfig"
 
+source "drivers/video/imx-ipu-v3/Kconfig"
+

I don't see such a Kconfig file in this patch. Got lost while moving from mfd to video ?

Oops, yes still untracked in my repository. Will add in the next series.

Quoted 16 lines

Quoted 10 lines

drivers/video/Kconfig +0 -0

 config VGASTATE
        tristate
        default n

drivers/video/Makefile +0 -0

index 8c8fabd..f4921ab 100644

drivers/video/Makefile obj-$(CONFIG_FB_BFIN_T350MCQB) += bfin-t350mcqb-fb.o · line 156

Quoted 4 lines

drivers/video/Makefile +1 -0

@@ -153,6 +153,7 @@ obj-$(CONFIG_FB_BFIN_T350MCQB)	  += bfin-t350mcqb-fb.o
 obj-$(CONFIG_FB_BFIN_7393)        += bfin_adv7393fb.o
 obj-$(CONFIG_FB_MX3)		  += mx3fb.o
 obj-$(CONFIG_FB_DA8XX)		  += da8xx-fb.o
+obj-$(CONFIG_MFD_IMX_IPU_V3)	  += imx-ipu-v3/

Now that files are in drivers/video, do we want to keep MFD in the name ?

I asked myself the same question and had no clear answer. Probably better to remove the MFD.

(quoted diff) +6 -0

+#define MX51_IPU_CHANNEL_CSI0 ? ? ? ? ? ? ? ? ? 0
+#define MX51_IPU_CHANNEL_CSI1 ? ? ? ? ? ? ? ? ? 1
+#define MX51_IPU_CHANNEL_CSI2 ? ? ? ? ? ? ? ? ? 2
+#define MX51_IPU_CHANNEL_CSI3 ? ? ? ? ? ? ? ? ? 3
+#define MX51_IPU_CHANNEL_MEM_BG_SYNC ? ? ? ? ? 23
+#define MX51_IPU_CHANNEL_MEM_FG_SYNC ? ? ? ? ? 27

(quoted diff) +25 -0

+
+ ? ? ? ipu_clk = clk_get(&pdev->dev, "ipu");
+ ? ? ? if (IS_ERR(ipu_clk)) {
+ ? ? ? ? ? ? ? ret = PTR_ERR(ipu_clk);
+ ? ? ? ? ? ? ? dev_err(&pdev->dev, "clk_get failed with %d", ret);
+ ? ? ? ? ? ? ? goto failed_clk_get;
+ ? ? ? }
+
+ ? ? ? ipu_get();
+
+ ? ? ? ret = request_irq(irq1, ipu_irq_handler, IRQF_DISABLED, pdev->name,
+ ? ? ? ? ? ? ? ? ? ? ? &pdev->dev);
+ ? ? ? if (ret) {
+ ? ? ? ? ? ? ? dev_err(&pdev->dev, "request irq %d failed with: %d\n", irq1, ret);
+ ? ? ? ? ? ? ? goto failed_request_irq1;
+ ? ? ? }
+
+ ? ? ? ret = request_irq(irq2, ipu_irq_handler, IRQF_DISABLED, pdev->name,
+ ? ? ? ? ? ? ? ? ? ? ? &pdev->dev);
+ ? ? ? if (ret) {
+ ? ? ? ? ? ? ? dev_err(&pdev->dev, "request irq %d failed with: %d\n", irq2, ret);
+ ? ? ? ? ? ? ? goto failed_request_irq2;
+ ? ? ? }
+
+ ? ? ? ipu_reset();

hi, Sasha,

drivers/video/mx5fb.c line 191

Quoted 6 lines

drivers/video/mx5fb.c new file +6 -0

+       if (var->vmode & FB_VMODE_ODD_FLD_FIRST) /* PAL */
+               sig_cfg.odd_field_first = 1;
+       if (var->sync & FB_SYNC_EXT)
+               sig_cfg.ext_clk = 1;
+       if (var->sync & FB_SYNC_HOR_HIGH_ACT)
+               sig_cfg.Hsync_pol = 1;

Please remove FB_SYNC_EXT support.

drivers/video/mx5fb.c new file +13 -0

+static void imx_ipu_fb_disable_overlay(struct fb_info *ovl)
+{
+       struct imx_ipu_fb_info *mxc_ovl = ovl->par;
+
+       if (!mxc_ovl->enabled)
+               return;
+
+       ipu_dp_disable_fg(mxc_ovl->dp);
+       ipu_wait_for_interrupt(451, 100);
+       ipu_idmac_disable_channel(mxc_ovl->ipu_ch);
+       ipu_dmfc_disable_channel(mxc_ovl->dmfc);
+       mxc_ovl->enabled = 0;
+}

Had better has a definition of ipu irq 451.

Hi Jason,

Quoted 8 lines · Jason Chen

hi, Sasha,

Quoted 6 lines

+ ? ? ? if (var->vmode & FB_VMODE_ODD_FLD_FIRST) /* PAL */
+ ? ? ? ? ? ? ? sig_cfg.odd_field_first = 1;
+ ? ? ? if (var->sync & FB_SYNC_EXT)
+ ? ? ? ? ? ? ? sig_cfg.ext_clk = 1;
+ ? ? ? if (var->sync & FB_SYNC_HOR_HIGH_ACT)
+ ? ? ? ? ? ? ? sig_cfg.Hsync_pol = 1;

Quoted 1 line

Please remove FB_SYNC_EXT support.

No problem, can do. But why? Is it nonfunctional in the hardware or is it that the current code just misses more pieces to support this?

Quoted 14 lines

(quoted diff) +13 -0

+static void imx_ipu_fb_disable_overlay(struct fb_info *ovl)
+{
+ ? ? ? struct imx_ipu_fb_info *mxc_ovl = ovl->par;
+
+ ? ? ? if (!mxc_ovl->enabled)
+ ? ? ? ? ? ? ? return;
+
+ ? ? ? ipu_dp_disable_fg(mxc_ovl->dp);
+ ? ? ? ipu_wait_for_interrupt(451, 100);
+ ? ? ? ipu_idmac_disable_channel(mxc_ovl->ipu_ch);
+ ? ? ? ipu_dmfc_disable_channel(mxc_ovl->dmfc);
+ ? ? ? mxc_ovl->enabled = 0;
+}

Quoted 1 line

Had better has a definition of ipu irq 451.

Ok.

Sascha

--

Pengutronix e.K. ? ? ? ? ? ? ? ? ? ? ? ? ? | ? ? ? ? ? ? ? ? ? ? ? ? ? ? |
Industrial Linux Solutions ? ? ? ? ? ? ? ? | http://www.pengutronix.de/ ?|
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 ? ?|
Amtsgericht Hildesheim, HRA 2686 ? ? ? ? ? | Fax: ? +49-5121-206917-5555 |

Signed-off-by Sascha Hauer <[email protected]>

---
 arch/arm/mach-mx5/Kconfig              |    1 +
 arch/arm/mach-mx5/board-mx51_babbage.c |   74 ++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 0 deletions(-)

arch/arm/mach-mx5/Kconfig +1 -0

index de4fa992f..89e71da 100644
@@ -42,6 +42,7 @@ config MACH_MX51_BABBAGE
 	select IMX_HAVE_PLATFORM_IMX_UART
 	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
 	select IMX_HAVE_PLATFORM_SPI_IMX
+	select IMX_HAVE_PLATFORM_IMX_IPUV3
 	help
 	  Include support for MX51 Babbage platform, also known as MX51EVK in
 	  u-boot. This includes specific configurations for the board and its

arch/arm/mach-mx5/board-mx51_babbage.c +54 -0

index 1d231e8..c5170e8 100644
@@ -22,11 +22,13 @@
 #include <linux/input.h>
 #include <linux/spi/flash.h>
 #include <linux/spi/spi.h>
+#include <linux/mfd/imx-ipu-v3.h>
 
 #include <mach/common.h>
 #include <mach/hardware.h>
 #include <mach/iomux-mx51.h>
 #include <mach/mxc_ehci.h>
+#include <mach/ipu-v3.h>
 
 #include <asm/irq.h>
 #include <asm/setup.h>

@@ -158,6 +160,41 @@ static iomux_v3_cfg_t mx51babbage_pads[] = {
 	MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK,
 	MX51_PAD_CSPI1_SS0__GPIO4_24,
 	MX51_PAD_CSPI1_SS1__GPIO4_25,
+
+	/* Display */
+	MX51_PAD_DISPB2_SER_DIN__GPIO3_5,
+	MX51_PAD_DISPB2_SER_DIO__GPIO3_6,
+	MX51_PAD_NANDF_D12__GPIO3_28,
+
+	MX51_PAD_DISP1_DAT0__DISP1_DAT0,
+	MX51_PAD_DISP1_DAT1__DISP1_DAT1,
+	MX51_PAD_DISP1_DAT2__DISP1_DAT2,
+	MX51_PAD_DISP1_DAT3__DISP1_DAT3,
+	MX51_PAD_DISP1_DAT4__DISP1_DAT4,
+	MX51_PAD_DISP1_DAT5__DISP1_DAT5,
+	MX51_PAD_DISP1_DAT6__DISP1_DAT6,
+	MX51_PAD_DISP1_DAT7__DISP1_DAT7,
+	MX51_PAD_DISP1_DAT8__DISP1_DAT8,
+	MX51_PAD_DISP1_DAT9__DISP1_DAT9,
+	MX51_PAD_DISP1_DAT10__DISP1_DAT10,
+	MX51_PAD_DISP1_DAT11__DISP1_DAT11,
+	MX51_PAD_DISP1_DAT12__DISP1_DAT12,
+	MX51_PAD_DISP1_DAT13__DISP1_DAT13,
+	MX51_PAD_DISP1_DAT14__DISP1_DAT14,
+	MX51_PAD_DISP1_DAT15__DISP1_DAT15,
+	MX51_PAD_DISP1_DAT16__DISP1_DAT16,
+	MX51_PAD_DISP1_DAT17__DISP1_DAT17,
+	MX51_PAD_DISP1_DAT18__DISP1_DAT18,
+	MX51_PAD_DISP1_DAT19__DISP1_DAT19,
+	MX51_PAD_DISP1_DAT20__DISP1_DAT20,
+	MX51_PAD_DISP1_DAT21__DISP1_DAT21,
+	MX51_PAD_DISP1_DAT22__DISP1_DAT22,
+	MX51_PAD_DISP1_DAT23__DISP1_DAT23,
+#define MX51_PAD_DI_GP4__IPU_DI2_PIN15                 IOMUX_PAD(0x758, 0x350, 4, 0x0,   0, NO_PAD_CTRL)
+	MX51_PAD_DI_GP4__IPU_DI2_PIN15,
+
+	/* I2C DVI enable */
+	MX51_PAD_CSI2_HSYNC__GPIO4_14,
 };
 
 /* Serial ports */

@@ -346,6 +383,23 @@ static const struct spi_imx_master mx51_babbage_spi_pdata __initconst = {
 	.num_chipselect = ARRAY_SIZE(mx51_babbage_spi_cs),
 };
 
+static struct ipuv3_fb_platform_data babbage_fb0_data = {
+	.interface_pix_fmt = IPU_PIX_FMT_RGB24,
+	.flags = IMX_IPU_FB_USE_MODEDB | IMX_IPU_FB_USE_OVERLAY,
+	.display = 0,
+};
+
+static struct ipuv3_fb_platform_data babbage_fb1_data = {
+	.interface_pix_fmt = IPU_PIX_FMT_RGB565,
+	.flags = IMX_IPU_FB_USE_MODEDB,
+	.display = 1,
+};
+
+static struct imx_ipuv3_platform_data ipu_data = {
+	.fb_head0_platform_data = &babbage_fb0_data,
+	.fb_head1_platform_data = &babbage_fb1_data,
+};
+
 /*
  * Board specific initialization.
  */

Sascha Hauer <[email protected]> writes:

Hi,

Quoted 105 lines

Signed-off-by Sascha Hauer <[email protected]>

---
 arch/arm/mach-mx5/Kconfig              |    1 +
 arch/arm/mach-mx5/board-mx51_babbage.c |   74 ++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 0 deletions(-)

arch/arm/mach-mx5/Kconfig +1 -0

index de4fa992f..89e71da 100644
@@ -42,6 +42,7 @@ config MACH_MX51_BABBAGE
 	select IMX_HAVE_PLATFORM_IMX_UART
 	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
 	select IMX_HAVE_PLATFORM_SPI_IMX
+	select IMX_HAVE_PLATFORM_IMX_IPUV3
 	help
 	  Include support for MX51 Babbage platform, also known as MX51EVK in
 	  u-boot. This includes specific configurations for the board and its

arch/arm/mach-mx5/board-mx51_babbage.c +54 -0

index 1d231e8..c5170e8 100644
@@ -22,11 +22,13 @@
 #include <linux/input.h>
 #include <linux/spi/flash.h>
 #include <linux/spi/spi.h>
+#include <linux/mfd/imx-ipu-v3.h>
 
 #include <mach/common.h>
 #include <mach/hardware.h>
 #include <mach/iomux-mx51.h>
 #include <mach/mxc_ehci.h>
+#include <mach/ipu-v3.h>
 
 #include <asm/irq.h>
 #include <asm/setup.h>

@@ -158,6 +160,41 @@ static iomux_v3_cfg_t mx51babbage_pads[] = {
 	MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK,
 	MX51_PAD_CSPI1_SS0__GPIO4_24,
 	MX51_PAD_CSPI1_SS1__GPIO4_25,
+
+	/* Display */
+	MX51_PAD_DISPB2_SER_DIN__GPIO3_5,
+	MX51_PAD_DISPB2_SER_DIO__GPIO3_6,
+	MX51_PAD_NANDF_D12__GPIO3_28,
+
+	MX51_PAD_DISP1_DAT0__DISP1_DAT0,
+	MX51_PAD_DISP1_DAT1__DISP1_DAT1,
+	MX51_PAD_DISP1_DAT2__DISP1_DAT2,
+	MX51_PAD_DISP1_DAT3__DISP1_DAT3,
+	MX51_PAD_DISP1_DAT4__DISP1_DAT4,
+	MX51_PAD_DISP1_DAT5__DISP1_DAT5,
+	MX51_PAD_DISP1_DAT6__DISP1_DAT6,
+	MX51_PAD_DISP1_DAT7__DISP1_DAT7,
+	MX51_PAD_DISP1_DAT8__DISP1_DAT8,
+	MX51_PAD_DISP1_DAT9__DISP1_DAT9,
+	MX51_PAD_DISP1_DAT10__DISP1_DAT10,
+	MX51_PAD_DISP1_DAT11__DISP1_DAT11,
+	MX51_PAD_DISP1_DAT12__DISP1_DAT12,
+	MX51_PAD_DISP1_DAT13__DISP1_DAT13,
+	MX51_PAD_DISP1_DAT14__DISP1_DAT14,
+	MX51_PAD_DISP1_DAT15__DISP1_DAT15,
+	MX51_PAD_DISP1_DAT16__DISP1_DAT16,
+	MX51_PAD_DISP1_DAT17__DISP1_DAT17,
+	MX51_PAD_DISP1_DAT18__DISP1_DAT18,
+	MX51_PAD_DISP1_DAT19__DISP1_DAT19,
+	MX51_PAD_DISP1_DAT20__DISP1_DAT20,
+	MX51_PAD_DISP1_DAT21__DISP1_DAT21,
+	MX51_PAD_DISP1_DAT22__DISP1_DAT22,
+	MX51_PAD_DISP1_DAT23__DISP1_DAT23,
+#define MX51_PAD_DI_GP4__IPU_DI2_PIN15                 IOMUX_PAD(0x758, 0x350, 4, 0x0,   0, NO_PAD_CTRL)
+	MX51_PAD_DI_GP4__IPU_DI2_PIN15,
+
+	/* I2C DVI enable */
+	MX51_PAD_CSI2_HSYNC__GPIO4_14,
 };
 
 /* Serial ports */

@@ -346,6 +383,23 @@ static const struct spi_imx_master mx51_babbage_spi_pdata __initconst = {
 	.num_chipselect = ARRAY_SIZE(mx51_babbage_spi_cs),
 };
 
+static struct ipuv3_fb_platform_data babbage_fb0_data = {
+	.interface_pix_fmt = IPU_PIX_FMT_RGB24,
+	.flags = IMX_IPU_FB_USE_MODEDB | IMX_IPU_FB_USE_OVERLAY,
+	.display = 0,
+};
+
+static struct ipuv3_fb_platform_data babbage_fb1_data = {
+	.interface_pix_fmt = IPU_PIX_FMT_RGB565,
+	.flags = IMX_IPU_FB_USE_MODEDB,
+	.display = 1,
+};
+
+static struct imx_ipuv3_platform_data ipu_data = {
+	.fb_head0_platform_data = &babbage_fb0_data,
+	.fb_head1_platform_data = &babbage_fb1_data,
+};
+
 /*
  * Board specific initialization.
  */

@@ -392,6 +446,26 @@ static void __init mxc_board_init(void)
 		ARRAY_SIZE(mx51_babbage_spi_board_info));
 	imx51_add_ecspi(0, &mx51_babbage_spi_pdata);

arch/arm/mach-mx5/board-mx51_babbage.c static void __init mxc_board_init(void) · line 453

Quoted 6 lines

arch/arm/mach-mx5/board-mx51_babbage.c +5 -0

 	imx51_add_imx2_wdt(0, NULL);
+
+#define GPIO_DVI_DETECT	(2 * 32 + 28)
+#define GPIO_DVI_RESET	(2 * 32 + 5)
+#define GPIO_DVI_PWRDN	(2 * 32 + 6)
+#define GPIO_DVI_I2C	(3 * 32 + 14)

What about using IMX_GPIO_NR() ?

The following is the third version of the series adding ipu support for the i.MX51/53.

Changes since last version:

- The IPU core driver now sits in drivers/video instead of drivers/mfd. It still needs mfd support, so it has a select on MFD_SUPPORT and MFD_CORE.
- The fb driver does not reallocate memory anymore. This is broken since there is a risk that some userspace process still has the memory mapped while we reallocate it which leads to bad results.

Sascha Hauer (7):
Add a mfd IPUv3 driver
fb: export fb mode db table
Add i.MX5 framebuffer driver
ARM i.MX51: Add IPU device support
ARM i.MX5: Allow to increase max zone order ARM i.MX5: increase dma consistent size for IPU support ARM i.MX51 babbage: Add framebuffer support