redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: video: imx: Add BGR666 support for parallel display

Browse source 
Support the BGR666 format on the IPUv3 parallel display.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Marek Vasut 2013-04-22 23:19:31 +02:00 committed by Greg Kroah-Hartman
parent 5b9974b13e
commit 7d0a66c0cc
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt
View file

@ -26,7 +26,7 @@ Required properties:
- crtc: the crtc this display is connected to, see below - crtc: the crtc this display is connected to, see below
Optional properties: Optional properties:
- interface_pix_fmt: How this display is connected to the - interface_pix_fmt: How this display is connected to the
crtc. Currently supported types: "rgb24", "rgb565" crtc. Currently supported types: "rgb24", "rgb565", "bgr666"
- edid: verbatim EDID data block describing attached display. - edid: verbatim EDID data block describing attached display.
- ddc: phandle describing the i2c bus handling the display data - ddc: phandle describing the i2c bus handling the display data
channel channel

9
drivers/staging/imx-drm/ipu-v3/ipu-dc.c
View file

@ -90,6 +90,7 @@ enum ipu_dc_map {
IPU_DC_MAP_RGB24, IPU_DC_MAP_RGB24,
IPU_DC_MAP_RGB565, IPU_DC_MAP_RGB565,
IPU_DC_MAP_GBR24, /* TVEv2 */ IPU_DC_MAP_GBR24, /* TVEv2 */
IPU_DC_MAP_BGR666,
}; };
struct ipu_dc { struct ipu_dc {
@ -149,6 +150,8 @@ static int ipu_pixfmt_to_map(u32 fmt)
return IPU_DC_MAP_RGB565; return IPU_DC_MAP_RGB565;
case IPU_PIX_FMT_GBR24: case IPU_PIX_FMT_GBR24:
return IPU_DC_MAP_GBR24; return IPU_DC_MAP_GBR24;
case V4L2_PIX_FMT_BGR666:
return IPU_DC_MAP_BGR666;
default: default:
return -EINVAL; return -EINVAL;
} }
@ -385,6 +388,12 @@ int ipu_dc_init(struct ipu_soc *ipu, struct device *dev,
ipu_dc_map_config(priv, IPU_DC_MAP_GBR24, 1, 7, 0xff); /* blue */ ipu_dc_map_config(priv, IPU_DC_MAP_GBR24, 1, 7, 0xff); /* blue */
ipu_dc_map_config(priv, IPU_DC_MAP_GBR24, 0, 23, 0xff); /* red */ ipu_dc_map_config(priv, IPU_DC_MAP_GBR24, 0, 23, 0xff); /* red */
/* 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, 1, 11, 0xfc); /* green */
ipu_dc_map_config(priv, IPU_DC_MAP_BGR666, 2, 17, 0xfc); /* red */
return 0; return 0;
} }

2
drivers/staging/imx-drm/parallel-display.c
View file

@ -230,6 +230,8 @@ static int imx_pd_probe(struct platform_device *pdev)
imxpd->interface_pix_fmt = V4L2_PIX_FMT_RGB24; imxpd->interface_pix_fmt = V4L2_PIX_FMT_RGB24;
else if (!strcmp(fmt, "rgb565")) else if (!strcmp(fmt, "rgb565"))
imxpd->interface_pix_fmt = V4L2_PIX_FMT_RGB565; imxpd->interface_pix_fmt = V4L2_PIX_FMT_RGB565;
else if (!strcmp(fmt, "bgr666"))
imxpd->interface_pix_fmt = V4L2_PIX_FMT_BGR666;
} }
imxpd->dev = &pdev->dev; imxpd->dev = &pdev->dev;