leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: drm/imx: ipu-dc: add 24-bit GBR support to DC

Browse Source 
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>
This commit is contained in:
Philipp Zabel 2013-04-08 18:04:32 +02:00 committed by Greg Kroah-Hartman
parent 3d2409d4f1
commit eeb14ec8da
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/imx-drm/imx-drm.h
View File

@ -1,8 +1,18 @@
#ifndef _IMX_DRM_H_ #ifndef _IMX_DRM_H_
#define _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 imx_drm_crtc;
struct drm_fbdev_cma; struct drm_fbdev_cma;
struct drm_framebuffer;
struct platform_device;
struct imx_drm_crtc_helper_funcs { struct imx_drm_crtc_helper_funcs {
int (*enable_vblank)(struct drm_crtc *crtc); int (*enable_vblank)(struct drm_crtc *crtc);

10
drivers/staging/imx-drm/ipu-v3/ipu-dc.c
View File

@ -20,6 +20,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/io.h> #include <linux/io.h>
#include "../imx-drm.h"
#include "imx-ipu-v3.h" #include "imx-ipu-v3.h"
#include "ipu-prv.h" #include "ipu-prv.h"
@ -86,6 +87,7 @@ struct ipu_dc_priv;
enum ipu_dc_map { 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 */
}; };
struct ipu_dc { struct ipu_dc {
@ -136,6 +138,8 @@ static int ipu_pixfmt_to_map(u32 fmt)
return IPU_DC_MAP_RGB24; return IPU_DC_MAP_RGB24;
case V4L2_PIX_FMT_RGB565: case V4L2_PIX_FMT_RGB565:
return IPU_DC_MAP_RGB565; return IPU_DC_MAP_RGB565;
case IPU_PIX_FMT_GBR24:
return IPU_DC_MAP_GBR24;
default: default:
return -EINVAL; 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, 1, 10, 0xfc); /* green */
ipu_dc_map_config(priv, IPU_DC_MAP_RGB565, 2, 15, 0xf8); /* red */ 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; return 0;
} }