video: Make IPU KMS parse display-timings
Subsystems (4)
PATCH 1/3 video: Make IPU KMS parse display-timings
From: Marek Vasut <[email protected]>
This patch adds support for parsing of the DT display-timings prop to IPU KMS driver.
--- drivers/staging/imx-drm/parallel-display.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/staging/imx-drm/parallel-display.c +10 -0
@@ -57,6 +57,7 @@ static void imx_pd_connector_destroy(struct drm_connector *connector)static int imx_pd_connector_get_modes (struct drm_connector *connector) {struct imx_parallel_display *imxpd =con_to_imxpd (connector); +struct device_node *np = imxpd->dev->of_node;int num_modes =0 ;if (imxpd->edid) {
@@ -72,6 +73,15 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector) num_modes++; } +if (np) { +struct drm_display_mode *mode =drm_mode_create (connector->dev); +of_get_drm_display_mode (np, &imxpd->mode,0 ); +drm_mode_copy (mode, &imxpd->mode); + mode->type |=DRM_MODE_TYPE_DRIVER |DRM_MODE_TYPE_PREFERRED , +drm_mode_probed_add (connector, mode); + num_modes++; + } +return num_modes; }
Signature · 1 line
1.7.10.4
PATCH 2/3 ARM: dts: mx53qsb: Add support for parallel display
Add support for CLAA WVGA display for i.MX53 QSB.
--- arch/arm/boot/dts/imx53-qsb.dtsp | 26 ++++++++++++++++++++++++++ arch/arm/boot/dts/imx53.dtsip | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+)
arch/arm/boot/dts/imx53-qsb.dtsp +26 -0
@@ -21,6 +21,32 @@ reg = <0x70000000 0x40000000>; }; + display at di0 { + compatible = "fsl,imx-parallel-display"; + crtcs = <&ipu 0>; + interface-pix-fmt = "rgb565"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu_disp1_1>; + display-timings { + claawvga { + native-mode; + clock-frequency = <27000000>; + hactive = <800>; + vactive = <480>; + hback-porch = <40>; + hfront-porch = <60>; + vback-porch = <10>; + vfront-porch = <10>; + hsync-len = <20>; + vsync-len = <10>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <0>; + }; + }; + }; + gpio-keys { compatible = "gpio-keys";
arch/arm/boot/dts/imx53.dtsip +35 -0
@@ -441,6 +441,41 @@ }; }; + ipu_disp1 { + pinctrl_ipu_disp1_1: ipudisp1grp-1 { + fsl,pins = < + MX53_PAD_DI0_DISP_CLK__IPU_DI0_DISP_CLK 0x5 + MX53_PAD_DI0_PIN15__IPU_DI0_PIN15 0x5 + MX53_PAD_DI0_PIN2__IPU_DI0_PIN2 0x5 + MX53_PAD_DI0_PIN3__IPU_DI0_PIN3 0x5 + MX53_PAD_DISP0_DAT0__IPU_DISP0_DAT_0 0x5 + MX53_PAD_DISP0_DAT1__IPU_DISP0_DAT_1 0x5 + MX53_PAD_DISP0_DAT2__IPU_DISP0_DAT_2 0x5 + MX53_PAD_DISP0_DAT3__IPU_DISP0_DAT_3 0x5 + MX53_PAD_DISP0_DAT4__IPU_DISP0_DAT_4 0x5 + MX53_PAD_DISP0_DAT5__IPU_DISP0_DAT_5 0x5 + MX53_PAD_DISP0_DAT6__IPU_DISP0_DAT_6 0x5 + MX53_PAD_DISP0_DAT7__IPU_DISP0_DAT_7 0x5 + MX53_PAD_DISP0_DAT8__IPU_DISP0_DAT_8 0x5 + MX53_PAD_DISP0_DAT9__IPU_DISP0_DAT_9 0x5 + MX53_PAD_DISP0_DAT10__IPU_DISP0_DAT_10 0x5 + MX53_PAD_DISP0_DAT11__IPU_DISP0_DAT_11 0x5 + MX53_PAD_DISP0_DAT12__IPU_DISP0_DAT_12 0x5 + MX53_PAD_DISP0_DAT13__IPU_DISP0_DAT_13 0x5 + MX53_PAD_DISP0_DAT14__IPU_DISP0_DAT_14 0x5 + MX53_PAD_DISP0_DAT15__IPU_DISP0_DAT_15 0x5 + MX53_PAD_DISP0_DAT16__IPU_DISP0_DAT_16 0x5 + MX53_PAD_DISP0_DAT17__IPU_DISP0_DAT_17 0x5 + MX53_PAD_DISP0_DAT18__IPU_DISP0_DAT_18 0x5 + MX53_PAD_DISP0_DAT19__IPU_DISP0_DAT_19 0x5 + MX53_PAD_DISP0_DAT20__IPU_DISP0_DAT_20 0x5 + MX53_PAD_DISP0_DAT21__IPU_DISP0_DAT_21 0x5 + MX53_PAD_DISP0_DAT22__IPU_DISP0_DAT_22 0x5 + MX53_PAD_DISP0_DAT23__IPU_DISP0_DAT_23 0x5 + >; + }; + }; + owire { pinctrl_owire_1: owiregrp-1 { fsl,pins = <
Signature · 1 line
1.7.10.4
PATCH 2/3 ARM: dts: mx53qsb: Add support for parallel display
Dear Rogerio Pimentel,
Quoted 7 lines
Add support for CLAA WVGA display for i.MX53 QSB.
Signed-off-by Rogerio Pimentel <[email protected]>--- arch/arm/boot/dts/imx53-qsb.dtsp | 26 ++++++++++++++++++++++++++ arch/arm/boot/dts/imx53.dtsip | 35+++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+)
Best regards,
Marek Vasut
PATCH 2/3 ARM: dts: mx53qsb: Add support for parallel display
In reply to Rogerio PimentelAm Mittwoch, den 03.04.2013, 12:36 -0300 schrieb Rogerio Pimentel:
Quoted 13 lines
Add support for CLAA WVGA display for i.MX53 QSB.
Signed-off-by Rogerio Pimentel <[email protected]>--- arch/arm/boot/dts/imx53-qsb.dtsp | 26 ++++++++++++++++++++++++++ arch/arm/boot/dts/imx53.dtsip | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+)arch/arm/boot/dts/imx53-qsb.dtsp +0
-0
arch/arm/boot/dts/imx53-qsb.dtsp line 29
Quoted 9 lines
arch/arm/boot/dts/imx53-qsb.dtsp +6
-0@@ -21,6 +21,32 @@ reg = <0x70000000 0x40000000>; }; + display at di0 { + compatible = "fsl,imx-parallel-display"; + crtcs = <&ipu 0>; + interface-pix-fmt = "rgb565"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu_disp1_1>;
pinctrl_ipu_disp0_1, see below.
Quoted 28 lines
arch/arm/boot/dts/imx53-qsb.dtsp +20
-0+ display-timings { + claawvga { + native-mode; + clock-frequency = <27000000>; + hactive = <800>; + vactive = <480>; + hback-porch = <40>; + hfront-porch = <60>; + vback-porch = <10>; + vfront-porch = <10>; + hsync-len = <20>; + vsync-len = <10>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <0>; + }; + }; + }; + gpio-keys { compatible = "gpio-keys";arch/arm/boot/dts/imx53.dtsip +0
-0
arch/arm/boot/dts/imx53.dtsip line 445
Quoted 5 lines
arch/arm/boot/dts/imx53.dtsip +2
-0@@ -441,6 +441,41 @@ }; }; + ipu_disp1 { + pinctrl_ipu_disp1_1: ipudisp1grp-1 {
This should be pinctrl_ipu_disp0_1: ipudisp0grp-1, since this is configuring the DISP0 pads. pinctrl_ipu_disp1_1 should be used to configure DISP1 pads instead.
Quoted 26 lines
arch/arm/boot/dts/imx53.dtsip +26
-0+ fsl,pins = < + MX53_PAD_DI0_DISP_CLK__IPU_DI0_DISP_CLK 0x5 + MX53_PAD_DI0_PIN15__IPU_DI0_PIN15 0x5 + MX53_PAD_DI0_PIN2__IPU_DI0_PIN2 0x5 + MX53_PAD_DI0_PIN3__IPU_DI0_PIN3 0x5 + MX53_PAD_DISP0_DAT0__IPU_DISP0_DAT_0 0x5 + MX53_PAD_DISP0_DAT1__IPU_DISP0_DAT_1 0x5 + MX53_PAD_DISP0_DAT2__IPU_DISP0_DAT_2 0x5 + MX53_PAD_DISP0_DAT3__IPU_DISP0_DAT_3 0x5 + MX53_PAD_DISP0_DAT4__IPU_DISP0_DAT_4 0x5 + MX53_PAD_DISP0_DAT5__IPU_DISP0_DAT_5 0x5 + MX53_PAD_DISP0_DAT6__IPU_DISP0_DAT_6 0x5 + MX53_PAD_DISP0_DAT7__IPU_DISP0_DAT_7 0x5 + MX53_PAD_DISP0_DAT8__IPU_DISP0_DAT_8 0x5 + MX53_PAD_DISP0_DAT9__IPU_DISP0_DAT_9 0x5 + MX53_PAD_DISP0_DAT10__IPU_DISP0_DAT_10 0x5 + MX53_PAD_DISP0_DAT11__IPU_DISP0_DAT_11 0x5 + MX53_PAD_DISP0_DAT12__IPU_DISP0_DAT_12 0x5 + MX53_PAD_DISP0_DAT13__IPU_DISP0_DAT_13 0x5 + MX53_PAD_DISP0_DAT14__IPU_DISP0_DAT_14 0x5 + MX53_PAD_DISP0_DAT15__IPU_DISP0_DAT_15 0x5 + MX53_PAD_DISP0_DAT16__IPU_DISP0_DAT_16 0x5 + MX53_PAD_DISP0_DAT17__IPU_DISP0_DAT_17 0x5 + MX53_PAD_DISP0_DAT18__IPU_DISP0_DAT_18 0x5 + MX53_PAD_DISP0_DAT19__IPU_DISP0_DAT_19 0x5 + MX53_PAD_DISP0_DAT20__IPU_DISP0_DAT_20 0x5
arch/arm/boot/dts/imx53.dtsip line 481
Quoted 10 lines
arch/arm/boot/dts/imx53.dtsip +7
-0+ MX53_PAD_DISP0_DAT21__IPU_DISP0_DAT_21 0x5 + MX53_PAD_DISP0_DAT22__IPU_DISP0_DAT_22 0x5 + MX53_PAD_DISP0_DAT23__IPU_DISP0_DAT_23 0x5 + >; + }; + }; + owire { pinctrl_owire_1: owiregrp-1 { fsl,pins = <
regards
Philipp
PATCH 3/3 ARM: imx_v6_v7_defconfig: enable parallel display
In reply to Rogerio PimentelAllow parallel display to work by default
--- arch/arm/configs/imx_v6_v7_defconfig | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/configs/imx_v6_v7_defconfig +3 -0
@@ -162,6 +162,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_SOC_CAMERA=y CONFIG_SOC_CAMERA_OV2640=y CONFIG_DRM=y +CONFIG_OF_VIDEOMODE=y CONFIG_VIDEO_MX3=y CONFIG_FB=y CONFIG_LCD_PLATFORM=y
@@ -206,6 +207,8 @@ CONFIG_IMX_SDMA=y CONFIG_MXS_DMA=y CONFIG_STAGING=y CONFIG_DRM_IMX=y +CONFIG_DRM_IMX_FB_HELPER=y +CONFIG_DRM_IMX_PARALLEL_DISPLAY=y CONFIG_DRM_IMX_IPUV3_CORE=y CONFIG_DRM_IMX_IPUV3=y CONFIG_COMMON_CLK_DEBUG=y
Signature · 1 line
1.7.10.4
PATCH 1/3 video: Make IPU KMS parse display-timings
In reply to Rogerio PimentelAm Mittwoch, den 03.04.2013, 12:36 -0300 schrieb Rogerio Pimentel:
Quoted 24 lines
From: Marek Vasut <[email protected]>
This patch adds support for parsing of the DT display-timings prop to IPU KMS driver.
Cc Greg Kroah-Hartman <[email protected]>Signed-off-by Marek Vasut <[email protected]>--- drivers/staging/imx-drm/parallel-display.c | 10 ++++++++++ 1 file changed, 10 insertions(+)drivers/staging/imx-drm/parallel-display.c +1
-0@@ -57,6 +57,7 @@ static void imx_pd_connector_destroy(struct drm_connector *connector)static int imx_pd_connector_get_modes (struct drm_connector *connector) {struct imx_parallel_display *imxpd =con_to_imxpd (connector); +struct device_node *np = imxpd->dev->of_node;int num_modes =0 ;if (imxpd->edid) {
drivers/staging/imx-drm/parallel-display.c static int imx_pd_connector_get_modes(struct drm_connector *connector) · line 78
Quoted 6 lines
drivers/staging/imx-drm/parallel-display.c +3
-0@@ -72,6 +73,15 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector) num_modes++; } +if (np) { +struct drm_display_mode *mode =drm_mode_create (connector->dev); +of_get_drm_display_mode (np, &imxpd->mode,0 );
Since the mode is stored in imxpd->mode anyway, of_get_drm_display_mode could be called once in the probe function instead of every time get_modes is called.
drivers/staging/imx-drm/parallel-display.c static int imx_pd_connector_get_modes(struct drm_connector *connector) · line 86
Quoted 8 lines
drivers/staging/imx-drm/parallel-display.c +6
-0+drm_mode_copy (mode, &imxpd->mode); + mode->type |=DRM_MODE_TYPE_DRIVER |DRM_MODE_TYPE_PREFERRED , +drm_mode_probed_add (connector, mode); + num_modes++; + } +return num_modes; }
regards
Philipp