v4l2: add new V4L2_PIX_FMT_RGB666 pixel format.
Subsystems (6)
PATCH v5 1/8 v4l2: add new V4L2_PIX_FMT_RGB666 pixel format.
That new macro is needed by the imx_drm staging driver
for supporting the QVGA display of the eukrea-cpuimx51 board.
---
ChangeLog v3->v4:
- Added Laurent Pinchart's Ack.
ChangeLog v2->v3:
- Added some interested people in the Cc list.
- Added Mauro Carvalho Chehab's Ack.
- Added documentation.
--- .../DocBook/media/v4l/pixfmt-packed-rgb.xml | 78 ++++++++++++++++++++ include/uapi/linux/videodev2.h | 1 + 2 files changed, 79 insertions(+)
Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml +78 -0
@@ -279,6 +279,45 @@ colorspace <constant>V4L2_COLORSPACE_SRGB</constant>.</para> <entry></entry> <entry></entry> </row> + <row id="V4L2-PIX-FMT-RGB666"> + <entry><constant>V4L2_PIX_FMT_RGB666</constant></entry> + <entry>'RGBH'</entry> + <entry></entry> + <entry>r<subscript>5</subscript></entry> + <entry>r<subscript>4</subscript></entry> + <entry>r<subscript>3</subscript></entry> + <entry>r<subscript>2</subscript></entry> + <entry>r<subscript>1</subscript></entry> + <entry>r<subscript>0</subscript></entry> + <entry>g<subscript>5</subscript></entry> + <entry>g<subscript>4</subscript></entry> + <entry></entry> + <entry>g<subscript>3</subscript></entry> + <entry>g<subscript>2</subscript></entry> + <entry>g<subscript>1</subscript></entry> + <entry>g<subscript>0</subscript></entry> + <entry>b<subscript>5</subscript></entry> + <entry>b<subscript>4</subscript></entry> + <entry>b<subscript>3</subscript></entry> + <entry>b<subscript>2</subscript></entry> + <entry></entry> + <entry>b<subscript>1</subscript></entry> + <entry>b<subscript>0</subscript></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + </row> <row id="V4L2-PIX-FMT-BGR24"> <entry><constant>V4L2_PIX_FMT_BGR24</constant></entry> <entry>'BGR3'</entry>
@@ -781,6 +820,45 @@ defined in error. Drivers may interpret them as in <xref <entry></entry> <entry></entry> </row> + <row><!-- id="V4L2-PIX-FMT-RGB666" --> + <entry><constant>V4L2_PIX_FMT_RGB666</constant></entry> + <entry>'RGBH'</entry> + <entry></entry> + <entry>r<subscript>5</subscript></entry> + <entry>r<subscript>4</subscript></entry> + <entry>r<subscript>3</subscript></entry> + <entry>r<subscript>2</subscript></entry> + <entry>r<subscript>1</subscript></entry> + <entry>r<subscript>0</subscript></entry> + <entry>g<subscript>5</subscript></entry> + <entry>g<subscript>4</subscript></entry> + <entry></entry> + <entry>g<subscript>3</subscript></entry> + <entry>g<subscript>2</subscript></entry> + <entry>g<subscript>1</subscript></entry> + <entry>g<subscript>0</subscript></entry> + <entry>b<subscript>5</subscript></entry> + <entry>b<subscript>4</subscript></entry> + <entry>b<subscript>3</subscript></entry> + <entry>b<subscript>2</subscript></entry> + <entry></entry> + <entry>b<subscript>1</subscript></entry> + <entry>b<subscript>0</subscript></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + </row> <row><!-- id="V4L2-PIX-FMT-BGR24" --> <entry><constant>V4L2_PIX_FMT_BGR24</constant></entry> <entry>'BGR3'</entry>
include/uapi/linux/videodev2.h +1 -0
@@ -294,6 +294,7 @@ struct v4l2_pix_format {#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q')/* 16 RGB-5-5-5 BE */ #define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R')/* 16 RGB-5-6-5 BE */ #define V4L2_PIX_FMT_BGR666 v4l2_fourcc('B', 'G', 'R', 'H')/* 18 BGR-6-6-6 */ +#define V4L2_PIX_FMT_RGB666 v4l2_fourcc('R', 'G', 'B', 'H')/* 18 RGB-6-6-6 */ #define V4L2_PIX_FMT_BGR24 v4l2_fourcc('B', 'G', 'R', '3')/* 24 BGR-8-8-8 */ #define V4L2_PIX_FMT_RGB24 v4l2_fourcc('R', 'G', 'B', '3')/* 24 RGB-8-8-8 */ #define V4L2_PIX_FMT_BGR32 v4l2_fourcc('B', 'G', 'R', '4')/* 32 BGR-8-8-8-8 */
Signature · 6 lines
1.7.9.5 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
A message that is not in the archive (sent off-list or not yet received): 1386268092-21719-1-git-send-email-denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org
PATCH v5 2/8 staging: imx-drm: Add RGB666 support for parallel display.
---
ChangeLog v3->v5:
- Use the correct RGB order.
ChangeLog v2->v3:
- Added some interested people in the Cc list.
- Removed the commit message long desciption that was just a copy of the short description.
- Rebased the patch.
- Fixed a copy-paste error in the ipu_dc_map_clear parameter.
--- .../bindings/staging/imx-drm/fsl-imx-drm.txt | 2 +- drivers/staging/imx-drm/ipu-v3/ipu-dc.c | 9 +++++++++ drivers/staging/imx-drm/parallel-display.c | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt +1 -1
@@ -29,7 +29,7 @@ Required properties: - crtc: the crtc this display is connected to, see below Optional properties: - interface_pix_fmt: How this display is connected to the - crtc. Currently supported types: "rgb24", "rgb565", "bgr666" + crtc. Currently supported types: "rgb24", "rgb565", "bgr666", "rgb666" - edid: verbatim EDID data block describing attached display. - ddc: phandle describing the i2c bus handling the display data channel
drivers/staging/imx-drm/ipu-v3/ipu-dc.c +9 -0
@@ -92,6 +92,7 @@ enum ipu_dc_map {IPU_DC_MAP_GBR24 ,/* TVEv2 */ IPU_DC_MAP_BGR666 ,IPU_DC_MAP_BGR24 , + IPU_DC_MAP_RGB666, }; struct ipu_dc {
@@ -155,6 +156,8 @@ static int ipu_pixfmt_to_map(u32 fmt)return IPU_DC_MAP_BGR666 ;case V4L2_PIX_FMT_BGR24 :return IPU_DC_MAP_BGR24 ; +case V4L2_PIX_FMT_RGB666 : +return IPU_DC_MAP_RGB666 ;default :return -EINVAL ; }
@@ -404,6 +407,12 @@ int ipu_dc_init(struct ipu_soc *ipu, struct device *dev,ipu_dc_map_config (priv,IPU_DC_MAP_BGR24 ,1 ,15 ,0xff );/* green */ ipu_dc_map_config (priv,IPU_DC_MAP_BGR24 ,0 ,23 ,0xff );/* blue */ +/* rgb666 */ +ipu_dc_map_clear (priv,IPU_DC_MAP_RGB666 ); +ipu_dc_map_config (priv,IPU_DC_MAP_RGB666 ,0 ,5 ,0xfc );/* blue */ +ipu_dc_map_config (priv,IPU_DC_MAP_RGB666 ,1 ,11 ,0xfc );/* green */ +ipu_dc_map_config (priv,IPU_DC_MAP_RGB666 ,2 ,17 ,0xfc );/* red */ +return 0 ; }
drivers/staging/imx-drm/parallel-display.c +2 -0
@@ -222,6 +222,8 @@ static int imx_pd_probe(struct platform_device *pdev) imxpd->interface_pix_fmt =V4L2_PIX_FMT_RGB565 ; else if (!strcmp(fmt, "bgr666")) imxpd->interface_pix_fmt =V4L2_PIX_FMT_BGR666 ; + else if (!strcmp(fmt, "rgb666")) + imxpd->interface_pix_fmt =V4L2_PIX_FMT_RGB666 ; } imxpd->dev = &pdev->dev;
Signature · 6 lines
1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCHv5][ 2/8] staging: imx-drm: Add RGB666 support for parallel display.
On Thu, Dec 05, 2013 at 07:28:06PM +0100, Denis Carikli wrote:
[...]
Quoted 1 line
drivers/staging/imx-drm/ipu-v3/ipu-dc.c +0
-0
[...]
drivers/staging/imx-drm/ipu-v3/ipu-dc.c static int ipu_pixfmt_to_map(u32 fmt) · line 160
Quoted 6 lines
drivers/staging/imx-drm/ipu-v3/ipu-dc.c +2
-0@@ -155,6 +156,8 @@ static int ipu_pixfmt_to_map(u32 fmt)return IPU_DC_MAP_BGR666 ;case V4L2_PIX_FMT_BGR24 :return IPU_DC_MAP_BGR24 ; +case V4L2_PIX_FMT_RGB666 : +return IPU_DC_MAP_RGB666 ;
Why is this DRM driver even using V4L2 pixel formats in the first place?
Thierry
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCHv5][ 2/8] staging: imx-drm: Add RGB666 support for parallel display.
Am Freitag, den 06.12.2013, 14:14 +0100 schrieb Thierry Reding:
Quoted 13 lines · Denis Carikli
[...]
Quoted 1 line
drivers/staging/imx-drm/ipu-v3/ipu-dc.c +0
-0[...]
drivers/staging/imx-drm/ipu-v3/ipu-dc.c static int ipu_pixfmt_to_map(u32 fmt) · line 160
Quoted 6 lines
drivers/staging/imx-drm/ipu-v3/ipu-dc.c +2
-0@@ -155,6 +156,8 @@ static int ipu_pixfmt_to_map(u32 fmt)return IPU_DC_MAP_BGR666 ;case V4L2_PIX_FMT_BGR24 :return IPU_DC_MAP_BGR24 ; +case V4L2_PIX_FMT_RGB666 : +return IPU_DC_MAP_RGB666 ;Why is this DRM driver even using V4L2 pixel formats in the first place?
Because imx-drm is actually a misnomer. The i.MX IPU is a multifunction device, which as one part has the display controllers, but also camera interfaces and mem-to-mem scaler devices, which are hooked up via the V4L2 interface.
The generic IPU part, which is used for example for programming the DMA channels is using V4L2 pixel formats as a common base. We have patches to split this out and make this fact more visible. (The IPU core will be placed aside the Tegra host1x driver)
Regards,
Lucas
Signature · 4 lines
Pengutronix e.K. | Lucas Stach | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-5076 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Re: [PATCHv5][ 2/8] staging: imx-drm: Add RGB666 support for parallel display.
Quoted 19 lines · Lucas Stach
Am Freitag, den 06.12.2013, 14:14 +0100 schrieb Thierry Reding:
Quoted 13 lines · Denis Carikli
[...]
Quoted 1 line
drivers/staging/imx-drm/ipu-v3/ipu-dc.c +0
-0[...]
drivers/staging/imx-drm/ipu-v3/ipu-dc.c static int ipu_pixfmt_to_map(u32 fmt) · line 160
Quoted 6 lines
drivers/staging/imx-drm/ipu-v3/ipu-dc.c +2
-0@@ -155,6 +156,8 @@ static int ipu_pixfmt_to_map(u32 fmt)return IPU_DC_MAP_BGR666 ;case V4L2_PIX_FMT_BGR24 :return IPU_DC_MAP_BGR24 ; +case V4L2_PIX_FMT_RGB666 : +return IPU_DC_MAP_RGB666 ;Why is this DRM driver even using V4L2 pixel formats in the first place?
Because imx-drm is actually a misnomer. The i.MX IPU is a multifunction device, which as one part has the display controllers, but also camera interfaces and mem-to-mem scaler devices, which are hooked up via the V4L2 interface.
Quoted 4 lines
The generic IPU part, which is used for example for programming the DMA channels is using V4L2 pixel formats as a common base. We have patches to split this out and make this fact more visible. (The IPU core will be placed aside the Tegra host1x driver)
Have you considered splitting thing up further and move out the display controller driver to DRM and the camera driver to V4L2? I mean, if that is even possible with a reasonable amount of work.
Is the "mem-to-mem" the same as the "DMA channels" you mentioned? If it only does DMA, why does it even need to worry about pixel formats?
Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131206/1a271527/attachment.sig>
PATCH v5 3/8 staging: imx-drm: Correct BGR666 and the board's dts that use them.
In reply to a message not in the archive---
ChangeLog v5:
- New patch.
--- arch/arm/boot/dts/imx51-apf51dev.dts | 2 +- arch/arm/boot/dts/imx53-m53evk.dts | 2 +- drivers/staging/imx-drm/ipu-v3/ipu-dc.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/imx51-apf51dev.dts +1 -1
@@ -19,7 +19,7 @@ display@di1 { compatible = "fsl,imx-parallel-display"; crtcs = <&ipu 0>; - interface-pix-fmt = "bgr666"; + interface-pix-fmt = "rgb666"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_ipu_disp1>;
arch/arm/boot/dts/imx53-m53evk.dts +1 -1
@@ -24,7 +24,7 @@ display@di1 { compatible = "fsl,imx-parallel-display"; crtcs = <&ipu 1>; - interface-pix-fmt = "bgr666"; + interface-pix-fmt = "rgb666"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_ipu_disp1>;
drivers/staging/imx-drm/ipu-v3/ipu-dc.c +2 -2
@@ -397,9 +397,9 @@ int ipu_dc_init(struct ipu_soc *ipu, struct device *dev,/* bgr666 */ ipu_dc_map_clear (priv,IPU_DC_MAP_BGR666 ); -ipu_dc_map_config (priv,IPU_DC_MAP_BGR666 ,0 ,5 ,0xfc );/* blue */ +ipu_dc_map_config (priv,IPU_DC_MAP_BGR666 ,0 ,17 ,0xfc );/* blue */ ipu_dc_map_config (priv,IPU_DC_MAP_BGR666 ,1 ,11 ,0xfc );/* green */ -ipu_dc_map_config (priv,IPU_DC_MAP_BGR666 ,2 ,17 ,0xfc );/* red */ +ipu_dc_map_config (priv,IPU_DC_MAP_BGR666 ,2 ,5 ,0xfc );/* red */ /* bgr24 */ ipu_dc_map_clear (priv,IPU_DC_MAP_BGR24 );
Signature · 6 lines
1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCHv5][ 3/8] staging: imx-drm: Correct BGR666 and the board's dts that use them.
On Thursday, December 05, 2013 at 07:28:07 PM, Denis Carikli wrote:
[...]
Can you please explain the correction here ? Why is it needed ? What was the problem ?
Thanks!
Best regards,
Marek Vasut
Re: [PATCHv5][ 3/8] staging: imx-drm: Correct BGR666 and the board's dts that use them.
In reply to Denis CarikliOn Thu, Dec 05, 2013 at 07:28:07PM +0100, Denis Carikli wrote:
[...]
arch/arm/boot/dts/imx51-apf51dev.dts line 19
Quoted 6 lines
arch/arm/boot/dts/imx51-apf51dev.dts +0
-0@@ -19,7 +19,7 @@ display at di1 {
^^^^
I know this isn't introduced by your patch, but WTF???
Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131206/6a4dcda7/attachment.sig>
PATCH v5 5/8 staging: imx-drm: parallel display: add regulator support.
In reply to a message not in the archive---
ChangeLog v3->v5:
- Code clenaup.
ChangeLog v2->v3:
- Added some interested people in the Cc list.
- the lcd-supply is now called display-supply (not all display are LCD).
- The code and documentation was updated accordingly.
- regulator_is_enabled now guard the regulator enables/disables because regulator_disable does not check the regulator state.
--- .../bindings/staging/imx-drm/fsl-imx-drm.txt | 1 + drivers/staging/imx-drm/parallel-display.c | 22 ++++++++++++++++++++ 2 files changed, 23 insertions(+)
Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt +1 -0
@@ -28,6 +28,7 @@ Required properties: - compatible: Should be "fsl,imx-parallel-display" - crtc: the crtc this display is connected to, see below Optional properties: +- display-supply : phandle to the regulator device tree node if needed. - interface_pix_fmt: How this display is connected to the crtc. Currently supported types: "rgb24", "rgb565", "bgr666", "rgb666" - edid: verbatim EDID data block describing attached display.
drivers/staging/imx-drm/parallel-display.c +22 -0
@@ -22,6 +22,7 @@#include <drm/drmP.h> #include <drm/drm_fb_helper.h> #include <drm/drm_crtc_helper.h> +#include <linux/regulator/consumer.h> #include <linux/videodev2.h> #include "imx-drm.h"
@@ -35,6 +36,7 @@ struct imx_parallel_display {struct drm_encoder encoder;struct imx_drm_encoder *imx_drm_encoder;struct device *dev; +struct regulator *disp_reg;void *edid;int edid_len;u32 interface_pix_fmt;
@@ -141,6 +143,13 @@ static void imx_pd_encoder_prepare(struct drm_encoder *encoder) {struct imx_parallel_display *imxpd =enc_to_imxpd (encoder); +if (!IS_ERR (imxpd->disp_reg) && + !regulator_is_enabled (imxpd->disp_reg)) { +if (regulator_enable (imxpd->disp_reg)) +dev_err (imxpd->dev, +"Failed to enable regulator.\n" ); + } +imx_drm_crtc_panel_format (encoder->crtc,DRM_MODE_ENCODER_NONE , imxpd->interface_pix_fmt); }
@@ -157,6 +166,12 @@ static void imx_pd_encoder_mode_set(struct drm_encoder *encoder,static void imx_pd_encoder_disable (struct drm_encoder *encoder) { +struct imx_parallel_display *imxpd =enc_to_imxpd (encoder); + +if (!IS_ERR (imxpd->disp_reg) &®ulator_is_enabled (imxpd->disp_reg)) { +if (regulator_disable (imxpd->disp_reg)) +dev_err (imxpd->dev,"Failed to disable regulator.\n" ); + } }static void imx_pd_encoder_destroy (struct drm_encoder *encoder)
@@ -260,6 +275,13 @@ static int imx_pd_probe(struct platform_device *pdev)if (ret)return ret; + imxpd->disp_reg =devm_regulator_get (&pdev->dev,"display" ); +if (PTR_ERR (imxpd->disp_reg) == -EPROBE_DEFER ) +return -EPROBE_DEFER ; + +if (IS_ERR (imxpd->disp_reg)) +dev_dbg (&pdev->dev,"Operating without display regulator.\n" ); + ret =imx_drm_encoder_add_possible_crtcs (imxpd->imx_drm_encoder, np);platform_set_drvdata (pdev, imxpd);
Signature · 6 lines
1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCHv5][ 5/8] staging: imx-drm: parallel display: add regulator support.
Quoted 66 lines · Denis Carikli
Cc Dan Carpenter <[email protected]>Cc Rob Herring <[email protected]>Cc Pawel Moll <[email protected]>Cc Mark Rutland <[email protected]>Cc Stephen Warren <[email protected]>Cc Ian Campbell <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc David Airlie <[email protected]>Cc Sascha Hauer <[email protected]>Cc Shawn Guo <[email protected]>Cc Eric Bénard <[email protected]>Signed-off-by Denis Carikli <[email protected]>---
ChangeLogv3->v5:
- Code clenaup.ChangeLog
v2->v3:
- Added some interested people in the Cc list.
- the lcd-supply is now called display-supply (not all display are LCD).
- The code and documentation was updated accordingly.
-regulator_is_enablednow guard the regulator enables/disables becauseregulator_disabledoes not check the regulator state.--- .../bindings/staging/imx-drm/fsl-imx-drm.txt | 1 + drivers/staging/imx-drm/parallel-display.c | 22++++++++++++++++++++ 2 files changed, 23 insertions(+)
diff --git
a/Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txtb/Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txtindex 2d24425..4dd7ce5 100644Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt +1
-0@@ -28,6 +28,7 @@ Required properties: - compatible: Should be "fsl,imx-parallel-display" - crtc: the crtc this display is connected to, see below Optional properties: +- display-supply : phandle to the regulator device tree node if needed. - interface_pix_fmt: How this display is connected to the crtc. Currently supported types: "rgb24", "rgb565", "bgr666", "rgb666" - edid: verbatim EDID data block describing attached display.(quoted diff) +0
-0
b/drivers/staging/imx-drm/parallel-display.cindex 65d0c18..61c0aeb 100644drivers/staging/imx-drm/parallel-display.c +2
-0@@ -22,6 +22,7 @@#include <drm/drmP.h> #include <drm/drm_fb_helper.h> #include <drm/drm_crtc_helper.h> +#include <linux/regulator/consumer.h> #include <linux/videodev2.h> #include "imx-drm.h" @@ -35,6 +36,7 @@ struct imx_parallel_display {struct drm_encoder encoder;struct imx_drm_encoder *imx_drm_encoder;struct device *dev; +struct regulator *disp_reg;void *edid;int edid_len;u32 interface_pix_fmt;
drivers/staging/imx-drm/parallel-display.c static void imx_pd_encoder_prepare(struct drm_encoder · line 150
Quoted 8 lines
drivers/staging/imx-drm/parallel-display.c +5
-0@@ -141,6 +143,13 @@ static void imx_pd_encoder_prepare(struct drm_encoder *encoder) {struct imx_parallel_display *imxpd =enc_to_imxpd (encoder); +if (!IS_ERR (imxpd->disp_reg) && + !regulator_is_enabled (imxpd->disp_reg)) { +if (regulator_enable (imxpd->disp_reg)) +dev_err (imxpd->dev, +"Failed to enable regulator.\n" );
I wonder, is this linebreak needed for this function call ? [...]
Re: [PATCHv5][ 5/8] staging: imx-drm: parallel display: add regulator support.
In reply to Denis CarikliOn Thu, Dec 05, 2013 at 07:28:09PM +0100, Denis Carikli wrote:
[...]
Quoted 1 line
drivers/staging/imx-drm/parallel-display.c +0
-0
[...]
drivers/staging/imx-drm/parallel-display.c static int imx_pd_probe(struct platform_device *pdev) · line 283
Quoted 10 lines
drivers/staging/imx-drm/parallel-display.c +6
-0@@ -260,6 +275,13 @@ static int imx_pd_probe(struct platform_device *pdev)if (ret)return ret; + imxpd->disp_reg =devm_regulator_get (&pdev->dev,"display" ); +if (PTR_ERR (imxpd->disp_reg) == -EPROBE_DEFER ) +return -EPROBE_DEFER ; + +if (IS_ERR (imxpd->disp_reg)) +dev_dbg (&pdev->dev,"Operating without display regulator.\n" );
I don't think this is necessary. There is code in the regulator core nowadays that supplies a dummy regulator if one hasn't been hooked up in devicetree explicitly. So any error that you get at this point is likely a valid one rather than just a missing regulator.
The advantage is that you no longer have to check at every step of the way that the regulator is valid before calling the regulator API.
Thierry
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
PATCH v5 4/8 staging: imx-drm: Use de-active and pixelclk-active display-timings.
In reply to Denis CarikliIf de-active and/or pixelclk-active properties were set in the display-timings DT node, they were not used.
Instead the data-enable and the pixel data clock polarity were hardcoded.
This change is needed for making the eukrea-cpuimx51
QVGA display work.
Greg Kroah-Hartman <[email protected]>
---
ChangeLog v3->v4:
- The old patch was named "staging: imx-drm: ipuv3-crtc: don't harcode some mode".
- Reworked the patch entierly: we now takes the mode flags from the device tree.
ChangeLog v2->v3:
- Added some interested people in the Cc list.
- Ajusted the flags to match the changes in "drm: Add the lacking DRM_MODE_FLAG_* for matching the DISPLAY_FLAGS_*"
--- drivers/staging/imx-drm/imx-drm.h | 3 +++ drivers/staging/imx-drm/ipuv3-crtc.c | 11 +++++++++-- drivers/staging/imx-drm/parallel-display.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-)
drivers/staging/imx-drm/imx-drm.h +3 -0
@@ -5,6 +5,9 @@#define IPU_PIX_FMT_GBR24 v4l2_fourcc('G', 'B', 'R', '3') +#define IMXDRM_MODE_FLAG_DE_HIGH (1<<0) +#define IMXDRM_MODE_FLAG_PIXDATA_POSEDGE (1<<1) +struct drm_crtc ;struct drm_connector ;struct drm_device ;
drivers/staging/imx-drm/ipuv3-crtc.c +9 -2
@@ -156,8 +156,15 @@ static int ipu_crtc_mode_set(struct drm_crtc *crtc,if (mode->flags &DRM_MODE_FLAG_PVSYNC ) sig_cfg.Vsync_pol =1 ; - sig_cfg.enable_pol =1 ; - sig_cfg.clk_pol =1 ; +/* Such flags are not availables in the DRM modes header, +* and we don't want to export them to userspace. +*/ +if (mode->private_flags &IMXDRM_MODE_FLAG_DE_HIGH ) + sig_cfg.enable_pol =1 ; + +if (mode->private_flags &IMXDRM_MODE_FLAG_PIXDATA_POSEDGE ) + sig_cfg.clk_pol =1 ; + sig_cfg.width = mode->hdisplay; sig_cfg.height = mode->vdisplay; sig_cfg.pixel_fmt = out_pixel_fmt;
drivers/staging/imx-drm/parallel-display.c +28 -0
@@ -74,7 +74,35 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)if (np) {struct drm_display_mode *mode =drm_mode_create (connector->dev); +struct device_node *timings_np; +struct device_node *mode_np; +u32 val; +of_get_drm_display_mode (np, &imxpd->mode,0 ); + +/* Such flags are not availables in the DRM modes header, +* and we don't want to export them to userspace. +*/ + timings_np =of_get_child_by_name (np,"display-timings" ); +if (timings_np) { +/* get the display mode node */ + mode_np =of_parse_phandle (timings_np, +"native-mode" ,0 ); +if (!mode_np) + mode_np =of_get_next_child (timings_np,NULL ); + +/* set de-active to 1 if not set */ +of_property_read_u32 (mode_np,"de-active" , &val); +if (!!val) + imxpd->mode.private_flags |= +IMXDRM_MODE_FLAG_DE_HIGH ; + +/* set pixelclk-active to 1 if not set */ +of_property_read_u32 (mode_np,"pixelclk-active" , &val); +if (!!val) + imxpd->mode.private_flags |= +IMXDRM_MODE_FLAG_PIXDATA_POSEDGE ; + }drm_mode_copy (mode, &imxpd->mode); mode->type |=DRM_MODE_TYPE_DRIVER |DRM_MODE_TYPE_PREFERRED ,drm_mode_probed_add (connector, mode);
Signature · 6 lines
1.7.9.5 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCHv5][ 4/8] staging: imx-drm: Use de-active and pixelclk-active display-timings.
Quoted 55 lines · Denis Carikli
If de-active and/or pixelclk-active properties were set in the display-timings DT node, they were not used.
Instead the data-enable and the pixel data clock polarity were hardcoded.
This change is needed for making the eukrea-cpuimx51
QVGA display work.Greg Kroah-Hartman <[email protected]>
Cc Philipp Zabel <[email protected]>Cc Sascha Hauer <[email protected]>Cc Shawn Guo <[email protected]>Cc David Airlie <[email protected]>Cc Eric Bénard <[email protected]>Signed-off-by Denis Carikli <[email protected]>---
ChangeLogv3->v4:
- The old patch was named "staging: imx-drm: ipuv3-crtc: don't harcode some mode". - Reworked the patch entierly: we now takes the mode flags from the device tree.ChangeLog
v2->v3:
- Added some interested people in the Cc list.
- Ajusted the flags to match the changes in "drm: Add the lacking DRM_MODE_FLAG_* for matching the DISPLAY_FLAGS_*"--- drivers/staging/imx-drm/imx-drm.h | 3 +++ drivers/staging/imx-drm/ipuv3-crtc.c | 11 +++++++++-- drivers/staging/imx-drm/parallel-display.c | 28++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-)
(quoted diff) +0
-0
b/drivers/staging/imx-drm/imx-drm.hindex ae90c9c..dfdc180 100644drivers/staging/imx-drm/imx-drm.h +3
-0@@ -5,6 +5,9 @@#define IPU_PIX_FMT_GBR24 v4l2_fourcc('G', 'B', 'R', '3') +#define IMXDRM_MODE_FLAG_DE_HIGH (1<<0) +#define IMXDRM_MODE_FLAG_PIXDATA_POSEDGE (1<<1) +struct drm_crtc ;struct drm_connector ;struct drm_device ;(quoted diff) +0
-0
b/drivers/staging/imx-drm/ipuv3-crtc.cindex ce6ba98..f3d2cae 100644
drivers/staging/imx-drm/ipuv3-crtc.c static int ipu_crtc_mode_set(struct drm_crtc *crtc, · line 161
Quoted 8 lines
drivers/staging/imx-drm/ipuv3-crtc.c +3
-2@@ -156,8 +156,15 @@ static int ipu_crtc_mode_set(struct drm_crtc *crtc,if (mode->flags &DRM_MODE_FLAG_PVSYNC ) sig_cfg.Vsync_pol =1 ; - sig_cfg.enable_pol =1 ; - sig_cfg.clk_pol =1 ; +/* Such flags are not availables in the DRM modes header, +* and we don't want to export them to userspace. +*/
The multiline comment here is not correct.
Quoted 17 lines
drivers/staging/imx-drm/ipuv3-crtc.c +6
-0+if (mode->private_flags &IMXDRM_MODE_FLAG_DE_HIGH ) + sig_cfg.enable_pol =1 ; + +if (mode->private_flags &IMXDRM_MODE_FLAG_PIXDATA_POSEDGE ) + sig_cfg.clk_pol =1 ; + sig_cfg.width = mode->hdisplay; sig_cfg.height = mode->vdisplay; sig_cfg.pixel_fmt = out_pixel_fmt;(quoted diff) +0
-0
b/drivers/staging/imx-drm/parallel-display.cindex bb71d6d..65d0c18 100644drivers/staging/imx-drm/parallel-display.c +0
-0@@ -74,7 +74,35 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector) if (np) {
drivers/staging/imx-drm/parallel-display.c static int imx_pd_connector_get_modes(struct · line 86
Quoted 10 lines
drivers/staging/imx-drm/parallel-display.c +8
-0struct drm_display_mode *mode =drm_mode_create (connector->dev); +struct device_node *timings_np; +struct device_node *mode_np; +u32 val; +of_get_drm_display_mode (np, &imxpd->mode,0 ); + +/* Such flags are not availables in the DRM modes header, +* and we don't want to export them to userspace. +*/
DTTO
drivers/staging/imx-drm/parallel-display.c static int imx_pd_connector_get_modes(struct drm_connector *connector) · line 96
Quoted 11 lines
drivers/staging/imx-drm/parallel-display.c +11
-0+ timings_np =of_get_child_by_name (np,"display-timings" ); +if (timings_np) { +/* get the display mode node */ + mode_np =of_parse_phandle (timings_np, +"native-mode" ,0 ); +if (!mode_np) + mode_np =of_get_next_child (timings_np,NULL ); + +/* set de-active to 1 if not set */ +of_property_read_u32 (mode_np,"de-active" , &val); +if (!!val)
'if (val)' is enough.
drivers/staging/imx-drm/parallel-display.c static int imx_pd_connector_get_modes(struct drm_connector *connector) · line 102
Quoted 6 lines
drivers/staging/imx-drm/parallel-display.c +6
-0+ imxpd->mode.private_flags |= +IMXDRM_MODE_FLAG_DE_HIGH ; + +/* set pixelclk-active to 1 if not set */ +of_property_read_u32 (mode_np,"pixelclk-active" , &val); +if (!!val)
DTTO, also please add {} around multiline expression.
Quoted 6 lines
drivers/staging/imx-drm/parallel-display.c +3
-0+ imxpd->mode.private_flags |= +IMXDRM_MODE_FLAG_PIXDATA_POSEDGE ; + }drm_mode_copy (mode, &imxpd->mode); mode->type |= DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED,
drm_mode_probed_add(connector, mode);
PATCH v5 6/8 ARM: dts: mbimx51sd: Add display support.
In reply to Denis CarikliThe CMO-QVGA, DVI-SVGA and DVI-VGA are added.
---
ChangeLog v3->v5:
- Updated to new GPIO defines.
- Updated to new licenses checkpatch requirements.
- one whitespace cleanup.
ChangeLog v2->v3:
- Splitted out from the patch that added support for the cpuimx51/mbimxsd51 boards.
- This patch now only adds display support.
- Added some interested people in the Cc list, and removed some people that might be annoyed by the receiving of that patch which is unrelated to their subsystem.
- rebased and reworked the dts displays addition.
- Also rebased and reworked the fsl,pins usage.
--- .../imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dts | 55 ++++++++++++++++++++ .../imx51-eukrea-mbimxsd51-baseboard-dvi-svga.dts | 42 +++++++++++++++ .../imx51-eukrea-mbimxsd51-baseboard-dvi-vga.dts | 42 +++++++++++++++ .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 13 +++++ 4 files changed, 152 insertions(+) create mode 100644 arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dts create mode 100644 arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-dvi-svga.dts create mode 100644 arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-dvi-vga.dts
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dts new file +55 -0
@@ -0,0 +1,55 @@ +/* + * Copyright 2013 Eukr?a Electromatique <[email protected]> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include "imx51-eukrea-mbimxsd51-baseboard.dts" + +/ { + model = "Eukrea MBIMXSD51 with the CMO-QVGA Display"; + compatible = "eukrea,mbimxsd51-baseboard-cmo-qvga", "eukrea,mbimxsd51-baseboard", "eukrea,cpuimx51", "fsl,imx51"; + + reg_lcd_3v3: lcd-en { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_reg_lcd_3v3>; + regulator-name = "lcd-3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio3 13 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; +}; + +&display { + display-supply = <®_lcd_3v3>; + status = "okay"; + display-timings { + model = "CMO-QVGA"; + bits-per-pixel = <16>; + cmoqvga { + native-mode; + clock-frequency = <6500000>; + hactive = <320>; + vactive = <240>; + hfront-porch = <20>; + hback-porch = <38>; + vfront-porch = <4>; + vback-porch = <15>; + hsync-len = <30>; + vsync-len = <3>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <0>; + pixelclk-active = <1>; + }; + }; +};
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-dvi-svga.dts new file +42 -0
42 lines not on this page · raw message
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-dvi-vga.dts new file +42 -0
42 lines not on this page · raw message
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts +13 -0
@@ -23,6 +23,15 @@ model = "Eukrea CPUIMX51"; compatible = "eukrea,mbimxsd51","eukrea,cpuimx51", "fsl,imx51"; + display: display at di0 { + compatible = "fsl,imx-parallel-display"; + crtcs = <&ipu 0>; + interface-pix-fmt = "rgb666"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu_disp1>; + status = "disabled"; + }; + gpio_keys { compatible = "gpio-keys"; pinctrl-names = "default";
@@ -116,6 +125,10 @@ >; }; + pinctrl_ipu_disp1: ipudisp1grp { + fsl,pins = <MX51_IPU_DISP1_PINGRP1>; + }; + pinctrl_reg_lcd_3v3: reg_lcd_3v3 { fsl,pins = < MX51_PAD_CSI1_D9__GPIO3_13 0x1f5
Signature · 1 line
1.7.9.5
PATCH v5 6/8 ARM: dts: mbimx51sd: Add display support.
Quoted 66 lines · Denis Carikli
The CMO-QVGA, DVI-SVGA and DVI-VGA are added.
Cc Shawn Guo <[email protected]>Cc Sascha Hauer <[email protected]>Cc linux-arm-kernel at lists.infradead.orgCc Eric B?nard <[email protected]>Signed-off-by Denis Carikli <[email protected]>---
ChangeLogv3->v5:
- Updated to new GPIO defines.
- Updated to new licenses checkpatch requirements.
- one whitespace cleanup.ChangeLog
v2->v3:
- Splitted out from the patch that added support for the cpuimx51/mbimxsd51 boards. - This patch now only adds display support.
- Added some interested people in the Cc list, and removed some people that might be annoyed by the receiving of that patch which is unrelated to
their subsystem.
- rebased and reworked the dts displays addition.
- Also rebased and reworked the fsl,pins usage.--- .../imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dts | 55++++++++++++++++++++
.../imx51-eukrea-mbimxsd51-baseboard-dvi-svga.dts|
42 +++++++++++++++.../imx51-eukrea-mbimxsd51-baseboard-dvi-vga.dts|
42 +++++++++++++++.../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts| 13 +++++4 files changed, 152 insertions(+) create mode 100644
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dtscreate mode 100644arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-dvi-svga.dtscreate mode 100644arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-dvi-vga.dtsdiff --git
a/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dtsb/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dtsnew file mode 100644
index 0000000..f37d65barch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dts new file +18
-0@@ -0,0 +1,55 @@ +/* + * Copyright 2013 Eukr?a Electromatique <[email protected]> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include "imx51-eukrea-mbimxsd51-baseboard.dts" + +/ { + model = "Eukrea MBIMXSD51 with the CMO-QVGA Display"; + compatible = "eukrea,mbimxsd51-baseboard-cmo-qvga","eukrea,mbimxsd51-baseboard", "eukrea,cpuimx51", "fsl,imx51"; +
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dts new file +5
-0+ reg_lcd_3v3: lcd-en { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_reg_lcd_3v3>; + regulator-name = "lcd-3v3";
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dts line 34
Quoted 10 lines
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dts new file +10
-0+ regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio3 13 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; +}; + +&display { + display-supply = <®_lcd_3v3>; + status = "okay";
The "status = " here should probably be in the board DTS, not in the LCD DTS.
Quoted 21 lines
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dts new file +21
-0+ display-timings { + model = "CMO-QVGA"; + bits-per-pixel = <16>; + cmoqvga { + native-mode; + clock-frequency = <6500000>; + hactive = <320>; + vactive = <240>; + hfront-porch = <20>; + hback-porch = <38>; + vfront-porch = <4>; + vback-porch = <15>; + hsync-len = <30>; + vsync-len = <3>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <0>; + pixelclk-active = <1>; + }; + }; +};
[...]
PATCH v5 6/8 ARM: dts: mbimx51sd: Add display support.
Quoted 1 line · Marek Vasut
Quoted 1 line
+++
b/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dts
[...]
Quoted 5 lines
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dts line 34
Quoted 3 lines
+&display {
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dts new file +2
-0+ display-supply = <®_lcd_3v3>; + status = "okay";The "status = " here should probably be in the board DTS, not in the LCD DTS.
The display is optional on the baseboard of the cpuimx51.
So my idea was to activate the display only for the configurations where it's used.
Denis.
PATCH v5 7/8 ARM: dts: mbimx51sd: Add CMO-QVGA backlight support.
In reply to Denis Carikli---
ChangeLog v3->v5:
- Updated to the new GPIO defines.
ChangeLog v2->v3:
- Splitted out from the patch that added support for the cpuimx51/mbimxsd51 boards.
- This patch now only adds backlight support.
- Added some interested people in the Cc list, and removed some people that might be annoyed by the receiving of that patch which is unrelated to their subsystem.
--- .../imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dts | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dts +8 -0
@@ -17,6 +17,14 @@ model = "Eukrea MBIMXSD51 with the CMO-QVGA Display"; compatible = "eukrea,mbimxsd51-baseboard-cmo-qvga", "eukrea,mbimxsd51-baseboard", "eukrea,cpuimx51", "fsl,imx51"; + backlight { + compatible = "gpio-backlight"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_backlight_1>; + gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>; + default-brightness-level = <1>; + }; + reg_lcd_3v3: lcd-en { compatible = "regulator-fixed"; pinctrl-names = "default";
Signature · 1 line
1.7.9.5
PATCH v5 8/8 ARM: imx_v6_v7_defconfig: Enable backlight gpio support.
In reply to Denis CarikliThe eukrea mbimxsd51 has a gpio backlight for its
LCD display, so we turn that driver on.
---
ChangeLog v5:
- New patch in this serie.
--- arch/arm/configs/imx_v6_v7_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/configs/imx_v6_v7_defconfig +1 -0
@@ -183,6 +183,7 @@ CONFIG_LCD_L4F00242T03=y CONFIG_LCD_PLATFORM=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_PWM=y +CONFIG_BACKLIGHT_GPIO=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_LOGO=y CONFIG_SOUND=y
Signature · 1 line
1.7.9.5