summaryrefslogtreecommitdiff
path: root/drivers/video/omap2/dss/dss_features.h
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2011-08-15 12:18:20 (GMT)
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-09-30 13:16:21 (GMT)
commitf6dc815098bde08c09fd1219e0f77663f8a9a6c7 (patch)
tree018487decc14fad4feaaa84a4fd0017cf01a9932 /drivers/video/omap2/dss/dss_features.h
parent67019db86450b8b279a8c4be6f138e716f9bfdca (diff)
downloadlinux-fsl-qoriq-f6dc815098bde08c09fd1219e0f77663f8a9a6c7.tar.xz
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 'drivers/video/omap2/dss/dss_features.h')
-rw-r--r--drivers/video/omap2/dss/dss_features.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dss_features.h b/drivers/video/omap2/dss/dss_features.h
index fd09196..4271e96 100644
--- a/drivers/video/omap2/dss/dss_features.h
+++ b/drivers/video/omap2/dss/dss_features.h
@@ -28,8 +28,6 @@
/* 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,