Skip to content

L
linux
Commit b6c61a6c authored by Helen Fornazier's avatar Helen Fornazier Committed by Mauro Carvalho Chehab
Browse files
Options

media: vimc: propagate pixel format in the stream 

Media bus codes were being mapped to pixelformats, which causes a
limitation on vimc because not all pixelformats can be mapped to media
bus codes.
Also, media bus codes are an internal configuration from the device.
Userspace only assures media bus codes matches between pads and expects
the image in a given pixelformat. So we can allow almost any media bus
format to be configured between pads, except for debayer that expects a
media bus code of type bayer in the sink pad.

[hverkuil-cisco@xs4all.nl: drop use of v4l2_get_fourcc_name: not yet available]
[hverkuil-cisco@xs4all.nl: made vimc_mbus_list static]
Signed-off-by: default avatarHelen Koike <helen.koike@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent d82b921a
Hide whitespace changes
Inline Side-by-side
Showing with 304 additions and 342 deletions
drivers/media/platform/vimc/vimc-capture.c
View file @ b6c61a6c
...@@ -28,6 +28,32 @@ ...@@ -28,6 +28,32 @@
#define VIMC_CAP_DRV_NAME "vimc-capture" #define VIMC_CAP_DRV_NAME "vimc-capture"
static const u32 vimc_cap_supported_pixfmt[] = {
V4L2_PIX_FMT_BGR24,
V4L2_PIX_FMT_RGB24,
V4L2_PIX_FMT_ARGB32,
V4L2_PIX_FMT_SBGGR8,
V4L2_PIX_FMT_SGBRG8,
V4L2_PIX_FMT_SGRBG8,
V4L2_PIX_FMT_SRGGB8,
V4L2_PIX_FMT_SBGGR10,
V4L2_PIX_FMT_SGBRG10,
V4L2_PIX_FMT_SGRBG10,
V4L2_PIX_FMT_SRGGB10,
V4L2_PIX_FMT_SBGGR10ALAW8,
V4L2_PIX_FMT_SGBRG10ALAW8,
V4L2_PIX_FMT_SGRBG10ALAW8,
V4L2_PIX_FMT_SRGGB10ALAW8,
V4L2_PIX_FMT_SBGGR10DPCM8,
V4L2_PIX_FMT_SGBRG10DPCM8,
V4L2_PIX_FMT_SGRBG10DPCM8,
V4L2_PIX_FMT_SRGGB10DPCM8,
V4L2_PIX_FMT_SBGGR12,
V4L2_PIX_FMT_SGBRG12,
V4L2_PIX_FMT_SGRBG12,
V4L2_PIX_FMT_SRGGB12,
};
struct vimc_cap_device { struct vimc_cap_device {
struct vimc_ent_device ved; struct vimc_ent_device ved;
struct video_device vdev; struct video_device vdev;
...@@ -101,29 +127,25 @@ static int vimc_cap_try_fmt_vid_cap(struct file *file, void *priv, ...@@ -101,29 +127,25 @@ static int vimc_cap_try_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct v4l2_pix_format *format = &f->fmt.pix; struct v4l2_pix_format *format = &f->fmt.pix;
const struct vimc_pix_map *vpix;
format->width = clamp_t(u32, format->width, VIMC_FRAME_MIN_WIDTH, format->width = clamp_t(u32, format->width, VIMC_FRAME_MIN_WIDTH,
VIMC_FRAME_MAX_WIDTH) & ~1; VIMC_FRAME_MAX_WIDTH) & ~1;
format->height = clamp_t(u32, format->height, VIMC_FRAME_MIN_HEIGHT, format->height = clamp_t(u32, format->height, VIMC_FRAME_MIN_HEIGHT,
VIMC_FRAME_MAX_HEIGHT) & ~1; VIMC_FRAME_MAX_HEIGHT) & ~1;
/* Don't accept a pixelformat that is not on the table */ vimc_colorimetry_clamp(format);
vpix = vimc_pix_map_by_pixelformat(format->pixelformat);
if (!vpix) {
format->pixelformat = fmt_default.pixelformat;
vpix = vimc_pix_map_by_pixelformat(format->pixelformat);
}
/* TODO: Add support for custom bytesperline values */
format->bytesperline = format->width * vpix->bpp;
format->sizeimage = format->bytesperline * format->height;
if (format->field == V4L2_FIELD_ANY) if (format->field == V4L2_FIELD_ANY)
format->field = fmt_default.field; format->field = fmt_default.field;
vimc_colorimetry_clamp(format); /* TODO: Add support for custom bytesperline values */
return 0; /* Don't accept a pixelformat that is not on the table */
if (!v4l2_format_info(format->pixelformat))
format->pixelformat = fmt_default.pixelformat;
return v4l2_fill_pixfmt(format, format->pixelformat,
format->width, format->height);
} }
static int vimc_cap_s_fmt_vid_cap(struct file *file, void *priv, static int vimc_cap_s_fmt_vid_cap(struct file *file, void *priv,
...@@ -159,27 +181,31 @@ static int vimc_cap_s_fmt_vid_cap(struct file *file, void *priv, ...@@ -159,27 +181,31 @@ static int vimc_cap_s_fmt_vid_cap(struct file *file, void *priv,
static int vimc_cap_enum_fmt_vid_cap(struct file *file, void *priv, static int vimc_cap_enum_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_fmtdesc *f) struct v4l2_fmtdesc *f)
{ {
const struct vimc_pix_map *vpix = vimc_pix_map_by_index(f->index); if (f->index >= ARRAY_SIZE(vimc_cap_supported_pixfmt))
if (!vpix)
return -EINVAL; return -EINVAL;
f->pixelformat = vpix->pixelformat; f->pixelformat = vimc_cap_supported_pixfmt[f->index];
return 0; return 0;
} }
static bool vimc_cap_is_pixfmt_supported(u32 pixelformat)
{
unsigned int i;
for (i = 0; i < ARRAY_SIZE(vimc_cap_supported_pixfmt); i++)
if (vimc_cap_supported_pixfmt[i] == pixelformat)
return true;
return false;
}
static int vimc_cap_enum_framesizes(struct file *file, void *fh, static int vimc_cap_enum_framesizes(struct file *file, void *fh,
struct v4l2_frmsizeenum *fsize) struct v4l2_frmsizeenum *fsize)
{ {
const struct vimc_pix_map *vpix;
if (fsize->index) if (fsize->index)
return -EINVAL; return -EINVAL;
/* Only accept code in the pix map table */ if (!vimc_cap_is_pixfmt_supported(fsize->pixel_format))
vpix = vimc_pix_map_by_code(fsize->pixel_format);
if (!vpix)
return -EINVAL; return -EINVAL;
fsize->type = V4L2_FRMSIZE_TYPE_CONTINUOUS; fsize->type = V4L2_FRMSIZE_TYPE_CONTINUOUS;
...@@ -253,6 +279,7 @@ static int vimc_cap_start_streaming(struct vb2_queue *vq, unsigned int count) ...@@ -253,6 +279,7 @@ static int vimc_cap_start_streaming(struct vb2_queue *vq, unsigned int count)
return ret; return ret;
} }
vcap->stream.producer_pixfmt = vcap->format.pixelformat;
ret = vimc_streamer_s_stream(&vcap->stream, &vcap->ved, 1); ret = vimc_streamer_s_stream(&vcap->stream, &vcap->ved, 1);
if (ret) { if (ret) {
media_pipeline_stop(entity); media_pipeline_stop(entity);
...@@ -403,7 +430,6 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master, ...@@ -403,7 +430,6 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master,
{ {
struct v4l2_device *v4l2_dev = master_data; struct v4l2_device *v4l2_dev = master_data;
struct vimc_platform_data *pdata = comp->platform_data; struct vimc_platform_data *pdata = comp->platform_data;
const struct vimc_pix_map *vpix;
struct vimc_cap_device *vcap; struct vimc_cap_device *vcap;
struct video_device *vdev; struct video_device *vdev;
struct vb2_queue *q; struct vb2_queue *q;
...@@ -458,10 +484,8 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master, ...@@ -458,10 +484,8 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master,
/* Set default frame format */ /* Set default frame format */
vcap->format = fmt_default; vcap->format = fmt_default;
vpix = vimc_pix_map_by_pixelformat(vcap->format.pixelformat); v4l2_fill_pixfmt(&vcap->format, vcap->format.pixelformat,
vcap->format.bytesperline = vcap->format.width * vpix->bpp; vcap->format.width, vcap->format.height);
vcap->format.sizeimage = vcap->format.bytesperline *
vcap->format.height;
/* Fill the vimc_ent_device struct */ /* Fill the vimc_ent_device struct */
vcap->ved.ent = &vcap->vdev.entity; vcap->ved.ent = &vcap->vdev.entity;
......
drivers/media/platform/vimc/vimc-common.c
View file @ b6c61a6c
...@@ -20,192 +20,139 @@ ...@@ -20,192 +20,139 @@
#include "vimc-common.h" #include "vimc-common.h"
/* static const __u32 vimc_mbus_list[] = {
* NOTE: non-bayer formats need to come first (necessary for enum_mbus_code MEDIA_BUS_FMT_FIXED,
* in the scaler) MEDIA_BUS_FMT_RGB444_1X12,
*/ MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE,
static const struct vimc_pix_map vimc_pix_map_list[] = { MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE,
/* TODO: add all missing formats */ MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE,
MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE,
/* RGB formats */ MEDIA_BUS_FMT_RGB565_1X16,
{ MEDIA_BUS_FMT_BGR565_2X8_BE,
.code = MEDIA_BUS_FMT_BGR888_1X24, MEDIA_BUS_FMT_BGR565_2X8_LE,
.pixelformat = V4L2_PIX_FMT_BGR24, MEDIA_BUS_FMT_RGB565_2X8_BE,
.bpp = 3, MEDIA_BUS_FMT_RGB565_2X8_LE,
.bayer = false, MEDIA_BUS_FMT_RGB666_1X18,
}, MEDIA_BUS_FMT_RBG888_1X24,
{ MEDIA_BUS_FMT_RGB666_1X24_CPADHI,
.code = MEDIA_BUS_FMT_RGB888_1X24, MEDIA_BUS_FMT_RGB666_1X7X3_SPWG,
.pixelformat = V4L2_PIX_FMT_RGB24, MEDIA_BUS_FMT_BGR888_1X24,
.bpp = 3, MEDIA_BUS_FMT_GBR888_1X24,
.bayer = false, MEDIA_BUS_FMT_RGB888_1X24,
}, MEDIA_BUS_FMT_RGB888_2X12_BE,
{ MEDIA_BUS_FMT_RGB888_2X12_LE,
.code = MEDIA_BUS_FMT_ARGB8888_1X32, MEDIA_BUS_FMT_RGB888_1X7X4_SPWG,
.pixelformat = V4L2_PIX_FMT_ARGB32, MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA,
.bpp = 4, MEDIA_BUS_FMT_ARGB8888_1X32,
.bayer = false, MEDIA_BUS_FMT_RGB888_1X32_PADHI,
}, MEDIA_BUS_FMT_RGB101010_1X30,
MEDIA_BUS_FMT_RGB121212_1X36,
/* Bayer formats */ MEDIA_BUS_FMT_RGB161616_1X48,
{ MEDIA_BUS_FMT_Y8_1X8,
.code = MEDIA_BUS_FMT_SBGGR8_1X8, MEDIA_BUS_FMT_UV8_1X8,
.pixelformat = V4L2_PIX_FMT_SBGGR8, MEDIA_BUS_FMT_UYVY8_1_5X8,
.bpp = 1, MEDIA_BUS_FMT_VYUY8_1_5X8,
.bayer = true, MEDIA_BUS_FMT_YUYV8_1_5X8,
}, MEDIA_BUS_FMT_YVYU8_1_5X8,
{ MEDIA_BUS_FMT_UYVY8_2X8,
.code = MEDIA_BUS_FMT_SGBRG8_1X8, MEDIA_BUS_FMT_VYUY8_2X8,
.pixelformat = V4L2_PIX_FMT_SGBRG8, MEDIA_BUS_FMT_YUYV8_2X8,
.bpp = 1, MEDIA_BUS_FMT_YVYU8_2X8,
.bayer = true, MEDIA_BUS_FMT_Y10_1X10,
}, MEDIA_BUS_FMT_Y10_2X8_PADHI_LE,
{ MEDIA_BUS_FMT_UYVY10_2X10,
.code = MEDIA_BUS_FMT_SGRBG8_1X8, MEDIA_BUS_FMT_VYUY10_2X10,
.pixelformat = V4L2_PIX_FMT_SGRBG8, MEDIA_BUS_FMT_YUYV10_2X10,
.bpp = 1, MEDIA_BUS_FMT_YVYU10_2X10,
.bayer = true, MEDIA_BUS_FMT_Y12_1X12,
}, MEDIA_BUS_FMT_UYVY12_2X12,
{ MEDIA_BUS_FMT_VYUY12_2X12,
.code = MEDIA_BUS_FMT_SRGGB8_1X8, MEDIA_BUS_FMT_YUYV12_2X12,
.pixelformat = V4L2_PIX_FMT_SRGGB8, MEDIA_BUS_FMT_YVYU12_2X12,
.bpp = 1, MEDIA_BUS_FMT_UYVY8_1X16,
.bayer = true, MEDIA_BUS_FMT_VYUY8_1X16,
}, MEDIA_BUS_FMT_YUYV8_1X16,
{ MEDIA_BUS_FMT_YVYU8_1X16,
.code = MEDIA_BUS_FMT_SBGGR10_1X10, MEDIA_BUS_FMT_YDYUYDYV8_1X16,
.pixelformat = V4L2_PIX_FMT_SBGGR10, MEDIA_BUS_FMT_UYVY10_1X20,
.bpp = 2, MEDIA_BUS_FMT_VYUY10_1X20,
.bayer = true, MEDIA_BUS_FMT_YUYV10_1X20,
}, MEDIA_BUS_FMT_YVYU10_1X20,
{ MEDIA_BUS_FMT_VUY8_1X24,
.code = MEDIA_BUS_FMT_SGBRG10_1X10, MEDIA_BUS_FMT_YUV8_1X24,
.pixelformat = V4L2_PIX_FMT_SGBRG10, MEDIA_BUS_FMT_UYYVYY8_0_5X24,
.bpp = 2, MEDIA_BUS_FMT_UYVY12_1X24,
.bayer = true, MEDIA_BUS_FMT_VYUY12_1X24,
}, MEDIA_BUS_FMT_YUYV12_1X24,
{ MEDIA_BUS_FMT_YVYU12_1X24,
.code = MEDIA_BUS_FMT_SGRBG10_1X10, MEDIA_BUS_FMT_YUV10_1X30,
.pixelformat = V4L2_PIX_FMT_SGRBG10, MEDIA_BUS_FMT_UYYVYY10_0_5X30,
.bpp = 2, MEDIA_BUS_FMT_AYUV8_1X32,
.bayer = true, MEDIA_BUS_FMT_UYYVYY12_0_5X36,
}, MEDIA_BUS_FMT_YUV12_1X36,
{ MEDIA_BUS_FMT_YUV16_1X48,
.code = MEDIA_BUS_FMT_SRGGB10_1X10, MEDIA_BUS_FMT_UYYVYY16_0_5X48,
.pixelformat = V4L2_PIX_FMT_SRGGB10, MEDIA_BUS_FMT_SBGGR8_1X8,
.bpp = 2, MEDIA_BUS_FMT_SGBRG8_1X8,
.bayer = true, MEDIA_BUS_FMT_SGRBG8_1X8,
}, MEDIA_BUS_FMT_SRGGB8_1X8,
MEDIA_BUS_FMT_SBGGR10_ALAW8_1X8,
/* 10bit raw bayer a-law compressed to 8 bits */ MEDIA_BUS_FMT_SGBRG10_ALAW8_1X8,
{ MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8,
.code = MEDIA_BUS_FMT_SBGGR10_ALAW8_1X8, MEDIA_BUS_FMT_SRGGB10_ALAW8_1X8,
.pixelformat = V4L2_PIX_FMT_SBGGR10ALAW8, MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8,
.bpp = 1, MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8,
.bayer = true, MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8,
}, MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8,
{ MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_BE,
.code = MEDIA_BUS_FMT_SGBRG10_ALAW8_1X8, MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE,
.pixelformat = V4L2_PIX_FMT_SGBRG10ALAW8, MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_BE,
.bpp = 1, MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_LE,
.bayer = true, MEDIA_BUS_FMT_SBGGR10_1X10,
}, MEDIA_BUS_FMT_SGBRG10_1X10,
{ MEDIA_BUS_FMT_SGRBG10_1X10,
.code = MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8, MEDIA_BUS_FMT_SRGGB10_1X10,
.pixelformat = V4L2_PIX_FMT_SGRBG10ALAW8, MEDIA_BUS_FMT_SBGGR12_1X12,
.bpp = 1, MEDIA_BUS_FMT_SGBRG12_1X12,
.bayer = true, MEDIA_BUS_FMT_SGRBG12_1X12,
}, MEDIA_BUS_FMT_SRGGB12_1X12,
{ MEDIA_BUS_FMT_SBGGR14_1X14,
.code = MEDIA_BUS_FMT_SRGGB10_ALAW8_1X8, MEDIA_BUS_FMT_SGBRG14_1X14,
.pixelformat = V4L2_PIX_FMT_SRGGB10ALAW8, MEDIA_BUS_FMT_SGRBG14_1X14,
.bpp = 1, MEDIA_BUS_FMT_SRGGB14_1X14,
.bayer = true, MEDIA_BUS_FMT_SBGGR16_1X16,
}, MEDIA_BUS_FMT_SGBRG16_1X16,
MEDIA_BUS_FMT_SGRBG16_1X16,
/* 10bit raw bayer DPCM compressed to 8 bits */ MEDIA_BUS_FMT_SRGGB16_1X16,
{ MEDIA_BUS_FMT_JPEG_1X8,
.code = MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8, MEDIA_BUS_FMT_S5C_UYVY_JPEG_1X8,
.pixelformat = V4L2_PIX_FMT_SBGGR10DPCM8, MEDIA_BUS_FMT_AHSV8888_1X32,
.bpp = 1,
.bayer = true,
},
{
.code = MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8,
.pixelformat = V4L2_PIX_FMT_SGBRG10DPCM8,
.bpp = 1,
.bayer = true,
},
{
.code = MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8,
.pixelformat = V4L2_PIX_FMT_SGRBG10DPCM8,
.bpp = 1,
.bayer = true,
},
{
.code = MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8,
.pixelformat = V4L2_PIX_FMT_SRGGB10DPCM8,
.bpp = 1,
.bayer = true,
},
{
.code = MEDIA_BUS_FMT_SBGGR12_1X12,
.pixelformat = V4L2_PIX_FMT_SBGGR12,
.bpp = 2,
.bayer = true,
},
{
.code = MEDIA_BUS_FMT_SGBRG12_1X12,
.pixelformat = V4L2_PIX_FMT_SGBRG12,
.bpp = 2,
.bayer = true,
},
{
.code = MEDIA_BUS_FMT_SGRBG12_1X12,
.pixelformat = V4L2_PIX_FMT_SGRBG12,
.bpp = 2,
.bayer = true,
},
{
.code = MEDIA_BUS_FMT_SRGGB12_1X12,
.pixelformat = V4L2_PIX_FMT_SRGGB12,
.bpp = 2,
.bayer = true,
},
}; };
const struct vimc_pix_map *vimc_pix_map_by_index(unsigned int i) /* Helper function to check mbus codes */
{ bool vimc_mbus_code_supported(__u32 code)
if (i >= ARRAY_SIZE(vimc_pix_map_list))
return NULL;
return &vimc_pix_map_list[i];
}
EXPORT_SYMBOL_GPL(vimc_pix_map_by_index);
const struct vimc_pix_map *vimc_pix_map_by_code(u32 code)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < ARRAY_SIZE(vimc_pix_map_list); i++) { for (i = 0; i < ARRAY_SIZE(vimc_mbus_list); i++)
if (vimc_pix_map_list[i].code == code) if (code == vimc_mbus_list[i])
return &vimc_pix_map_list[i]; return true;
} return false;
return NULL;
} }
EXPORT_SYMBOL_GPL(vimc_pix_map_by_code); EXPORT_SYMBOL_GPL(vimc_mbus_code_supported);
const struct vimc_pix_map *vimc_pix_map_by_pixelformat(u32 pixelformat) /* Helper function to enumerate mbus codes */
int vimc_enum_mbus_code(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_mbus_code_enum *code)
{ {
unsigned int i; if (code->index >= ARRAY_SIZE(vimc_mbus_list))
return -EINVAL;
for (i = 0; i < ARRAY_SIZE(vimc_pix_map_list); i++) { code->code = vimc_mbus_list[code->index];
if (vimc_pix_map_list[i].pixelformat == pixelformat) return 0;
return &vimc_pix_map_list[i];
}
return NULL;
} }
EXPORT_SYMBOL_GPL(vimc_pix_map_by_pixelformat); EXPORT_SYMBOL_GPL(vimc_enum_mbus_code);
/* Helper function to allocate and initialize pads */ /* Helper function to allocate and initialize pads */
struct media_pad *vimc_pads_init(u16 num_pads, const unsigned long *pads_flag) struct media_pad *vimc_pads_init(u16 num_pads, const unsigned long *pads_flag)
...@@ -277,15 +224,13 @@ static int vimc_get_mbus_format(struct media_pad *pad, ...@@ -277,15 +224,13 @@ static int vimc_get_mbus_format(struct media_pad *pad,
struct video_device, struct video_device,
entity); entity);
struct vimc_ent_device *ved = video_get_drvdata(vdev); struct vimc_ent_device *ved = video_get_drvdata(vdev);
const struct vimc_pix_map *vpix;
struct v4l2_pix_format vdev_fmt; struct v4l2_pix_format vdev_fmt;
if (!ved->vdev_get_format) if (!ved->vdev_get_format)
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
ved->vdev_get_format(ved, &vdev_fmt); ved->vdev_get_format(ved, &vdev_fmt);
vpix = vimc_pix_map_by_pixelformat(vdev_fmt.pixelformat); v4l2_fill_mbus_format(&fmt->format, &vdev_fmt, 0);
v4l2_fill_mbus_format(&fmt->format, &vdev_fmt, vpix->code);
} else { } else {
return -EINVAL; return -EINVAL;
} }
...@@ -325,8 +270,12 @@ int vimc_link_validate(struct media_link *link) ...@@ -325,8 +270,12 @@ int vimc_link_validate(struct media_link *link)
/* The width, height and code must match. */ /* The width, height and code must match. */
if (source_fmt.format.width != sink_fmt.format.width if (source_fmt.format.width != sink_fmt.format.width
|| source_fmt.format.height != sink_fmt.format.height || source_fmt.format.height != sink_fmt.format.height
|| source_fmt.format.code != sink_fmt.format.code) || (source_fmt.format.code && sink_fmt.format.code &&
source_fmt.format.code != sink_fmt.format.code)) {
pr_err("vimc: format doesn't match in link %s->%s\n",
link->source->entity->name, link->sink->entity->name);
return -EPIPE; return -EPIPE;
}
/* /*
* The field order must match, or the sink field order must be NONE * The field order must match, or the sink field order must be NONE
......
drivers/media/platform/vimc/vimc-common.h
View file @ b6c61a6c
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
#include <media/media-device.h> #include <media/media-device.h>
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#include "vimc-streamer.h"
#define VIMC_PDEV_NAME "vimc" #define VIMC_PDEV_NAME "vimc"
/* VIMC-specific controls */ /* VIMC-specific controls */
...@@ -77,23 +79,6 @@ struct vimc_platform_data { ...@@ -77,23 +79,6 @@ struct vimc_platform_data {
char entity_name[32]; char entity_name[32];
}; };
/**
* struct vimc_pix_map - maps media bus code with v4l2 pixel format
*
* @code: media bus format code defined by MEDIA_BUS_FMT_* macros
* @bbp: number of bytes each pixel occupies
* @pixelformat: pixel format devined by V4L2_PIX_FMT_* macros
*
* Struct which matches the MEDIA_BUS_FMT_* codes with the corresponding
* V4L2_PIX_FMT_* fourcc pixelformat and its bytes per pixel (bpp)
*/
struct vimc_pix_map {
unsigned int code;
unsigned int bpp;
u32 pixelformat;
bool bayer;
};
/** /**
* struct vimc_ent_device - core struct that represents a node in the topology * struct vimc_ent_device - core struct that represents a node in the topology
* *
...@@ -115,12 +100,30 @@ struct vimc_pix_map { ...@@ -115,12 +100,30 @@ struct vimc_pix_map {
struct vimc_ent_device { struct vimc_ent_device {
struct media_entity *ent; struct media_entity *ent;
struct media_pad *pads; struct media_pad *pads;
struct vimc_stream *stream;
void * (*process_frame)(struct vimc_ent_device *ved, void * (*process_frame)(struct vimc_ent_device *ved,
const void *frame); const void *frame);
void (*vdev_get_format)(struct vimc_ent_device *ved, void (*vdev_get_format)(struct vimc_ent_device *ved,
struct v4l2_pix_format *fmt); struct v4l2_pix_format *fmt);
}; };
/**
* vimc_mbus_code_supported - helper to check supported mbus codes
*
* Helper function to check if mbus code is enumerated by vimc_enum_mbus_code()
*/
bool vimc_mbus_code_supported(__u32 code);
/**
* vimc_enum_mbus_code - enumerate mbus codes
*
* Helper function to be pluged in .enum_mbus_code from
* struct v4l2_subdev_pad_ops.
*/
int vimc_enum_mbus_code(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_mbus_code_enum *code);
/** /**
* vimc_pads_init - initialize pads * vimc_pads_init - initialize pads
* *
...@@ -155,27 +158,6 @@ static inline void vimc_pads_cleanup(struct media_pad *pads) ...@@ -155,27 +158,6 @@ static inline void vimc_pads_cleanup(struct media_pad *pads)
*/ */
int vimc_pipeline_s_stream(struct media_entity *ent, int enable); int vimc_pipeline_s_stream(struct media_entity *ent, int enable);
/**
* vimc_pix_map_by_index - get vimc_pix_map struct by its index
*
* @i: index of the vimc_pix_map struct in vimc_pix_map_list
*/
const struct vimc_pix_map *vimc_pix_map_by_index(unsigned int i);
/**
* vimc_pix_map_by_code - get vimc_pix_map struct by media bus code
*
* @code: media bus format code defined by MEDIA_BUS_FMT_* macros
*/
const struct vimc_pix_map *vimc_pix_map_by_code(u32 code);
/**
* vimc_pix_map_by_pixelformat - get vimc_pix_map struct by v4l2 pixel format
*
* @pixelformat: pixel format devined by V4L2_PIX_FMT_* macros
*/
const struct vimc_pix_map *vimc_pix_map_by_pixelformat(u32 pixelformat);
/** /**
* vimc_ent_sd_register - initialize and register a subdev node * vimc_ent_sd_register - initialize and register a subdev node
* *
......
drivers/media/platform/vimc/vimc-debayer.c
View file @ b6c61a6c
...@@ -26,6 +26,9 @@ ...@@ -26,6 +26,9 @@
#include "vimc-common.h" #include "vimc-common.h"
#define VIMC_DEB_DRV_NAME "vimc-debayer" #define VIMC_DEB_DRV_NAME "vimc-debayer"
/* This module only supports tranforming a bayer format to V4L2_PIX_FMT_RGB24 */
#define VIMC_DEB_SRC_PIXFMT V4L2_PIX_FMT_RGB24
#define VIMC_DEB_SRC_MBUS_FMT_DEFAULT MEDIA_BUS_FMT_RGB888_1X24
static unsigned int deb_mean_win_size = 3; static unsigned int deb_mean_win_size = 3;
module_param(deb_mean_win_size, uint, 0000); module_param(deb_mean_win_size, uint, 0000);
...@@ -44,6 +47,7 @@ enum vimc_deb_rgb_colors { ...@@ -44,6 +47,7 @@ enum vimc_deb_rgb_colors {
}; };
struct vimc_deb_pix_map { struct vimc_deb_pix_map {
u32 pixelformat;
u32 code; u32 code;
enum vimc_deb_rgb_colors order[2][2]; enum vimc_deb_rgb_colors order[2][2];
}; };
...@@ -73,61 +77,73 @@ static const struct v4l2_mbus_framefmt sink_fmt_default = { ...@@ -73,61 +77,73 @@ static const struct v4l2_mbus_framefmt sink_fmt_default = {
static const struct vimc_deb_pix_map vimc_deb_pix_map_list[] = { static const struct vimc_deb_pix_map vimc_deb_pix_map_list[] = {
{ {
.pixelformat = V4L2_PIX_FMT_SBGGR8,
.code = MEDIA_BUS_FMT_SBGGR8_1X8, .code = MEDIA_BUS_FMT_SBGGR8_1X8,
.order = { { VIMC_DEB_BLUE, VIMC_DEB_GREEN }, .order = { { VIMC_DEB_BLUE, VIMC_DEB_GREEN },
{ VIMC_DEB_GREEN, VIMC_DEB_RED } } { VIMC_DEB_GREEN, VIMC_DEB_RED } }
}, },
{ {
.pixelformat = V4L2_PIX_FMT_SGBRG8,
.code = MEDIA_BUS_FMT_SGBRG8_1X8, .code = MEDIA_BUS_FMT_SGBRG8_1X8,
.order = { { VIMC_DEB_GREEN, VIMC_DEB_BLUE }, .order = { { VIMC_DEB_GREEN, VIMC_DEB_BLUE },
{ VIMC_DEB_RED, VIMC_DEB_GREEN } } { VIMC_DEB_RED, VIMC_DEB_GREEN } }
}, },
{ {
.pixelformat = V4L2_PIX_FMT_SGRBG8,
.code = MEDIA_BUS_FMT_SGRBG8_1X8, .code = MEDIA_BUS_FMT_SGRBG8_1X8,
.order = { { VIMC_DEB_GREEN, VIMC_DEB_RED }, .order = { { VIMC_DEB_GREEN, VIMC_DEB_RED },
{ VIMC_DEB_BLUE, VIMC_DEB_GREEN } } { VIMC_DEB_BLUE, VIMC_DEB_GREEN } }
}, },
{ {
.pixelformat = V4L2_PIX_FMT_SRGGB8,
.code = MEDIA_BUS_FMT_SRGGB8_1X8, .code = MEDIA_BUS_FMT_SRGGB8_1X8,
.order = { { VIMC_DEB_RED, VIMC_DEB_GREEN }, .order = { { VIMC_DEB_RED, VIMC_DEB_GREEN },
{ VIMC_DEB_GREEN, VIMC_DEB_BLUE } } { VIMC_DEB_GREEN, VIMC_DEB_BLUE } }
}, },
{ {
.pixelformat = V4L2_PIX_FMT_SBGGR10,
.code = MEDIA_BUS_FMT_SBGGR10_1X10, .code = MEDIA_BUS_FMT_SBGGR10_1X10,
.order = { { VIMC_DEB_BLUE, VIMC_DEB_GREEN }, .order = { { VIMC_DEB_BLUE, VIMC_DEB_GREEN },
{ VIMC_DEB_GREEN, VIMC_DEB_RED } } { VIMC_DEB_GREEN, VIMC_DEB_RED } }
}, },
{ {
.pixelformat = V4L2_PIX_FMT_SGBRG10,
.code = MEDIA_BUS_FMT_SGBRG10_1X10, .code = MEDIA_BUS_FMT_SGBRG10_1X10,
.order = { { VIMC_DEB_GREEN, VIMC_DEB_BLUE }, .order = { { VIMC_DEB_GREEN, VIMC_DEB_BLUE },
{ VIMC_DEB_RED, VIMC_DEB_GREEN } } { VIMC_DEB_RED, VIMC_DEB_GREEN } }
}, },
{ {
.pixelformat = V4L2_PIX_FMT_SGRBG10,
.code = MEDIA_BUS_FMT_SGRBG10_1X10, .code = MEDIA_BUS_FMT_SGRBG10_1X10,
.order = { { VIMC_DEB_GREEN, VIMC_DEB_RED }, .order = { { VIMC_DEB_GREEN, VIMC_DEB_RED },
{ VIMC_DEB_BLUE, VIMC_DEB_GREEN } } { VIMC_DEB_BLUE, VIMC_DEB_GREEN } }
}, },
{ {
.pixelformat = V4L2_PIX_FMT_SRGGB10,
.code = MEDIA_BUS_FMT_SRGGB10_1X10, .code = MEDIA_BUS_FMT_SRGGB10_1X10,
.order = { { VIMC_DEB_RED, VIMC_DEB_GREEN }, .order = { { VIMC_DEB_RED, VIMC_DEB_GREEN },
{ VIMC_DEB_GREEN, VIMC_DEB_BLUE } } { VIMC_DEB_GREEN, VIMC_DEB_BLUE } }
}, },
{ {
.pixelformat = V4L2_PIX_FMT_SBGGR12,
.code = MEDIA_BUS_FMT_SBGGR12_1X12, .code = MEDIA_BUS_FMT_SBGGR12_1X12,
.order = { { VIMC_DEB_BLUE, VIMC_DEB_GREEN }, .order = { { VIMC_DEB_BLUE, VIMC_DEB_GREEN },
{ VIMC_DEB_GREEN, VIMC_DEB_RED } } { VIMC_DEB_GREEN, VIMC_DEB_RED } }
}, },
{ {
.pixelformat = V4L2_PIX_FMT_SGBRG12,
.code = MEDIA_BUS_FMT_SGBRG12_1X12, .code = MEDIA_BUS_FMT_SGBRG12_1X12,
.order = { { VIMC_DEB_GREEN, VIMC_DEB_BLUE }, .order = { { VIMC_DEB_GREEN, VIMC_DEB_BLUE },
{ VIMC_DEB_RED, VIMC_DEB_GREEN } } { VIMC_DEB_RED, VIMC_DEB_GREEN } }
}, },
{ {
.pixelformat = V4L2_PIX_FMT_SGRBG12,
.code = MEDIA_BUS_FMT_SGRBG12_1X12, .code = MEDIA_BUS_FMT_SGRBG12_1X12,
.order = { { VIMC_DEB_GREEN, VIMC_DEB_RED }, .order = { { VIMC_DEB_GREEN, VIMC_DEB_RED },
{ VIMC_DEB_BLUE, VIMC_DEB_GREEN } } { VIMC_DEB_BLUE, VIMC_DEB_GREEN } }
}, },
{ {
.pixelformat = V4L2_PIX_FMT_SRGGB12,
.code = MEDIA_BUS_FMT_SRGGB12_1X12, .code = MEDIA_BUS_FMT_SRGGB12_1X12,
.order = { { VIMC_DEB_RED, VIMC_DEB_GREEN }, .order = { { VIMC_DEB_RED, VIMC_DEB_GREEN },
{ VIMC_DEB_GREEN, VIMC_DEB_BLUE } } { VIMC_DEB_GREEN, VIMC_DEB_BLUE } }
...@@ -168,41 +184,32 @@ static int vimc_deb_enum_mbus_code(struct v4l2_subdev *sd, ...@@ -168,41 +184,32 @@ static int vimc_deb_enum_mbus_code(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_mbus_code_enum *code) struct v4l2_subdev_mbus_code_enum *code)
{ {
/* We only support one format for source pads */ /* For the sink pad we only support codes in the map_list */
if (IS_SRC(code->pad)) { if (IS_SINK(code->pad)) {
struct vimc_deb_device *vdeb = v4l2_get_subdevdata(sd);
if (code->index)
return -EINVAL;
code->code = vdeb->src_code;
} else {
if (code->index >= ARRAY_SIZE(vimc_deb_pix_map_list)) if (code->index >= ARRAY_SIZE(vimc_deb_pix_map_list))
return -EINVAL; return -EINVAL;
code->code = vimc_deb_pix_map_list[code->index].code; code->code = vimc_deb_pix_map_list[code->index].code;
return 0;
} }
return 0; return vimc_enum_mbus_code(sd, cfg, code);
} }
static int vimc_deb_enum_frame_size(struct v4l2_subdev *sd, static int vimc_deb_enum_frame_size(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_frame_size_enum *fse) struct v4l2_subdev_frame_size_enum *fse)
{ {
struct vimc_deb_device *vdeb = v4l2_get_subdevdata(sd);
if (fse->index) if (fse->index)
return -EINVAL; return -EINVAL;
/* For the sink pad we only support codes in the map_list */
if (IS_SINK(fse->pad)) { if (IS_SINK(fse->pad)) {
const struct vimc_deb_pix_map *vpix = const struct vimc_deb_pix_map *vpix =
vimc_deb_pix_map_by_code(fse->code); vimc_deb_pix_map_by_code(fse->code);
if (!vpix) if (!vpix)
return -EINVAL; return -EINVAL;
} else if (fse->code != vdeb->src_code) {
return -EINVAL;
} }
fse->min_width = VIMC_FRAME_MIN_WIDTH; fse->min_width = VIMC_FRAME_MIN_WIDTH;
...@@ -258,6 +265,9 @@ static int vimc_deb_set_fmt(struct v4l2_subdev *sd, ...@@ -258,6 +265,9 @@ static int vimc_deb_set_fmt(struct v4l2_subdev *sd,
struct vimc_deb_device *vdeb = v4l2_get_subdevdata(sd); struct vimc_deb_device *vdeb = v4l2_get_subdevdata(sd);
struct v4l2_mbus_framefmt *sink_fmt; struct v4l2_mbus_framefmt *sink_fmt;
if (!vimc_mbus_code_supported(fmt->format.code))
fmt->format.code = sink_fmt_default.code;
if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) { if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
/* Do not change the format while stream is on */ /* Do not change the format while stream is on */
if (vdeb->src_frame) if (vdeb->src_frame)
...@@ -270,11 +280,11 @@ static int vimc_deb_set_fmt(struct v4l2_subdev *sd, ...@@ -270,11 +280,11 @@ static int vimc_deb_set_fmt(struct v4l2_subdev *sd,
/* /*
* Do not change the format of the source pad, * Do not change the format of the source pad,
* it is propagated from the sink * it is propagated from the sink (except for the code)
*/ */
if (IS_SRC(fmt->pad)) { if (IS_SRC(fmt->pad)) {
vdeb->src_code = fmt->format.code;
fmt->format = *sink_fmt; fmt->format = *sink_fmt;
/* TODO: Add support for other formats */
fmt->format.code = vdeb->src_code; fmt->format.code = vdeb->src_code;
} else { } else {
/* Set the new format in the sink pad */ /* Set the new format in the sink pad */
...@@ -306,7 +316,7 @@ static const struct v4l2_subdev_pad_ops vimc_deb_pad_ops = { ...@@ -306,7 +316,7 @@ static const struct v4l2_subdev_pad_ops vimc_deb_pad_ops = {
.set_fmt = vimc_deb_set_fmt, .set_fmt = vimc_deb_set_fmt,
}; };
static void vimc_deb_set_rgb_mbus_fmt_rgb888_1x24(struct vimc_deb_device *vdeb, static void vimc_deb_set_rgb_pix_rgb24(struct vimc_deb_device *vdeb,
unsigned int lin, unsigned int lin,
unsigned int col, unsigned int col,
unsigned int rgb[3]) unsigned int rgb[3])
...@@ -323,25 +333,38 @@ static int vimc_deb_s_stream(struct v4l2_subdev *sd, int enable) ...@@ -323,25 +333,38 @@ static int vimc_deb_s_stream(struct v4l2_subdev *sd, int enable)
struct vimc_deb_device *vdeb = v4l2_get_subdevdata(sd); struct vimc_deb_device *vdeb = v4l2_get_subdevdata(sd);
if (enable) { if (enable) {
const struct vimc_pix_map *vpix; u32 src_pixelformat = vdeb->ved.stream->producer_pixfmt;
const struct v4l2_format_info *pix_info;
unsigned int frame_size; unsigned int frame_size;
if (vdeb->src_frame) if (vdeb->src_frame)
return 0; return 0;
/* Calculate the frame size of the source pad */ /* We only support translating bayer to RGB24 */
vpix = vimc_pix_map_by_code(vdeb->src_code); if (src_pixelformat != V4L2_PIX_FMT_RGB24) {
frame_size = vdeb->sink_fmt.width * vdeb->sink_fmt.height * dev_err(vdeb->dev,
vpix->bpp; "translating to pixfmt (0x%08x) is not supported\n",
src_pixelformat);
/* Save the bytes per pixel of the sink */ return -EINVAL;
vpix = vimc_pix_map_by_code(vdeb->sink_fmt.code); }
vdeb->sink_bpp = vpix->bpp;
/* Get the corresponding pixel map from the table */ /* Get the corresponding pixel map from the table */
vdeb->sink_pix_map = vdeb->sink_pix_map =
vimc_deb_pix_map_by_code(vdeb->sink_fmt.code); vimc_deb_pix_map_by_code(vdeb->sink_fmt.code);
/* Request bayer format from the pipeline for the sink pad */
vdeb->ved.stream->producer_pixfmt =
vdeb->sink_pix_map->pixelformat;
/* Calculate frame_size of the source */
pix_info = v4l2_format_info(src_pixelformat);
frame_size = vdeb->sink_fmt.width * vdeb->sink_fmt.height *
pix_info->bpp[0];
/* Get bpp from the sink */
pix_info = v4l2_format_info(vdeb->sink_pix_map->pixelformat);
vdeb->sink_bpp = pix_info->bpp[0];
/* /*
* Allocate the frame buffer. Use vmalloc to be able to * Allocate the frame buffer. Use vmalloc to be able to
* allocate a large amount of memory * allocate a large amount of memory
...@@ -542,14 +565,14 @@ static int vimc_deb_comp_bind(struct device *comp, struct device *master, ...@@ -542,14 +565,14 @@ static int vimc_deb_comp_bind(struct device *comp, struct device *master,
/* Initialize the frame format */ /* Initialize the frame format */
vdeb->sink_fmt = sink_fmt_default; vdeb->sink_fmt = sink_fmt_default;
vdeb->src_code = VIMC_DEB_SRC_MBUS_FMT_DEFAULT;
/* /*
* TODO: Add support for more output formats, we only support * TODO: Add support for more output formats, we only support
* RGB888 for now * RGB24 for now.
* NOTE: the src format is always the same as the sink, except * NOTE: the src format is always the same as the sink, except
* for the code * for the code
*/ */
vdeb->src_code = MEDIA_BUS_FMT_RGB888_1X24; vdeb->set_rgb_src = vimc_deb_set_rgb_pix_rgb24;
vdeb->set_rgb_src = vimc_deb_set_rgb_mbus_fmt_rgb888_1x24;
return 0; return 0;
} }
......
drivers/media/platform/vimc/vimc-scaler.c
View file @ b6c61a6c
...@@ -35,6 +35,12 @@ MODULE_PARM_DESC(sca_mult, " the image size multiplier"); ...@@ -35,6 +35,12 @@ MODULE_PARM_DESC(sca_mult, " the image size multiplier");
#define IS_SRC(pad) (pad) #define IS_SRC(pad) (pad)
#define MAX_ZOOM 8 #define MAX_ZOOM 8
static const u32 vimc_sca_supported_pixfmt[] = {
V4L2_PIX_FMT_BGR24,
V4L2_PIX_FMT_RGB24,
V4L2_PIX_FMT_ARGB32,
};
struct vimc_sca_device { struct vimc_sca_device {
struct vimc_ent_device ved; struct vimc_ent_device ved;
struct v4l2_subdev sd; struct v4l2_subdev sd;
...@@ -57,6 +63,16 @@ static const struct v4l2_mbus_framefmt sink_fmt_default = { ...@@ -57,6 +63,16 @@ static const struct v4l2_mbus_framefmt sink_fmt_default = {
.colorspace = V4L2_COLORSPACE_DEFAULT, .colorspace = V4L2_COLORSPACE_DEFAULT,
}; };
static bool vimc_sca_is_pixfmt_supported(u32 pixelformat)
{
unsigned int i;
for (i = 0; i < ARRAY_SIZE(vimc_sca_supported_pixfmt); i++)
if (vimc_sca_supported_pixfmt[i] == pixelformat)
return true;
return false;
}
static int vimc_sca_init_cfg(struct v4l2_subdev *sd, static int vimc_sca_init_cfg(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config *cfg) struct v4l2_subdev_pad_config *cfg)
{ {
...@@ -76,35 +92,13 @@ static int vimc_sca_init_cfg(struct v4l2_subdev *sd, ...@@ -76,35 +92,13 @@ static int vimc_sca_init_cfg(struct v4l2_subdev *sd,
return 0; return 0;
} }
static int vimc_sca_enum_mbus_code(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_mbus_code_enum *code)
{
const struct vimc_pix_map *vpix = vimc_pix_map_by_index(code->index);
/* We don't support bayer format */
if (!vpix || vpix->bayer)
return -EINVAL;
code->code = vpix->code;
return 0;
}
static int vimc_sca_enum_frame_size(struct v4l2_subdev *sd, static int vimc_sca_enum_frame_size(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_frame_size_enum *fse) struct v4l2_subdev_frame_size_enum *fse)
{ {
const struct vimc_pix_map *vpix;
if (fse->index) if (fse->index)
return -EINVAL; return -EINVAL;
/* Only accept code in the pix map table in non bayer format */
vpix = vimc_pix_map_by_code(fse->code);
if (!vpix || vpix->bayer)
return -EINVAL;
fse->min_width = VIMC_FRAME_MIN_WIDTH; fse->min_width = VIMC_FRAME_MIN_WIDTH;
fse->min_height = VIMC_FRAME_MIN_HEIGHT; fse->min_height = VIMC_FRAME_MIN_HEIGHT;
...@@ -141,13 +135,6 @@ static int vimc_sca_get_fmt(struct v4l2_subdev *sd, ...@@ -141,13 +135,6 @@ static int vimc_sca_get_fmt(struct v4l2_subdev *sd,
static void vimc_sca_adjust_sink_fmt(struct v4l2_mbus_framefmt *fmt) static void vimc_sca_adjust_sink_fmt(struct v4l2_mbus_framefmt *fmt)
{ {
const struct vimc_pix_map *vpix;
/* Only accept code in the pix map table in non bayer format */
vpix = vimc_pix_map_by_code(fmt->code);
if (!vpix || vpix->bayer)
fmt->code = sink_fmt_default.code;
fmt->width = clamp_t(u32, fmt->width, VIMC_FRAME_MIN_WIDTH, fmt->width = clamp_t(u32, fmt->width, VIMC_FRAME_MIN_WIDTH,
VIMC_FRAME_MAX_WIDTH) & ~1; VIMC_FRAME_MAX_WIDTH) & ~1;
fmt->height = clamp_t(u32, fmt->height, VIMC_FRAME_MIN_HEIGHT, fmt->height = clamp_t(u32, fmt->height, VIMC_FRAME_MIN_HEIGHT,
...@@ -166,6 +153,9 @@ static int vimc_sca_set_fmt(struct v4l2_subdev *sd, ...@@ -166,6 +153,9 @@ static int vimc_sca_set_fmt(struct v4l2_subdev *sd,
struct vimc_sca_device *vsca = v4l2_get_subdevdata(sd); struct vimc_sca_device *vsca = v4l2_get_subdevdata(sd);
struct v4l2_mbus_framefmt *sink_fmt; struct v4l2_mbus_framefmt *sink_fmt;
if (!vimc_mbus_code_supported(fmt->format.code))
fmt->format.code = sink_fmt_default.code;
if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) { if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
/* Do not change the format while stream is on */ /* Do not change the format while stream is on */
if (vsca->src_frame) if (vsca->src_frame)
...@@ -208,7 +198,7 @@ static int vimc_sca_set_fmt(struct v4l2_subdev *sd, ...@@ -208,7 +198,7 @@ static int vimc_sca_set_fmt(struct v4l2_subdev *sd,
static const struct v4l2_subdev_pad_ops vimc_sca_pad_ops = { static const struct v4l2_subdev_pad_ops vimc_sca_pad_ops = {
.init_cfg = vimc_sca_init_cfg, .init_cfg = vimc_sca_init_cfg,
.enum_mbus_code = vimc_sca_enum_mbus_code, .enum_mbus_code = vimc_enum_mbus_code,
.enum_frame_size = vimc_sca_enum_frame_size, .enum_frame_size = vimc_sca_enum_frame_size,
.get_fmt = vimc_sca_get_fmt, .get_fmt = vimc_sca_get_fmt,
.set_fmt = vimc_sca_set_fmt, .set_fmt = vimc_sca_set_fmt,
...@@ -219,15 +209,22 @@ static int vimc_sca_s_stream(struct v4l2_subdev *sd, int enable) ...@@ -219,15 +209,22 @@ static int vimc_sca_s_stream(struct v4l2_subdev *sd, int enable)
struct vimc_sca_device *vsca = v4l2_get_subdevdata(sd); struct vimc_sca_device *vsca = v4l2_get_subdevdata(sd);
if (enable) { if (enable) {
const struct vimc_pix_map *vpix; u32 pixelformat = vsca->ved.stream->producer_pixfmt;
const struct v4l2_format_info *pix_info;
unsigned int frame_size; unsigned int frame_size;
if (vsca->src_frame) if (vsca->src_frame)
return 0; return 0;
if (!vimc_sca_is_pixfmt_supported(pixelformat)) {
dev_err(vsca->dev, "pixfmt (0x%08x) is not supported\n",
pixelformat);
return -EINVAL;
}
/* Save the bytes per pixel of the sink */ /* Save the bytes per pixel of the sink */
vpix = vimc_pix_map_by_code(vsca->sink_fmt.code); pix_info = v4l2_format_info(pixelformat);
vsca->bpp = vpix->bpp; vsca->bpp = pix_info->bpp[0];
/* Calculate the width in bytes of the src frame */ /* Calculate the width in bytes of the src frame */
vsca->src_line_size = vsca->sink_fmt.width * vsca->src_line_size = vsca->sink_fmt.width *
......
drivers/media/platform/vimc/vimc-sensor.c
View file @ b6c61a6c
...@@ -65,34 +65,13 @@ static int vimc_sen_init_cfg(struct v4l2_subdev *sd, ...@@ -65,34 +65,13 @@ static int vimc_sen_init_cfg(struct v4l2_subdev *sd,
return 0; return 0;
} }
static int vimc_sen_enum_mbus_code(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_mbus_code_enum *code)
{
const struct vimc_pix_map *vpix = vimc_pix_map_by_index(code->index);
if (!vpix)
return -EINVAL;
code->code = vpix->code;
return 0;
}
static int vimc_sen_enum_frame_size(struct v4l2_subdev *sd, static int vimc_sen_enum_frame_size(struct v4l2_subdev *sd,
struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_pad_config *cfg,
struct v4l2_subdev_frame_size_enum *fse) struct v4l2_subdev_frame_size_enum *fse)
{ {
const struct vimc_pix_map *vpix;
if (fse->index) if (fse->index)
return -EINVAL; return -EINVAL;
/* Only accept code in the pix map table */
vpix = vimc_pix_map_by_code(fse->code);
if (!vpix)
return -EINVAL;
fse->min_width = VIMC_FRAME_MIN_WIDTH; fse->min_width = VIMC_FRAME_MIN_WIDTH;
fse->max_width = VIMC_FRAME_MAX_WIDTH; fse->max_width = VIMC_FRAME_MAX_WIDTH;
fse->min_height = VIMC_FRAME_MIN_HEIGHT; fse->min_height = VIMC_FRAME_MIN_HEIGHT;
...@@ -117,14 +96,17 @@ static int vimc_sen_get_fmt(struct v4l2_subdev *sd, ...@@ -117,14 +96,17 @@ static int vimc_sen_get_fmt(struct v4l2_subdev *sd,
static void vimc_sen_tpg_s_format(struct vimc_sen_device *vsen) static void vimc_sen_tpg_s_format(struct vimc_sen_device *vsen)
{ {
const struct vimc_pix_map *vpix = u32 pixelformat = vsen->ved.stream->producer_pixfmt;
vimc_pix_map_by_code(vsen->mbus_format.code); const struct v4l2_format_info *pix_info;
pix_info = v4l2_format_info(pixelformat);
tpg_reset_source(&vsen->tpg, vsen->mbus_format.width, tpg_reset_source(&vsen->tpg, vsen->mbus_format.width,
vsen->mbus_format.height, vsen->mbus_format.field); vsen->mbus_format.height, vsen->mbus_format.field);
tpg_s_bytesperline(&vsen->tpg, 0, vsen->mbus_format.width * vpix->bpp); tpg_s_bytesperline(&vsen->tpg, 0,
vsen->mbus_format.width * pix_info->bpp[0]);
tpg_s_buf_height(&vsen->tpg, vsen->mbus_format.height); tpg_s_buf_height(&vsen->tpg, vsen->mbus_format.height);
tpg_s_fourcc(&vsen->tpg, vpix->pixelformat); tpg_s_fourcc(&vsen->tpg, pixelformat);
/* TODO: add support for V4L2_FIELD_ALTERNATE */ /* TODO: add support for V4L2_FIELD_ALTERNATE */
tpg_s_field(&vsen->tpg, vsen->mbus_format.field, false); tpg_s_field(&vsen->tpg, vsen->mbus_format.field, false);
tpg_s_colorspace(&vsen->tpg, vsen->mbus_format.colorspace); tpg_s_colorspace(&vsen->tpg, vsen->mbus_format.colorspace);
...@@ -135,13 +117,6 @@ static void vimc_sen_tpg_s_format(struct vimc_sen_device *vsen) ...@@ -135,13 +117,6 @@ static void vimc_sen_tpg_s_format(struct vimc_sen_device *vsen)
static void vimc_sen_adjust_fmt(struct v4l2_mbus_framefmt *fmt) static void vimc_sen_adjust_fmt(struct v4l2_mbus_framefmt *fmt)
{ {
const struct vimc_pix_map *vpix;
/* Only accept code in the pix map table */
vpix = vimc_pix_map_by_code(fmt->code);
if (!vpix)
fmt->code = fmt_default.code;
fmt->width = clamp_t(u32, fmt->width, VIMC_FRAME_MIN_WIDTH, fmt->width = clamp_t(u32, fmt->width, VIMC_FRAME_MIN_WIDTH,
VIMC_FRAME_MAX_WIDTH) & ~1; VIMC_FRAME_MAX_WIDTH) & ~1;
fmt->height = clamp_t(u32, fmt->height, VIMC_FRAME_MIN_HEIGHT, fmt->height = clamp_t(u32, fmt->height, VIMC_FRAME_MIN_HEIGHT,
...@@ -161,6 +136,9 @@ static int vimc_sen_set_fmt(struct v4l2_subdev *sd, ...@@ -161,6 +136,9 @@ static int vimc_sen_set_fmt(struct v4l2_subdev *sd,
struct vimc_sen_device *vsen = v4l2_get_subdevdata(sd); struct vimc_sen_device *vsen = v4l2_get_subdevdata(sd);
struct v4l2_mbus_framefmt *mf; struct v4l2_mbus_framefmt *mf;
if (!vimc_mbus_code_supported(fmt->format.code))
fmt->format.code = fmt_default.code;
if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) { if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
/* Do not change the format while stream is on */ /* Do not change the format while stream is on */
if (vsen->frame) if (vsen->frame)
...@@ -193,7 +171,7 @@ static int vimc_sen_set_fmt(struct v4l2_subdev *sd, ...@@ -193,7 +171,7 @@ static int vimc_sen_set_fmt(struct v4l2_subdev *sd,
static const struct v4l2_subdev_pad_ops vimc_sen_pad_ops = { static const struct v4l2_subdev_pad_ops vimc_sen_pad_ops = {
.init_cfg = vimc_sen_init_cfg, .init_cfg = vimc_sen_init_cfg,
.enum_mbus_code = vimc_sen_enum_mbus_code, .enum_mbus_code = vimc_enum_mbus_code,
.enum_frame_size = vimc_sen_enum_frame_size, .enum_frame_size = vimc_sen_enum_frame_size,
.get_fmt = vimc_sen_get_fmt, .get_fmt = vimc_sen_get_fmt,
.set_fmt = vimc_sen_set_fmt, .set_fmt = vimc_sen_set_fmt,
...@@ -215,7 +193,8 @@ static int vimc_sen_s_stream(struct v4l2_subdev *sd, int enable) ...@@ -215,7 +193,8 @@ static int vimc_sen_s_stream(struct v4l2_subdev *sd, int enable)
container_of(sd, struct vimc_sen_device, sd); container_of(sd, struct vimc_sen_device, sd);
if (enable) { if (enable) {
const struct vimc_pix_map *vpix; u32 pixelformat = vsen->ved.stream->producer_pixfmt;
const struct v4l2_format_info *pix_info;
unsigned int frame_size; unsigned int frame_size;
if (vsen->kthread_sen) if (vsen->kthread_sen)
...@@ -223,8 +202,8 @@ static int vimc_sen_s_stream(struct v4l2_subdev *sd, int enable) ...@@ -223,8 +202,8 @@ static int vimc_sen_s_stream(struct v4l2_subdev *sd, int enable)
return 0; return 0;
/* Calculate the frame size */ /* Calculate the frame size */
vpix = vimc_pix_map_by_code(vsen->mbus_format.code); pix_info = v4l2_format_info(pixelformat);
frame_size = vsen->mbus_format.width * vpix->bpp * frame_size = vsen->mbus_format.width * pix_info->bpp[0] *
vsen->mbus_format.height; vsen->mbus_format.height;
/* /*
......
drivers/media/platform/vimc/vimc-streamer.c
View file @ b6c61a6c
...@@ -52,6 +52,7 @@ static void vimc_streamer_pipeline_terminate(struct vimc_stream *stream) ...@@ -52,6 +52,7 @@ static void vimc_streamer_pipeline_terminate(struct vimc_stream *stream)
while (stream->pipe_size) { while (stream->pipe_size) {
stream->pipe_size--; stream->pipe_size--;
ved = stream->ved_pipeline[stream->pipe_size]; ved = stream->ved_pipeline[stream->pipe_size];
ved->stream = NULL;
stream->ved_pipeline[stream->pipe_size] = NULL; stream->ved_pipeline[stream->pipe_size] = NULL;
if (!is_media_entity_v4l2_subdev(ved->ent)) if (!is_media_entity_v4l2_subdev(ved->ent))
...@@ -87,6 +88,7 @@ static int vimc_streamer_pipeline_init(struct vimc_stream *stream, ...@@ -87,6 +88,7 @@ static int vimc_streamer_pipeline_init(struct vimc_stream *stream,
return -EINVAL; return -EINVAL;
} }
stream->ved_pipeline[stream->pipe_size++] = ved; stream->ved_pipeline[stream->pipe_size++] = ved;
ved->stream = stream;
if (is_media_entity_v4l2_subdev(ved->ent)) { if (is_media_entity_v4l2_subdev(ved->ent)) {
sd = media_entity_to_v4l2_subdev(ved->ent); sd = media_entity_to_v4l2_subdev(ved->ent);
......
drivers/media/platform/vimc/vimc-streamer.h
View file @ b6c61a6c
...@@ -25,6 +25,11 @@ ...@@ -25,6 +25,11 @@
* processed in the pipeline. * processed in the pipeline.
* @pipe_size: size of @ved_pipeline * @pipe_size: size of @ved_pipeline
* @kthread: thread that generates the frames of the stream. * @kthread: thread that generates the frames of the stream.
* @producer_pixfmt: the pixel format requested from the pipeline. This must
* be set just before calling vimc_streamer_s_stream(ent, 1). This value is
* propagated up to the source of the base image (usually a sensor node) and
* can be modified by entities during s_stream callback to request a different
* format from rest of the pipeline.
* *
* When the user call stream_on in a video device, struct vimc_stream is * When the user call stream_on in a video device, struct vimc_stream is
* used to keep track of all entities and subdevices that generates and * used to keep track of all entities and subdevices that generates and
...@@ -35,6 +40,7 @@ struct vimc_stream { ...@@ -35,6 +40,7 @@ struct vimc_stream {
struct vimc_ent_device *ved_pipeline[VIMC_STREAMER_PIPELINE_MAX_SIZE]; struct vimc_ent_device *ved_pipeline[VIMC_STREAMER_PIPELINE_MAX_SIZE];
unsigned int pipe_size; unsigned int pipe_size;
struct task_struct *kthread; struct task_struct *kthread;
u32 producer_pixfmt;
}; };
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7