Skip to contentSkip to conversation

staging: imx-drm: add LVDS666 support for parallel display

PATCH New Emil Renner Berthing 2 participants 4 messages Mar 28, 2014 – Mar 29, 2014

Subsystems (3)
Device tree bindings Arm i.MX and Layerscape Staging
lore
Share & tools
lore

Emil Renner Berthing

author
#0 lore raw

PATCH 1/1 staging: imx-drm: add LVDS666 support for parallel display

Support the LVDS666 format on the IPUv3 parallel display. This makes the screen work on my Hercules eCAFE Slim HD.

Signed-off-by Emil Renner Berthing <[email protected]>
---
 .../devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt          | 1 +
 drivers/staging/imx-drm/ipu-v3/ipu-dc.c                          | 9 +++++++++
 drivers/staging/imx-drm/parallel-display.c                       | 2 ++
 3 files changed, 12 insertions(+)
Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt +1 -0
index 3be5ce7..e75f0e5 100644
@@ -61,6 +61,7 @@ Required properties:
 Optional properties:
 - interface_pix_fmt: How this display is connected to the
   display interface. Currently supported types: "rgb24", "rgb565", "bgr666"
+  and "lvds666".
 - 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
index 156bbea..9945609 100644
@@ -91,6 +91,7 @@ enum ipu_dc_map {
 	IPU_DC_MAP_RGB565,
 	IPU_DC_MAP_GBR24, /* TVEv2 */
 	IPU_DC_MAP_BGR666,
+	IPU_DC_MAP_LVDS666,
 	IPU_DC_MAP_BGR24,
 };
 

@@ -155,6 +156,8 @@ static int ipu_pixfmt_to_map(u32 fmt)
 		return IPU_DC_MAP_GBR24;
 	case V4L2_PIX_FMT_BGR666:
 		return IPU_DC_MAP_BGR666;
+	case v4l2_fourcc('L', 'V', 'D', '6'):
+		return IPU_DC_MAP_LVDS666;
 	case V4L2_PIX_FMT_BGR24:
 		return IPU_DC_MAP_BGR24;
 	default:

@@ -409,6 +412,12 @@ int ipu_dc_init(struct ipu_soc *ipu, struct device *dev,
 	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 */
 
+	/* lvds666 */
+	ipu_dc_map_clear(priv, IPU_DC_MAP_LVDS666);
+	ipu_dc_map_config(priv, IPU_DC_MAP_LVDS666, 0, 5, 0xfc); /* blue */
+	ipu_dc_map_config(priv, IPU_DC_MAP_LVDS666, 1, 15, 0xfc); /* green */
+	ipu_dc_map_config(priv, IPU_DC_MAP_LVDS666, 2, 21, 0xfc); /* red */
+
 	/* bgr24 */
 	ipu_dc_map_clear(priv, IPU_DC_MAP_BGR24);
 	ipu_dc_map_config(priv, IPU_DC_MAP_BGR24, 2, 7, 0xff); /* red */
drivers/staging/imx-drm/parallel-display.c +2 -0
index b25e787..e194f92 100644
@@ -214,6 +214,8 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data)
 			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, "lvds666"))
+			imxpd->interface_pix_fmt = v4l2_fourcc('L', 'V', 'D', '6');
 	}
 
 	panel_node = of_parse_phandle(np, "fsl,panel", 0);
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 staging: imx-drm: add LVDS666 support for parallel display

drivers/staging/imx-drm/ipu-v3/ipu-dc.c int ipu_dc_init(struct ipu_soc *ipu, struct device *dev, · line 420

Quoted 11 lines · Emil Renner Berthing
drivers/staging/imx-drm/ipu-v3/ipu-dc.c +6 -0
index 156bbea..9945609 100644
 
+	/* lvds666 */
+	ipu_dc_map_clear(priv, IPU_DC_MAP_LVDS666);
+	ipu_dc_map_config(priv, IPU_DC_MAP_LVDS666, 0, 5, 0xfc); /* blue */
+	ipu_dc_map_config(priv, IPU_DC_MAP_LVDS666, 1, 15, 0xfc); /* green */
+	ipu_dc_map_config(priv, IPU_DC_MAP_LVDS666, 2, 21, 0xfc); /* red */
+

Should the 15 above be 13. ie 5+8=13, 13+8=21
Also, imx_3.0.35_4.1.0 uses 13.

Troy

author
#2 lore raw

PATCH 1/1 staging: imx-drm: add LVDS666 support for parallel display

Quoted 6 lines · Troy Kisky
Quoted 5 lines · Emil Renner Berthing
drivers/staging/imx-drm/ipu-v3/ipu-dc.c +0 -0
index 156bbea..9945609 100644
Quoted 9 lines

drivers/staging/imx-drm/ipu-v3/ipu-dc.c int ipu_dc_init(struct ipu_soc *ipu, struct device *dev, · line 420

Quoted 6 lines
drivers/staging/imx-drm/ipu-v3/ipu-dc.c +6 -0
+     /* lvds666 */
+     ipu_dc_map_clear(priv, IPU_DC_MAP_LVDS666);
+     ipu_dc_map_config(priv, IPU_DC_MAP_LVDS666, 0, 5, 0xfc); /* blue */
+     ipu_dc_map_config(priv, IPU_DC_MAP_LVDS666, 1, 15, 0xfc); /* green */
+     ipu_dc_map_config(priv, IPU_DC_MAP_LVDS666, 2, 21, 0xfc); /* red */
+

Should the 15 above be 13. ie 5+8=13, 13+8=21
Also, imx_3.0.35_4.1.0 uses 13.

You're absolutely right, thanks. Don't know how I made that typo. I'll resend an updated patch.

/Emil

author
#3 lore raw

PATCH 1/1 staging: imx-drm: add LVDS666 support for parallel display

In reply to Emil Renner Berthing

Support the LVDS666 format on the IPUv3 parallel display. This makes the screen work on my Hercules eCAFE Slim HD.

Signed-off-by Emil Renner Berthing <[email protected]>
---
 .../devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt          | 1 +
 drivers/staging/imx-drm/ipu-v3/ipu-dc.c                          | 9 +++++++++
 drivers/staging/imx-drm/parallel-display.c                       | 2 ++
 3 files changed, 12 insertions(+)
Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt +1 -0
index 3be5ce7..e75f0e5 100644
@@ -61,6 +61,7 @@ Required properties:
 Optional properties:
 - interface_pix_fmt: How this display is connected to the
   display interface. Currently supported types: "rgb24", "rgb565", "bgr666"
+  and "lvds666".
 - 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
index 156bbea..caca2d5 100644
@@ -91,6 +91,7 @@ enum ipu_dc_map {
 	IPU_DC_MAP_RGB565,
 	IPU_DC_MAP_GBR24, /* TVEv2 */
 	IPU_DC_MAP_BGR666,
+	IPU_DC_MAP_LVDS666,
 	IPU_DC_MAP_BGR24,
 };
 

@@ -155,6 +156,8 @@ static int ipu_pixfmt_to_map(u32 fmt)
 		return IPU_DC_MAP_GBR24;
 	case V4L2_PIX_FMT_BGR666:
 		return IPU_DC_MAP_BGR666;
+	case v4l2_fourcc('L', 'V', 'D', '6'):
+		return IPU_DC_MAP_LVDS666;
 	case V4L2_PIX_FMT_BGR24:
 		return IPU_DC_MAP_BGR24;
 	default:

@@ -409,6 +412,12 @@ int ipu_dc_init(struct ipu_soc *ipu, struct device *dev,
 	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 */
 
+	/* lvds666 */
+	ipu_dc_map_clear(priv, IPU_DC_MAP_LVDS666);
+	ipu_dc_map_config(priv, IPU_DC_MAP_LVDS666, 0, 5, 0xfc); /* blue */
+	ipu_dc_map_config(priv, IPU_DC_MAP_LVDS666, 1, 13, 0xfc); /* green */
+	ipu_dc_map_config(priv, IPU_DC_MAP_LVDS666, 2, 21, 0xfc); /* red */
+
 	/* bgr24 */
 	ipu_dc_map_clear(priv, IPU_DC_MAP_BGR24);
 	ipu_dc_map_config(priv, IPU_DC_MAP_BGR24, 2, 7, 0xff); /* red */
drivers/staging/imx-drm/parallel-display.c +2 -0
index b25e787..e194f92 100644
@@ -214,6 +214,8 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data)
 			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, "lvds666"))
+			imxpd->interface_pix_fmt = v4l2_fourcc('L', 'V', 'D', '6');
 	}
 
 	panel_node = of_parse_phandle(np, "fsl,panel", 0);
Signature · 1 line
1.9.1