diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2013-04-08 18:04:32 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-09 16:16:16 -0700 |
| commit | eeb14ec8da9ca0f800edf6f7652269cb6aa0028f (patch) | |
| tree | dec13a336d547af63406ab4c0b5490813a0bb3db /drivers | |
| parent | 3d2409d4f1d459ad734718ab19c731a934968ec0 (diff) | |
staging: drm/imx: ipu-dc: add 24-bit GBR support to DC
24-bit GBR order is needed on the display interface connected
to the Television Encoder (TVEv2) on i.MX53.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/imx-drm/imx-drm.h | 10 | ||||
| -rw-r--r-- | drivers/staging/imx-drm/ipu-v3/ipu-dc.c | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/drivers/staging/imx-drm/imx-drm.h b/drivers/staging/imx-drm/imx-drm.h index ae28a490c445..a24508f05845 100644 --- a/drivers/staging/imx-drm/imx-drm.h +++ b/drivers/staging/imx-drm/imx-drm.h @@ -1,8 +1,18 @@ #ifndef _IMX_DRM_H_ #define _IMX_DRM_H_ +#include <linux/videodev2.h> + +#define IPU_PIX_FMT_GBR24 v4l2_fourcc('G', 'B', 'R', '3') + +struct drm_crtc; +struct drm_connector; +struct drm_device; +struct drm_encoder; struct imx_drm_crtc; struct drm_fbdev_cma; +struct drm_framebuffer; +struct platform_device; struct imx_drm_crtc_helper_funcs { int (*enable_vblank)(struct drm_crtc *crtc); diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-dc.c b/drivers/staging/imx-drm/ipu-v3/ipu-dc.c index 93c7579417be..fad50576cd7c 100644 --- a/drivers/staging/imx-drm/ipu-v3/ipu-dc.c +++ b/drivers/staging/imx-drm/ipu-v3/ipu-dc.c @@ -20,6 +20,7 @@ #include <linux/delay.h> #include <linux/io.h> +#include "../imx-drm.h" #include "imx-ipu-v3.h" #include "ipu-prv.h" @@ -86,6 +87,7 @@ struct ipu_dc_priv; enum ipu_dc_map { IPU_DC_MAP_RGB24, IPU_DC_MAP_RGB565, + IPU_DC_MAP_GBR24, /* TVEv2 */ }; struct ipu_dc { @@ -136,6 +138,8 @@ static int ipu_pixfmt_to_map(u32 fmt) return IPU_DC_MAP_RGB24; case V4L2_PIX_FMT_RGB565: return IPU_DC_MAP_RGB565; + case IPU_PIX_FMT_GBR24: + return IPU_DC_MAP_GBR24; default: return -EINVAL; } @@ -364,6 +368,12 @@ int ipu_dc_init(struct ipu_soc *ipu, struct device *dev, ipu_dc_map_config(priv, IPU_DC_MAP_RGB565, 1, 10, 0xfc); /* green */ ipu_dc_map_config(priv, IPU_DC_MAP_RGB565, 2, 15, 0xf8); /* red */ + /* gbr24 */ + ipu_dc_map_clear(priv, IPU_DC_MAP_GBR24); + ipu_dc_map_config(priv, IPU_DC_MAP_GBR24, 2, 15, 0xff); /* green */ + 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 */ + return 0; } |