OMAP: DSS2: Clean up DISPC color mode validation checks
PATCH 1/1 OMAP: DSS2: Clean up DISPC color mode validation checks
The supported set of color modes varies for different DISPC pipelines(plane) and omap version. This makes the checks for validation of a color mode more complicated as new omap versions are added.
A dss_feature function is created which tells if a color_mode is supported for a plane on the current omap revision.
Signed-off-by Archit Taneja <[email protected]>
--- drivers/video/omap2/dss/dispc.c | 53 +++----------------------------- drivers/video/omap2/dss/dss_features.c | 7 ++++ drivers/video/omap2/dss/dss_features.h | 2 + 3 files changed, 14 insertions(+), 48 deletions(-)
drivers/video/omap2/dss/dispc.c +5 -48
@@ -1640,29 +1640,12 @@ static int _dispc_setup_plane(enum omap_plane plane, height, pos_y, out_height); } +if (!dss_feat_color_mode_supported (plane, color_mode)) +return -EINVAL ; +if (plane ==OMAP_DSS_GFX ) {if (width != out_width || height != out_height)return -EINVAL ; - -switch (color_mode) { -case OMAP_DSS_COLOR_ARGB16 : -case OMAP_DSS_COLOR_ARGB32 : -case OMAP_DSS_COLOR_RGBA32 : -if (!dss_has_feature (FEAT_GLOBAL_ALPHA )) -return -EINVAL ; -case OMAP_DSS_COLOR_RGBX32 : -if (cpu_is_omap24xx ()) -return -EINVAL ; -/* fall through */ -case OMAP_DSS_COLOR_RGB12U : -case OMAP_DSS_COLOR_RGB16 : -case OMAP_DSS_COLOR_RGB24P : -case OMAP_DSS_COLOR_RGB24U : -break ; - -default : -return -EINVAL ; - } }else {/* video plane */
@@ -1676,35 +1659,9 @@ static int _dispc_setup_plane(enum omap_plane plane, out_height > height * 8)return -EINVAL ; -switch (color_mode) { -case OMAP_DSS_COLOR_RGBX32 : -case OMAP_DSS_COLOR_RGB12U : -if (cpu_is_omap24xx ()) -return -EINVAL ; -/* fall through */ -case OMAP_DSS_COLOR_RGB16 : -case OMAP_DSS_COLOR_RGB24P : -case OMAP_DSS_COLOR_RGB24U : -break ; - -case OMAP_DSS_COLOR_ARGB16 : -case OMAP_DSS_COLOR_ARGB32 : -case OMAP_DSS_COLOR_RGBA32 : -if (!dss_has_feature (FEAT_GLOBAL_ALPHA )) -return -EINVAL ; -if (!dss_has_feature (FEAT_GLOBAL_ALPHA_VID1 ) && - plane ==OMAP_DSS_VIDEO1 ) -return -EINVAL ; -break ; - -case OMAP_DSS_COLOR_YUV2 : -case OMAP_DSS_COLOR_UYVY : +if (color_mode ==OMAP_DSS_COLOR_YUV2 || + color_mode ==OMAP_DSS_COLOR_UYVY ) cconv =1 ; -break ; - -default : -return -EINVAL ; - }/* Must use 5-tap filter? */ five_taps = height > out_height *2 ;
drivers/video/omap2/dss/dss_features.c +7 -0
@@ -216,6 +216,13 @@ enum omap_color_mode dss_feat_get_supported_color_modes(enum omap_plane plane)return omap_current_dss_features->supported_color_modes[plane]; } +bool dss_feat_color_mode_supported (enum omap_plane plane, +enum omap_color_mode color_mode) +{ +return omap_current_dss_features->supported_color_modes[plane] & + color_mode; +} +/* DSS has_feature check */ bool dss_has_feature (enum dss_feat_id id) {
drivers/video/omap2/dss/dss_features.h +2 -0
@@ -49,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);
Signature · 1 line
1.7.0.4
Hi,
Quoted 7 lines · ext Archit Taneja
The supported set of color modes varies for different DISPC pipelines(plane) and omap version. This makes the checks for validation of a color mode more complicated as new omap versions are added.
A
dss_featurefunction is created which tells if acolor_modeis supported for a plane on the current omap revision.
Quoted 6 lines
Signed-off-by Archit Taneja <[email protected]>--- drivers/video/omap2/dss/dispc.c | 53 +++----------------------------- drivers/video/omap2/dss/dss_features.c | 7 ++++ drivers/video/omap2/dss/dss_features.h | 2 + 3 files changed, 14 insertions(+), 48 deletions(-)
Looks good to me, thanks!
Tomi