diff options
Diffstat (limited to 'drivers/video/omap2/dss/apply.c')
-rw-r--r-- | drivers/video/omap2/dss/apply.c | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c index 12f2cdb65704..0a6fb8de19c0 100644 --- a/drivers/video/omap2/dss/apply.c +++ b/drivers/video/omap2/dss/apply.c | |||
@@ -991,25 +991,6 @@ out: | |||
991 | mutex_unlock(&apply_lock); | 991 | mutex_unlock(&apply_lock); |
992 | } | 992 | } |
993 | 993 | ||
994 | static int dss_mgr_simple_check(struct omap_overlay_manager *mgr, | ||
995 | const struct omap_overlay_manager_info *info) | ||
996 | { | ||
997 | if (dss_has_feature(FEAT_ALPHA_FIXED_ZORDER)) { | ||
998 | /* | ||
999 | * OMAP3 supports only graphics source transparency color key | ||
1000 | * and alpha blending simultaneously. See TRM 15.4.2.4.2.2 | ||
1001 | * Alpha Mode. | ||
1002 | */ | ||
1003 | if (info->partial_alpha_enabled && info->trans_enabled | ||
1004 | && info->trans_key_type != OMAP_DSS_COLOR_KEY_GFX_DST) { | ||
1005 | DSSERR("check_manager: illegal transparency key\n"); | ||
1006 | return -EINVAL; | ||
1007 | } | ||
1008 | } | ||
1009 | |||
1010 | return 0; | ||
1011 | } | ||
1012 | |||
1013 | int dss_mgr_set_info(struct omap_overlay_manager *mgr, | 994 | int dss_mgr_set_info(struct omap_overlay_manager *mgr, |
1014 | struct omap_overlay_manager_info *info) | 995 | struct omap_overlay_manager_info *info) |
1015 | { | 996 | { |
@@ -1109,42 +1090,6 @@ err: | |||
1109 | } | 1090 | } |
1110 | 1091 | ||
1111 | 1092 | ||
1112 | static int dss_ovl_simple_check(struct omap_overlay *ovl, | ||
1113 | const struct omap_overlay_info *info) | ||
1114 | { | ||
1115 | if (info->paddr == 0) { | ||
1116 | DSSERR("check_overlay: paddr cannot be 0\n"); | ||
1117 | return -EINVAL; | ||
1118 | } | ||
1119 | |||
1120 | if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0) { | ||
1121 | if (info->out_width != 0 && info->width != info->out_width) { | ||
1122 | DSSERR("check_overlay: overlay %d doesn't support " | ||
1123 | "scaling\n", ovl->id); | ||
1124 | return -EINVAL; | ||
1125 | } | ||
1126 | |||
1127 | if (info->out_height != 0 && info->height != info->out_height) { | ||
1128 | DSSERR("check_overlay: overlay %d doesn't support " | ||
1129 | "scaling\n", ovl->id); | ||
1130 | return -EINVAL; | ||
1131 | } | ||
1132 | } | ||
1133 | |||
1134 | if ((ovl->supported_modes & info->color_mode) == 0) { | ||
1135 | DSSERR("check_overlay: overlay %d doesn't support mode %d\n", | ||
1136 | ovl->id, info->color_mode); | ||
1137 | return -EINVAL; | ||
1138 | } | ||
1139 | |||
1140 | if (info->zorder >= omap_dss_get_num_overlays()) { | ||
1141 | DSSERR("check_overlay: zorder %d too high\n", info->zorder); | ||
1142 | return -EINVAL; | ||
1143 | } | ||
1144 | |||
1145 | return 0; | ||
1146 | } | ||
1147 | |||
1148 | int dss_ovl_set_info(struct omap_overlay *ovl, | 1093 | int dss_ovl_set_info(struct omap_overlay *ovl, |
1149 | struct omap_overlay_info *info) | 1094 | struct omap_overlay_info *info) |
1150 | { | 1095 | { |