aboutsummaryrefslogtreecommitdiffstats
path: root/include/video/omapdss.h
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2011-08-15 08:18:20 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-09-30 09:16:21 -0400
commitf6dc815098bde08c09fd1219e0f77663f8a9a6c7 (patch)
tree018487decc14fad4feaaa84a4fd0017cf01a9932 /include/video/omapdss.h
parent67019db86450b8b279a8c4be6f138e716f9bfdca (diff)
OMAP: DSS2: Add GLOBAL_ALPHA & PRE_MULT_ALPHA to ovl caps
Add OMAP_DSS_OVL_CAP_GLOBAL_ALPHA and OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA to overlay capabilities. Use these instead of FEAT_GLOBAL_ALPHA, FEAT_GLOBAL_ALPHA_VID1 and FEAT_PRE_MULT_ALPHA in code. Remove FEAT_GLOBAL_ALPHA_VID1 and FEAT_PRE_MULT_ALPHA which are no longer used. FEAT_GLOBAL_ALPHA is still used to decide if the HW has global alpha register. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Acked-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'include/video/omapdss.h')
-rw-r--r--include/video/omapdss.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index cb1ff1a6b5ee..ddd5bd06b785 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -162,6 +162,8 @@ enum omap_dss_rotation_angle {
162 162
163enum omap_overlay_caps { 163enum omap_overlay_caps {
164 OMAP_DSS_OVL_CAP_SCALE = 1 << 0, 164 OMAP_DSS_OVL_CAP_SCALE = 1 << 0,
165 OMAP_DSS_OVL_CAP_GLOBAL_ALPHA = 1 << 1,
166 OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA = 1 << 2,
165}; 167};
166 168
167enum omap_overlay_manager_caps { 169enum omap_overlay_manager_caps {