diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-08-15 08:18:15 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-09-30 09:16:21 -0400 |
commit | 67019db86450b8b279a8c4be6f138e716f9bfdca (patch) | |
tree | 02a98a3d21e4da22e7bd121517f61e75a85c86ec /drivers/video/omap2/dss/dss_features.c | |
parent | fe3cc9d6cd4c8279f4ea70acc71525a489cfc38a (diff) |
OMAP: DSS2: Add overlay caps to DSS features
Add support to define overlay capabilities into dss_features. The
features are set to overlay->caps at initialization time.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/dss_features.c')
-rw-r--r-- | drivers/video/omap2/dss/dss_features.c | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c index b415c4ee621d..6bf508de3c32 100644 --- a/drivers/video/omap2/dss/dss_features.c +++ b/drivers/video/omap2/dss/dss_features.c | |||
@@ -47,6 +47,7 @@ struct omap_dss_features { | |||
47 | const int num_ovls; | 47 | const int num_ovls; |
48 | const enum omap_display_type *supported_displays; | 48 | const enum omap_display_type *supported_displays; |
49 | const enum omap_color_mode *supported_color_modes; | 49 | const enum omap_color_mode *supported_color_modes; |
50 | const enum omap_overlay_caps *overlay_caps; | ||
50 | const char * const *clksrc_names; | 51 | const char * const *clksrc_names; |
51 | const struct dss_param_range *dss_params; | 52 | const struct dss_param_range *dss_params; |
52 | 53 | ||
@@ -211,6 +212,50 @@ static const enum omap_color_mode omap4_dss_supported_color_modes[] = { | |||
211 | OMAP_DSS_COLOR_RGBX32, | 212 | OMAP_DSS_COLOR_RGBX32, |
212 | }; | 213 | }; |
213 | 214 | ||
215 | static const enum omap_overlay_caps omap2_dss_overlay_caps[] = { | ||
216 | /* OMAP_DSS_GFX */ | ||
217 | 0, | ||
218 | |||
219 | /* OMAP_DSS_VIDEO1 */ | ||
220 | OMAP_DSS_OVL_CAP_SCALE, | ||
221 | |||
222 | /* OMAP_DSS_VIDEO2 */ | ||
223 | OMAP_DSS_OVL_CAP_SCALE, | ||
224 | }; | ||
225 | |||
226 | static const enum omap_overlay_caps omap3430_dss_overlay_caps[] = { | ||
227 | /* OMAP_DSS_GFX */ | ||
228 | 0, | ||
229 | |||
230 | /* OMAP_DSS_VIDEO1 */ | ||
231 | OMAP_DSS_OVL_CAP_SCALE, | ||
232 | |||
233 | /* OMAP_DSS_VIDEO2 */ | ||
234 | OMAP_DSS_OVL_CAP_SCALE, | ||
235 | }; | ||
236 | |||
237 | static const enum omap_overlay_caps omap3630_dss_overlay_caps[] = { | ||
238 | /* OMAP_DSS_GFX */ | ||
239 | 0, | ||
240 | |||
241 | /* OMAP_DSS_VIDEO1 */ | ||
242 | OMAP_DSS_OVL_CAP_SCALE, | ||
243 | |||
244 | /* OMAP_DSS_VIDEO2 */ | ||
245 | OMAP_DSS_OVL_CAP_SCALE, | ||
246 | }; | ||
247 | |||
248 | static const enum omap_overlay_caps omap4_dss_overlay_caps[] = { | ||
249 | /* OMAP_DSS_GFX */ | ||
250 | 0, | ||
251 | |||
252 | /* OMAP_DSS_VIDEO1 */ | ||
253 | OMAP_DSS_OVL_CAP_SCALE, | ||
254 | |||
255 | /* OMAP_DSS_VIDEO2 */ | ||
256 | OMAP_DSS_OVL_CAP_SCALE, | ||
257 | }; | ||
258 | |||
214 | static const char * const omap2_dss_clk_source_names[] = { | 259 | static const char * const omap2_dss_clk_source_names[] = { |
215 | [OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC] = "N/A", | 260 | [OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC] = "N/A", |
216 | [OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI] = "N/A", | 261 | [OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI] = "N/A", |
@@ -275,6 +320,7 @@ static const struct omap_dss_features omap2_dss_features = { | |||
275 | .num_ovls = 3, | 320 | .num_ovls = 3, |
276 | .supported_displays = omap2_dss_supported_displays, | 321 | .supported_displays = omap2_dss_supported_displays, |
277 | .supported_color_modes = omap2_dss_supported_color_modes, | 322 | .supported_color_modes = omap2_dss_supported_color_modes, |
323 | .overlay_caps = omap2_dss_overlay_caps, | ||
278 | .clksrc_names = omap2_dss_clk_source_names, | 324 | .clksrc_names = omap2_dss_clk_source_names, |
279 | .dss_params = omap2_dss_param_range, | 325 | .dss_params = omap2_dss_param_range, |
280 | .buffer_size_unit = 1, | 326 | .buffer_size_unit = 1, |
@@ -299,6 +345,7 @@ static const struct omap_dss_features omap3430_dss_features = { | |||
299 | .num_ovls = 3, | 345 | .num_ovls = 3, |
300 | .supported_displays = omap3430_dss_supported_displays, | 346 | .supported_displays = omap3430_dss_supported_displays, |
301 | .supported_color_modes = omap3_dss_supported_color_modes, | 347 | .supported_color_modes = omap3_dss_supported_color_modes, |
348 | .overlay_caps = omap3430_dss_overlay_caps, | ||
302 | .clksrc_names = omap3_dss_clk_source_names, | 349 | .clksrc_names = omap3_dss_clk_source_names, |
303 | .dss_params = omap3_dss_param_range, | 350 | .dss_params = omap3_dss_param_range, |
304 | .buffer_size_unit = 1, | 351 | .buffer_size_unit = 1, |
@@ -322,6 +369,7 @@ static const struct omap_dss_features omap3630_dss_features = { | |||
322 | .num_ovls = 3, | 369 | .num_ovls = 3, |
323 | .supported_displays = omap3630_dss_supported_displays, | 370 | .supported_displays = omap3630_dss_supported_displays, |
324 | .supported_color_modes = omap3_dss_supported_color_modes, | 371 | .supported_color_modes = omap3_dss_supported_color_modes, |
372 | .overlay_caps = omap3630_dss_overlay_caps, | ||
325 | .clksrc_names = omap3_dss_clk_source_names, | 373 | .clksrc_names = omap3_dss_clk_source_names, |
326 | .dss_params = omap3_dss_param_range, | 374 | .dss_params = omap3_dss_param_range, |
327 | .buffer_size_unit = 1, | 375 | .buffer_size_unit = 1, |
@@ -346,6 +394,7 @@ static const struct omap_dss_features omap4430_es1_0_dss_features = { | |||
346 | .num_ovls = 3, | 394 | .num_ovls = 3, |
347 | .supported_displays = omap4_dss_supported_displays, | 395 | .supported_displays = omap4_dss_supported_displays, |
348 | .supported_color_modes = omap4_dss_supported_color_modes, | 396 | .supported_color_modes = omap4_dss_supported_color_modes, |
397 | .overlay_caps = omap4_dss_overlay_caps, | ||
349 | .clksrc_names = omap4_dss_clk_source_names, | 398 | .clksrc_names = omap4_dss_clk_source_names, |
350 | .dss_params = omap4_dss_param_range, | 399 | .dss_params = omap4_dss_param_range, |
351 | .buffer_size_unit = 16, | 400 | .buffer_size_unit = 16, |
@@ -370,6 +419,7 @@ static const struct omap_dss_features omap4_dss_features = { | |||
370 | .num_ovls = 3, | 419 | .num_ovls = 3, |
371 | .supported_displays = omap4_dss_supported_displays, | 420 | .supported_displays = omap4_dss_supported_displays, |
372 | .supported_color_modes = omap4_dss_supported_color_modes, | 421 | .supported_color_modes = omap4_dss_supported_color_modes, |
422 | .overlay_caps = omap4_dss_overlay_caps, | ||
373 | .clksrc_names = omap4_dss_clk_source_names, | 423 | .clksrc_names = omap4_dss_clk_source_names, |
374 | .dss_params = omap4_dss_param_range, | 424 | .dss_params = omap4_dss_param_range, |
375 | .buffer_size_unit = 16, | 425 | .buffer_size_unit = 16, |
@@ -407,6 +457,11 @@ enum omap_color_mode dss_feat_get_supported_color_modes(enum omap_plane plane) | |||
407 | return omap_current_dss_features->supported_color_modes[plane]; | 457 | return omap_current_dss_features->supported_color_modes[plane]; |
408 | } | 458 | } |
409 | 459 | ||
460 | enum omap_overlay_caps dss_feat_get_overlay_caps(enum omap_plane plane) | ||
461 | { | ||
462 | return omap_current_dss_features->overlay_caps[plane]; | ||
463 | } | ||
464 | |||
410 | bool dss_feat_color_mode_supported(enum omap_plane plane, | 465 | bool dss_feat_color_mode_supported(enum omap_plane plane, |
411 | enum omap_color_mode color_mode) | 466 | enum omap_color_mode color_mode) |
412 | { | 467 | { |