diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-11 12:01:14 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-11 12:01:14 +0900 |
| commit | e9ab3207310e8acfa3a5cd8cbb44860f69270bfd (patch) | |
| tree | dce036fd737b4edb7e107e21e4af12fabec29bbd /drivers/video/omap2/dss/dss_features.h | |
| parent | e54be894eae10eca9892e965cc9532f5d5a11767 (diff) | |
| parent | 18faa1b68a54ff976dd03bfd9ace2c4ef4f7315c (diff) | |
| download | kernel_samsung_smdk4412-e9ab3207310e8acfa3a5cd8cbb44860f69270bfd.zip kernel_samsung_smdk4412-e9ab3207310e8acfa3a5cd8cbb44860f69270bfd.tar.gz kernel_samsung_smdk4412-e9ab3207310e8acfa3a5cd8cbb44860f69270bfd.tar.bz2 | |
Merge branch 'for-paul-38-rebased' of git://gitorious.org/linux-omap-dss2/linux
Diffstat (limited to 'drivers/video/omap2/dss/dss_features.h')
| -rw-r--r-- | drivers/video/omap2/dss/dss_features.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/dss_features.h b/drivers/video/omap2/dss/dss_features.h index cb231ea..b9c70be 100644 --- a/drivers/video/omap2/dss/dss_features.h +++ b/drivers/video/omap2/dss/dss_features.h @@ -20,13 +20,19 @@ #ifndef __OMAP2_DSS_FEATURES_H #define __OMAP2_DSS_FEATURES_H -#define MAX_DSS_MANAGERS 2 +#define MAX_DSS_MANAGERS 3 #define MAX_DSS_OVERLAYS 3 /* DSS has feature id */ enum dss_feat_id { FEAT_GLOBAL_ALPHA = 1 << 0, FEAT_GLOBAL_ALPHA_VID1 = 1 << 1, + FEAT_PRE_MULT_ALPHA = 1 << 2, + FEAT_LCDENABLEPOL = 1 << 3, + FEAT_LCDENABLESIGNAL = 1 << 4, + FEAT_PCKFREEENABLE = 1 << 5, + FEAT_FUNCGATED = 1 << 6, + FEAT_MGR_LCD2 = 1 << 7, }; /* DSS register field id */ @@ -43,6 +49,8 @@ int dss_feat_get_num_mgrs(void); int dss_feat_get_num_ovls(void); 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); +bool dss_feat_color_mode_supported(enum omap_plane plane, + enum omap_color_mode color_mode); bool dss_has_feature(enum dss_feat_id id); void dss_feat_get_reg_field(enum dss_feat_reg_field id, u8 *start, u8 *end); |