diff options
| author | Amber Jain <amber@ti.com> | 2011-05-19 10:17:50 -0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-05-23 01:29:47 -0400 |
| commit | f20e42205ab172cfd449c10e5183e2e371a629d6 (patch) | |
| tree | 2d5652fcf8eed5a7e55cd75ef40ed9ab465fe72a /drivers/video/omap2/dss/dss_features.c | |
| parent | ad44cc3298872c4d4f4b034df9163c3944ae8c1c (diff) | |
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/dss_features.c')
| -rw-r--r-- | drivers/video/omap2/dss/dss_features.c | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c index 81abad3603b9..6d88a6323229 100644 --- a/drivers/video/omap2/dss/dss_features.c +++ b/drivers/video/omap2/dss/dss_features.c | |||
| @@ -177,6 +177,37 @@ static const enum omap_color_mode omap3_dss_supported_color_modes[] = { | |||
| 177 | OMAP_DSS_COLOR_RGBA32 | OMAP_DSS_COLOR_RGBX32, | 177 | OMAP_DSS_COLOR_RGBA32 | OMAP_DSS_COLOR_RGBX32, |
| 178 | }; | 178 | }; |
| 179 | 179 | ||
| 180 | static const enum omap_color_mode omap4_dss_supported_color_modes[] = { | ||
| 181 | /* OMAP_DSS_GFX */ | ||
| 182 | OMAP_DSS_COLOR_CLUT1 | OMAP_DSS_COLOR_CLUT2 | | ||
| 183 | OMAP_DSS_COLOR_CLUT4 | OMAP_DSS_COLOR_CLUT8 | | ||
| 184 | OMAP_DSS_COLOR_RGB12U | OMAP_DSS_COLOR_ARGB16 | | ||
| 185 | OMAP_DSS_COLOR_RGB16 | OMAP_DSS_COLOR_RGB24U | | ||
| 186 | OMAP_DSS_COLOR_RGB24P | OMAP_DSS_COLOR_ARGB32 | | ||
| 187 | OMAP_DSS_COLOR_RGBA32 | OMAP_DSS_COLOR_RGBX32 | | ||
| 188 | OMAP_DSS_COLOR_ARGB16_1555, | ||
| 189 | |||
| 190 | /* OMAP_DSS_VIDEO1 */ | ||
| 191 | OMAP_DSS_COLOR_RGB16 | OMAP_DSS_COLOR_RGB12U | | ||
| 192 | OMAP_DSS_COLOR_YUV2 | OMAP_DSS_COLOR_ARGB16_1555 | | ||
| 193 | OMAP_DSS_COLOR_RGBA32 | OMAP_DSS_COLOR_NV12 | | ||
| 194 | OMAP_DSS_COLOR_RGBA16 | OMAP_DSS_COLOR_RGB24U | | ||
| 195 | OMAP_DSS_COLOR_RGB24P | OMAP_DSS_COLOR_UYVY | | ||
| 196 | OMAP_DSS_COLOR_ARGB16 | OMAP_DSS_COLOR_XRGB16_1555 | | ||
| 197 | OMAP_DSS_COLOR_ARGB32 | OMAP_DSS_COLOR_RGBX16 | | ||
| 198 | OMAP_DSS_COLOR_RGBX32, | ||
| 199 | |||
| 200 | /* OMAP_DSS_VIDEO2 */ | ||
| 201 | OMAP_DSS_COLOR_RGB16 | OMAP_DSS_COLOR_RGB12U | | ||
| 202 | OMAP_DSS_COLOR_YUV2 | OMAP_DSS_COLOR_ARGB16_1555 | | ||
| 203 | OMAP_DSS_COLOR_RGBA32 | OMAP_DSS_COLOR_NV12 | | ||
| 204 | OMAP_DSS_COLOR_RGBA16 | OMAP_DSS_COLOR_RGB24U | | ||
| 205 | OMAP_DSS_COLOR_RGB24P | OMAP_DSS_COLOR_UYVY | | ||
| 206 | OMAP_DSS_COLOR_ARGB16 | OMAP_DSS_COLOR_XRGB16_1555 | | ||
| 207 | OMAP_DSS_COLOR_ARGB32 | OMAP_DSS_COLOR_RGBX16 | | ||
| 208 | OMAP_DSS_COLOR_RGBX32, | ||
| 209 | }; | ||
| 210 | |||
| 180 | static const char * const omap2_dss_clk_source_names[] = { | 211 | static const char * const omap2_dss_clk_source_names[] = { |
| 181 | [OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC] = "N/A", | 212 | [OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC] = "N/A", |
| 182 | [OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI] = "N/A", | 213 | [OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI] = "N/A", |
| @@ -301,7 +332,7 @@ static const struct omap_dss_features omap4430_es1_0_dss_features = { | |||
| 301 | .num_mgrs = 3, | 332 | .num_mgrs = 3, |
| 302 | .num_ovls = 3, | 333 | .num_ovls = 3, |
| 303 | .supported_displays = omap4_dss_supported_displays, | 334 | .supported_displays = omap4_dss_supported_displays, |
| 304 | .supported_color_modes = omap3_dss_supported_color_modes, | 335 | .supported_color_modes = omap4_dss_supported_color_modes, |
| 305 | .clksrc_names = omap4_dss_clk_source_names, | 336 | .clksrc_names = omap4_dss_clk_source_names, |
| 306 | .dss_params = omap4_dss_param_range, | 337 | .dss_params = omap4_dss_param_range, |
| 307 | }; | 338 | }; |
| @@ -321,7 +352,7 @@ static const struct omap_dss_features omap4_dss_features = { | |||
| 321 | .num_mgrs = 3, | 352 | .num_mgrs = 3, |
| 322 | .num_ovls = 3, | 353 | .num_ovls = 3, |
| 323 | .supported_displays = omap4_dss_supported_displays, | 354 | .supported_displays = omap4_dss_supported_displays, |
| 324 | .supported_color_modes = omap3_dss_supported_color_modes, | 355 | .supported_color_modes = omap4_dss_supported_color_modes, |
| 325 | .clksrc_names = omap4_dss_clk_source_names, | 356 | .clksrc_names = omap4_dss_clk_source_names, |
| 326 | .dss_params = omap4_dss_param_range, | 357 | .dss_params = omap4_dss_param_range, |
| 327 | }; | 358 | }; |