summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/manager.c
diff options
context:
space:
mode:
authorAmber Jain <amber@ti.com>2011-05-19 16:17:50 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-05-23 07:29:47 +0200
commitf20e42205ab172cfd449c10e5183e2e371a629d6 (patch)
tree2d5652fcf8eed5a7e55cd75ef40ed9ab465fe72a /drivers/video/omap2/dss/manager.c
parentOMAP4: DSS2: HDMI: Implement ASoC Codec driver for HDMI audio (diff)
downloadlinux-f20e42205ab172cfd449c10e5183e2e371a629d6.tar.xz
linux-f20e42205ab172cfd449c10e5183e2e371a629d6.zip
OMAP: DSS2: Add new color formats for OMAP4
Add new color formats supported by OMAP4: NV12, RGBA16, RGBX16, ARGB16_1555, XRGB16_1555. NV12 color format is defined here, its support in DSS will be added separately. Signed-off-by: Amber Jain <amber@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/manager.c')
-rw-r--r--drivers/video/omap2/dss/manager.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
index ee38ca2cfaa8..b40fe3dc9875 100644
--- a/drivers/video/omap2/dss/manager.c
+++ b/drivers/video/omap2/dss/manager.c
@@ -775,10 +775,17 @@ static int configure_overlay(enum omap_plane plane)
}
switch (c->color_mode) {
+ case OMAP_DSS_COLOR_NV12:
+ bpp = 8;
+ break;
case OMAP_DSS_COLOR_RGB16:
case OMAP_DSS_COLOR_ARGB16:
case OMAP_DSS_COLOR_YUV2:
case OMAP_DSS_COLOR_UYVY:
+ case OMAP_DSS_COLOR_RGBA16:
+ case OMAP_DSS_COLOR_RGBX16:
+ case OMAP_DSS_COLOR_ARGB16_1555:
+ case OMAP_DSS_COLOR_XRGB16_1555:
bpp = 16;
break;