UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] omap3isp: preview: Add support for 8-bit formats at the sink pad 

Support both grayscale (Y8) and Bayer (SBGGR8, SGBRG8, SGRBG8 and
SRGGB8) formats.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Laurent Pinchart 2012-10-23 08:11:55 -03:00 committed by Mauro Carvalho Chehab
parent 4feca39b3d
commit e023a11342
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/media/platform/omap3isp/isppreview.c
View File

@ -200,10 +200,10 @@ static void preview_enable_invalaw(struct isp_prev_device *prev, bool enable)
if (enable) if (enable)
isp_reg_set(isp, OMAP3_ISP_IOMEM_PREV, ISPPRV_PCR, isp_reg_set(isp, OMAP3_ISP_IOMEM_PREV, ISPPRV_PCR,
ISPPRV_PCR_WIDTH | ISPPRV_PCR_INVALAW); ISPPRV_PCR_INVALAW);
else else
isp_reg_clr(isp, OMAP3_ISP_IOMEM_PREV, ISPPRV_PCR, isp_reg_clr(isp, OMAP3_ISP_IOMEM_PREV, ISPPRV_PCR,
ISPPRV_PCR_WIDTH | ISPPRV_PCR_INVALAW); ISPPRV_PCR_INVALAW);
} }
/* /*
@ -1014,7 +1014,7 @@ static void preview_config_averager(struct isp_prev_device *prev, u8 average)
/* /*
* preview_config_input_format - Configure the input format * preview_config_input_format - Configure the input format
* @prev: The preview engine * @prev: The preview engine
* @format: Format on the preview engine sink pad * @info: Sink pad format information
* *
* Enable and configure CFA interpolation for Bayer formats and disable it for * Enable and configure CFA interpolation for Bayer formats and disable it for
* greyscale formats. * greyscale formats.
@ -1025,22 +1025,29 @@ static void preview_config_averager(struct isp_prev_device *prev, u8 average)
* reordered to support non-GRBG Bayer patterns. * reordered to support non-GRBG Bayer patterns.
*/ */
static void preview_config_input_format(struct isp_prev_device *prev, static void preview_config_input_format(struct isp_prev_device *prev,
const struct v4l2_mbus_framefmt *format) const struct isp_format_info *info)
{ {
struct isp_device *isp = to_isp_device(prev); struct isp_device *isp = to_isp_device(prev);
struct prev_params *params; struct prev_params *params;
switch (format->code) { if (info->width == 8)
case V4L2_MBUS_FMT_SGRBG10_1X10: isp_reg_set(isp, OMAP3_ISP_IOMEM_PREV, ISPPRV_PCR,
ISPPRV_PCR_WIDTH);
else
isp_reg_clr(isp, OMAP3_ISP_IOMEM_PREV, ISPPRV_PCR,
ISPPRV_PCR_WIDTH);
switch (info->flavor) {
case V4L2_MBUS_FMT_SGRBG8_1X8:
prev->params.cfa_order = 0; prev->params.cfa_order = 0;
break; break;
case V4L2_MBUS_FMT_SRGGB10_1X10: case V4L2_MBUS_FMT_SRGGB8_1X8:
prev->params.cfa_order = 1; prev->params.cfa_order = 1;
break; break;
case V4L2_MBUS_FMT_SBGGR10_1X10: case V4L2_MBUS_FMT_SBGGR8_1X8:
prev->params.cfa_order = 2; prev->params.cfa_order = 2;
break; break;
case V4L2_MBUS_FMT_SGBRG10_1X10: case V4L2_MBUS_FMT_SGBRG8_1X8:
prev->params.cfa_order = 3; prev->params.cfa_order = 3;
break; break;
default: default:
@ -1081,7 +1088,8 @@ static void preview_config_input_size(struct isp_prev_device *prev, u32 active)
unsigned int elv = prev->crop.top + prev->crop.height - 1; unsigned int elv = prev->crop.top + prev->crop.height - 1;
u32 features; u32 features;
if (format->code != V4L2_MBUS_FMT_Y10_1X10) { if (format->code != V4L2_MBUS_FMT_Y8_1X8 &&
format->code != V4L2_MBUS_FMT_Y10_1X10) {
sph -= 2; sph -= 2;
eph += 2; eph += 2;
slv -= 2; slv -= 2;
@ -1389,6 +1397,7 @@ static unsigned int preview_max_out_width(struct isp_prev_device *prev)
static void preview_configure(struct isp_prev_device *prev) static void preview_configure(struct isp_prev_device *prev)
{ {
struct isp_device *isp = to_isp_device(prev); struct isp_device *isp = to_isp_device(prev);
const struct isp_format_info *info;
struct v4l2_mbus_framefmt *format; struct v4l2_mbus_framefmt *format;
unsigned long flags; unsigned long flags;
u32 update; u32 update;
@ -1402,17 +1411,18 @@ static void preview_configure(struct isp_prev_device *prev)
/* PREV_PAD_SINK */ /* PREV_PAD_SINK */
format = &prev->formats[PREV_PAD_SINK]; format = &prev->formats[PREV_PAD_SINK];
info = omap3isp_video_format_info(format->code);
preview_adjust_bandwidth(prev); preview_adjust_bandwidth(prev);
preview_config_input_format(prev, format); preview_config_input_format(prev, info);
preview_config_input_size(prev, active); preview_config_input_size(prev, active);
if (prev->input == PREVIEW_INPUT_CCDC) if (prev->input == PREVIEW_INPUT_CCDC)
preview_config_inlineoffset(prev, 0); preview_config_inlineoffset(prev, 0);
else else
preview_config_inlineoffset(prev, preview_config_inlineoffset(prev, ALIGN(format->width, 0x20) *
ALIGN(format->width, 0x20) * 2); info->bpp);
preview_setup_hw(prev, update, active); preview_setup_hw(prev, update, active);
@ -1709,6 +1719,11 @@ __preview_get_crop(struct isp_prev_device *prev, struct v4l2_subdev_fh *fh,
/* previewer format descriptions */ /* previewer format descriptions */
static const unsigned int preview_input_fmts[] = { static const unsigned int preview_input_fmts[] = {
V4L2_MBUS_FMT_Y8_1X8,
V4L2_MBUS_FMT_SGRBG8_1X8,
V4L2_MBUS_FMT_SRGGB8_1X8,
V4L2_MBUS_FMT_SBGGR8_1X8,
V4L2_MBUS_FMT_SGBRG8_1X8,
V4L2_MBUS_FMT_Y10_1X10, V4L2_MBUS_FMT_Y10_1X10,
V4L2_MBUS_FMT_SGRBG10_1X10, V4L2_MBUS_FMT_SGRBG10_1X10,
V4L2_MBUS_FMT_SRGGB10_1X10, V4L2_MBUS_FMT_SRGGB10_1X10,