Skip to content

Commit

Permalink
OMAP: DSS2: Add overlay caps to DSS features
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Tomi Valkeinen committed Sep 30, 2011
1 parent fe3cc9d commit 67019db
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 3 deletions.
55 changes: 55 additions & 0 deletions drivers/video/omap2/dss/dss_features.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ struct omap_dss_features {
const int num_ovls;
const enum omap_display_type *supported_displays;
const enum omap_color_mode *supported_color_modes;
const enum omap_overlay_caps *overlay_caps;
const char * const *clksrc_names;
const struct dss_param_range *dss_params;

Expand Down Expand Up @@ -211,6 +212,50 @@ static const enum omap_color_mode omap4_dss_supported_color_modes[] = {
OMAP_DSS_COLOR_RGBX32,
};

static const enum omap_overlay_caps omap2_dss_overlay_caps[] = {
/* OMAP_DSS_GFX */
0,

/* OMAP_DSS_VIDEO1 */
OMAP_DSS_OVL_CAP_SCALE,

/* OMAP_DSS_VIDEO2 */
OMAP_DSS_OVL_CAP_SCALE,
};

static const enum omap_overlay_caps omap3430_dss_overlay_caps[] = {
/* OMAP_DSS_GFX */
0,

/* OMAP_DSS_VIDEO1 */
OMAP_DSS_OVL_CAP_SCALE,

/* OMAP_DSS_VIDEO2 */
OMAP_DSS_OVL_CAP_SCALE,
};

static const enum omap_overlay_caps omap3630_dss_overlay_caps[] = {
/* OMAP_DSS_GFX */
0,

/* OMAP_DSS_VIDEO1 */
OMAP_DSS_OVL_CAP_SCALE,

/* OMAP_DSS_VIDEO2 */
OMAP_DSS_OVL_CAP_SCALE,
};

static const enum omap_overlay_caps omap4_dss_overlay_caps[] = {
/* OMAP_DSS_GFX */
0,

/* OMAP_DSS_VIDEO1 */
OMAP_DSS_OVL_CAP_SCALE,

/* OMAP_DSS_VIDEO2 */
OMAP_DSS_OVL_CAP_SCALE,
};

static const char * const omap2_dss_clk_source_names[] = {
[OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC] = "N/A",
[OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI] = "N/A",
Expand Down Expand Up @@ -275,6 +320,7 @@ static const struct omap_dss_features omap2_dss_features = {
.num_ovls = 3,
.supported_displays = omap2_dss_supported_displays,
.supported_color_modes = omap2_dss_supported_color_modes,
.overlay_caps = omap2_dss_overlay_caps,
.clksrc_names = omap2_dss_clk_source_names,
.dss_params = omap2_dss_param_range,
.buffer_size_unit = 1,
Expand All @@ -299,6 +345,7 @@ static const struct omap_dss_features omap3430_dss_features = {
.num_ovls = 3,
.supported_displays = omap3430_dss_supported_displays,
.supported_color_modes = omap3_dss_supported_color_modes,
.overlay_caps = omap3430_dss_overlay_caps,
.clksrc_names = omap3_dss_clk_source_names,
.dss_params = omap3_dss_param_range,
.buffer_size_unit = 1,
Expand All @@ -322,6 +369,7 @@ static const struct omap_dss_features omap3630_dss_features = {
.num_ovls = 3,
.supported_displays = omap3630_dss_supported_displays,
.supported_color_modes = omap3_dss_supported_color_modes,
.overlay_caps = omap3630_dss_overlay_caps,
.clksrc_names = omap3_dss_clk_source_names,
.dss_params = omap3_dss_param_range,
.buffer_size_unit = 1,
Expand All @@ -346,6 +394,7 @@ static const struct omap_dss_features omap4430_es1_0_dss_features = {
.num_ovls = 3,
.supported_displays = omap4_dss_supported_displays,
.supported_color_modes = omap4_dss_supported_color_modes,
.overlay_caps = omap4_dss_overlay_caps,
.clksrc_names = omap4_dss_clk_source_names,
.dss_params = omap4_dss_param_range,
.buffer_size_unit = 16,
Expand All @@ -370,6 +419,7 @@ static const struct omap_dss_features omap4_dss_features = {
.num_ovls = 3,
.supported_displays = omap4_dss_supported_displays,
.supported_color_modes = omap4_dss_supported_color_modes,
.overlay_caps = omap4_dss_overlay_caps,
.clksrc_names = omap4_dss_clk_source_names,
.dss_params = omap4_dss_param_range,
.buffer_size_unit = 16,
Expand Down Expand Up @@ -407,6 +457,11 @@ enum omap_color_mode dss_feat_get_supported_color_modes(enum omap_plane plane)
return omap_current_dss_features->supported_color_modes[plane];
}

enum omap_overlay_caps dss_feat_get_overlay_caps(enum omap_plane plane)
{
return omap_current_dss_features->overlay_caps[plane];
}

bool dss_feat_color_mode_supported(enum omap_plane plane,
enum omap_color_mode color_mode)
{
Expand Down
1 change: 1 addition & 0 deletions drivers/video/omap2/dss/dss_features.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ unsigned long dss_feat_get_param_min(enum dss_range_param param);
unsigned long dss_feat_get_param_max(enum dss_range_param param);
enum omap_display_type dss_feat_get_supported_displays(enum omap_channel channel);
enum omap_color_mode dss_feat_get_supported_color_modes(enum omap_plane plane);
enum omap_overlay_caps dss_feat_get_overlay_caps(enum omap_plane plane);
bool dss_feat_color_mode_supported(enum omap_plane plane,
enum omap_color_mode color_mode);
const char *dss_feat_get_clk_source_name(enum omap_dss_clk_source id);
Expand Down
4 changes: 1 addition & 3 deletions drivers/video/omap2/dss/overlay.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -613,19 +613,16 @@ void dss_init_overlays(struct platform_device *pdev)
case 0:
ovl->name = "gfx";
ovl->id = OMAP_DSS_GFX;
ovl->caps = 0;
ovl->info.global_alpha = 255;
break;
case 1:
ovl->name = "vid1";
ovl->id = OMAP_DSS_VIDEO1;
ovl->caps = OMAP_DSS_OVL_CAP_SCALE;
ovl->info.global_alpha = 255;
break;
case 2:
ovl->name = "vid2";
ovl->id = OMAP_DSS_VIDEO2;
ovl->caps = OMAP_DSS_OVL_CAP_SCALE;
ovl->info.global_alpha = 255;
break;
}
Expand All @@ -636,6 +633,7 @@ void dss_init_overlays(struct platform_device *pdev)
ovl->get_overlay_info = &dss_ovl_get_overlay_info;
ovl->wait_for_go = &dss_ovl_wait_for_go;

ovl->caps = dss_feat_get_overlay_caps(ovl->id);
ovl->supported_modes =
dss_feat_get_supported_color_modes(ovl->id);

Expand Down

0 comments on commit 67019db

Please sign in to comment.