xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/omap: add format_is_yuv() helper

Browse Source 
In a few places the dispc driver needs to know whether the pixel format
is an YUV format. Add a helper to figure that out.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Tomi Valkeinen
2017-05-04 09:13:32 +03:00
parent 185e23e1f6
commit 5edec14c73
1 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/gpu/drm/omapdrm/dss/dispc.c
View File

@@ -978,6 +978,18 @@ static void dispc_ovl_set_color_mode(enum omap_plane_id plane,
REG_FLD_MOD(DISPC_OVL_ATTRIBUTES(plane), m, 4, 1); REG_FLD_MOD(DISPC_OVL_ATTRIBUTES(plane), m, 4, 1);
} }
static bool format_is_yuv(enum omap_color_mode color_mode)
{
switch (color_mode) {
case OMAP_DSS_COLOR_YUV2:
case OMAP_DSS_COLOR_UYVY:
case OMAP_DSS_COLOR_NV12:
return true;
default:
return false;
}
}
static void dispc_ovl_configure_burst_type(enum omap_plane_id plane, static void dispc_ovl_configure_burst_type(enum omap_plane_id plane,
enum omap_dss_rotation_type rotation_type) enum omap_dss_rotation_type rotation_type)
{ {
@@ -1703,9 +1715,8 @@ static void dispc_ovl_set_scaling_uv(enum omap_plane_id plane,
if (!dss_has_feature(FEAT_HANDLE_UV_SEPARATE)) if (!dss_has_feature(FEAT_HANDLE_UV_SEPARATE))
return; return;
if ((color_mode != OMAP_DSS_COLOR_YUV2 &&
color_mode != OMAP_DSS_COLOR_UYVY && if (!format_is_yuv(color_mode)) {
color_mode != OMAP_DSS_COLOR_NV12)) {
/* reset chroma resampling for RGB formats */ /* reset chroma resampling for RGB formats */
if (plane != OMAP_DSS_WB) if (plane != OMAP_DSS_WB)
REG_FLD_MOD(DISPC_OVL_ATTRIBUTES2(plane), 0, 8, 8); REG_FLD_MOD(DISPC_OVL_ATTRIBUTES2(plane), 0, 8, 8);
@@ -2384,19 +2395,9 @@ static int dispc_ovl_setup_common(enum omap_plane_id plane,
if (paddr == 0 && rotation_type != OMAP_DSS_ROT_TILER) if (paddr == 0 && rotation_type != OMAP_DSS_ROT_TILER)
return -EINVAL; return -EINVAL;
switch (color_mode) { if (format_is_yuv(color_mode) && (in_width & 1)) {
case OMAP_DSS_COLOR_YUV2: DSSERR("input width %d is not even for YUV format\n", in_width);
case OMAP_DSS_COLOR_UYVY: return -EINVAL;
case OMAP_DSS_COLOR_NV12:
if (in_width & 1) {
DSSERR("input width %d is not even for YUV format\n",
in_width);
return -EINVAL;
}
break;
default:
break;
} }
out_width = out_width == 0 ? width : out_width; out_width = out_width == 0 ? width : out_width;
@@ -2433,26 +2434,15 @@ static int dispc_ovl_setup_common(enum omap_plane_id plane,
DSSDBG("predecimation %d x %x, new input size %d x %d\n", DSSDBG("predecimation %d x %x, new input size %d x %d\n",
x_predecim, y_predecim, in_width, in_height); x_predecim, y_predecim, in_width, in_height);
switch (color_mode) { if (format_is_yuv(color_mode) && (in_width & 1)) {
case OMAP_DSS_COLOR_YUV2: DSSDBG("predecimated input width is not even for YUV format\n");
case OMAP_DSS_COLOR_UYVY: DSSDBG("adjusting input width %d -> %d\n",
case OMAP_DSS_COLOR_NV12: in_width, in_width & ~1);
if (in_width & 1) {
DSSDBG("predecimated input width is not even for YUV format\n");
DSSDBG("adjusting input width %d -> %d\n",
in_width, in_width & ~1);
in_width &= ~1; in_width &= ~1;
}
break;
default:
break;
} }
if (color_mode == OMAP_DSS_COLOR_YUV2 || if (format_is_yuv(color_mode))
color_mode == OMAP_DSS_COLOR_UYVY ||
color_mode == OMAP_DSS_COLOR_NV12)
cconv = 1; cconv = 1;
if (ilace && !fieldmode) { if (ilace && !fieldmode) {