From f45a65711d5d920330dd003b27899ca984537fcd Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 8 Apr 2013 18:04:32 +0200 Subject: [PATCH] --- yaml --- r: 363973 b: refs/heads/master c: eeb14ec8da9ca0f800edf6f7652269cb6aa0028f h: refs/heads/master i: 363971: 67580b318e24270f63b8bb46b018a9ba1f601afc v: v3 --- [refs] | 2 +- trunk/drivers/staging/imx-drm/imx-drm.h | 10 ++++++++++ trunk/drivers/staging/imx-drm/ipu-v3/ipu-dc.c | 10 ++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8bd59c3fdea4..3b0efa303f44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d2409d4f1d459ad734718ab19c731a934968ec0 +refs/heads/master: eeb14ec8da9ca0f800edf6f7652269cb6aa0028f diff --git a/trunk/drivers/staging/imx-drm/imx-drm.h b/trunk/drivers/staging/imx-drm/imx-drm.h index ae28a490c445..a24508f05845 100644 --- a/trunk/drivers/staging/imx-drm/imx-drm.h +++ b/trunk/drivers/staging/imx-drm/imx-drm.h @@ -1,8 +1,18 @@ #ifndef _IMX_DRM_H_ #define _IMX_DRM_H_ +#include + +#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/trunk/drivers/staging/imx-drm/ipu-v3/ipu-dc.c b/trunk/drivers/staging/imx-drm/ipu-v3/ipu-dc.c index 93c7579417be..fad50576cd7c 100644 --- a/trunk/drivers/staging/imx-drm/ipu-v3/ipu-dc.c +++ b/trunk/drivers/staging/imx-drm/ipu-v3/ipu-dc.c @@ -20,6 +20,7 @@ #include #include +#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; }