2019-05-27 08:55:06 +02:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
2017-04-07 14:55:19 -03:00
|
|
|
/*
|
|
|
|
* vimc-sensor.c Virtual Media Controller Driver
|
|
|
|
*
|
|
|
|
* Copyright (C) 2015-2017 Helen Koike <helen.fornazier@gmail.com>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/v4l2-mediabus.h>
|
|
|
|
#include <linux/vmalloc.h>
|
2017-11-06 05:20:01 -05:00
|
|
|
#include <media/v4l2-ctrls.h>
|
2018-02-02 08:00:32 -05:00
|
|
|
#include <media/v4l2-event.h>
|
2017-04-07 14:55:19 -03:00
|
|
|
#include <media/v4l2-subdev.h>
|
2017-10-09 06:02:25 -04:00
|
|
|
#include <media/tpg/v4l2-tpg.h>
|
2017-04-07 14:55:19 -03:00
|
|
|
|
2017-06-19 14:00:18 -03:00
|
|
|
#include "vimc-common.h"
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
enum vimc_sensor_osd_mode {
|
|
|
|
VIMC_SENSOR_OSD_SHOW_ALL = 0,
|
|
|
|
VIMC_SENSOR_OSD_SHOW_COUNTERS = 1,
|
|
|
|
VIMC_SENSOR_OSD_SHOW_NONE = 2
|
2020-07-05 15:53:06 +02:00
|
|
|
};
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
struct vimc_sensor_device {
|
2017-04-07 14:55:19 -03:00
|
|
|
struct vimc_ent_device ved;
|
|
|
|
struct v4l2_subdev sd;
|
2017-06-19 14:00:10 -03:00
|
|
|
struct tpg_data tpg;
|
2017-04-07 14:55:19 -03:00
|
|
|
u8 *frame;
|
2022-06-16 11:07:45 +01:00
|
|
|
enum vimc_sensor_osd_mode osd_value;
|
2020-07-05 15:53:06 +02:00
|
|
|
u64 start_stream_ts;
|
2017-04-07 14:55:19 -03:00
|
|
|
/* The active format */
|
|
|
|
struct v4l2_mbus_framefmt mbus_format;
|
2017-11-06 05:20:01 -05:00
|
|
|
struct v4l2_ctrl_handler hdl;
|
2019-10-03 09:59:42 -03:00
|
|
|
struct media_pad pad;
|
2017-04-07 14:55:19 -03:00
|
|
|
};
|
|
|
|
|
2017-06-19 14:00:16 -03:00
|
|
|
static const struct v4l2_mbus_framefmt fmt_default = {
|
|
|
|
.width = 640,
|
|
|
|
.height = 480,
|
|
|
|
.code = MEDIA_BUS_FMT_RGB888_1X24,
|
|
|
|
.field = V4L2_FIELD_NONE,
|
2020-04-17 17:09:29 +02:00
|
|
|
.colorspace = V4L2_COLORSPACE_SRGB,
|
2017-06-19 14:00:16 -03:00
|
|
|
};
|
|
|
|
|
2023-11-27 11:07:44 +02:00
|
|
|
static int vimc_sensor_init_state(struct v4l2_subdev *sd,
|
|
|
|
struct v4l2_subdev_state *sd_state)
|
2017-06-19 14:00:16 -03:00
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
for (i = 0; i < sd->entity.num_pads; i++) {
|
|
|
|
struct v4l2_mbus_framefmt *mf;
|
|
|
|
|
media: v4l: subdev: Switch to stream-aware state functions
Switch all drivers accessing sub-device state to use the stream-aware
functions. We will soon remove the old ones.
This patch has been generated using the following Coccinelle script:
---------8<------------
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
---------8<------------
Additionally drivers/media/i2c/s5k5baf.c and
drivers/media/platform/samsung/s3c-camif/camif-capture.c have been
manually changed as Coccinelle didn't. Further local variables have been
removed as they became unused as a result of the other changes.
Also Coccinelle introduced indentation by space in files
drivers/media/i2c/st-mipid02.c and
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c. This has been also
corrected.
The diff from Coccinelle-generated changes are:
> diff --git b/drivers/media/i2c/imx319.c a/drivers/media/i2c/imx319.c
> index e549692ff478..420984382173 100644
> --- b/drivers/media/i2c/imx319.c
> +++ a/drivers/media/i2c/imx319.c
> @@ -2001,7 +2001,6 @@ static int imx319_do_get_pad_format(struct imx319 *imx319,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx319->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/imx355.c a/drivers/media/i2c/imx355.c
> index 96bdde685d65..e1b1d2fc79dd 100644
> --- b/drivers/media/i2c/imx355.c
> +++ a/drivers/media/i2c/imx355.c
> @@ -1299,7 +1299,6 @@ static int imx355_do_get_pad_format(struct imx355 *imx355,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx355->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov08x40.c a/drivers/media/i2c/ov08x40.c
> index ca799bbcfdb7..abbb0b774d43 100644
> --- b/drivers/media/i2c/ov08x40.c
> +++ a/drivers/media/i2c/ov08x40.c
> @@ -2774,7 +2774,6 @@ static int ov08x40_do_get_pad_format(struct ov08x40 *ov08x,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov08x->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13858.c a/drivers/media/i2c/ov13858.c
> index 7816d9787c61..09387e335d80 100644
> --- b/drivers/media/i2c/ov13858.c
> +++ a/drivers/media/i2c/ov13858.c
> @@ -1316,7 +1316,6 @@ static int ov13858_do_get_pad_format(struct ov13858 *ov13858,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13858->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13b10.c a/drivers/media/i2c/ov13b10.c
> index 268cd4b03f9c..c06411d5ee2b 100644
> --- b/drivers/media/i2c/ov13b10.c
> +++ a/drivers/media/i2c/ov13b10.c
> @@ -1001,7 +1001,6 @@ static int ov13b10_do_get_pad_format(struct ov13b10 *ov13b,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13b->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/s5c73m3/s5c73m3-core.c a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> index 47605e36bc60..8f9b5713daf7 100644
> --- b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> +++ a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> @@ -819,7 +819,6 @@ static void s5c73m3_oif_try_format(struct s5c73m3 *state,
> struct v4l2_subdev_format *fmt,
> const struct s5c73m3_frame_size **fs)
> {
> - struct v4l2_subdev *sd = &state->sensor_sd;
> u32 code;
>
> switch (fmt->pad) {
> diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
> index 67da2045f543..03ccfb0e1e11 100644
> --- a/drivers/media/i2c/s5k5baf.c
> +++ b/drivers/media/i2c/s5k5baf.c
> @@ -1472,14 +1472,11 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
>
> if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
> rects = (struct v4l2_rect * []) {
> - &s5k5baf_cis_rect,
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_compose(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_OUT)
> - };
> + &s5k5baf_cis_rect,
> + v4l2_subdev_state_get_crop(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_compose(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_crop(sd_state, PAD_OUT)
> + };
> s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
> return 0;
> }
> diff --git b/drivers/media/platform/samsung/s3c-camif/camif-capture.c a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> index 295e083f38e8..be58260ea67e 100644
> --- b/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> +++ a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> @@ -1216,7 +1216,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
> struct v4l2_mbus_framefmt *mf = &fmt->format;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> fmt->format = *mf;
> return 0;
> }
> @@ -1305,7 +1305,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
> __camif_subdev_try_format(camif, mf, fmt->pad);
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> *mf = fmt->format;
> mutex_unlock(&camif->lock);
> return 0;
> diff --git b/drivers/media/platform/ti/cal/cal-camerarx.c a/drivers/media/platform/ti/cal/cal-camerarx.c
> index cea454ed9c20..61433744c6c4 100644
> --- b/drivers/media/platform/ti/cal/cal-camerarx.c
> +++ a/drivers/media/platform/ti/cal/cal-camerarx.c
> @@ -621,8 +621,6 @@ static int cal_camerarx_sd_enum_mbus_code(struct v4l2_subdev *sd,
> struct v4l2_subdev_state *state,
> struct v4l2_subdev_mbus_code_enum *code)
> {
> - struct cal_camerarx *phy = to_cal_camerarx(sd);
> -
> /* No transcoding, source and sink codes must match. */
> if (cal_rx_pad_is_source(code->pad)) {
> struct v4l2_mbus_framefmt *fmt;
> diff --git b/drivers/staging/media/imx/imx-ic-prp.c a/drivers/staging/media/imx/imx-ic-prp.c
> index dd558fac6477..61d69f19657e 100644
> --- b/drivers/staging/media/imx/imx-ic-prp.c
> +++ a/drivers/staging/media/imx/imx-ic-prp.c
> @@ -82,8 +82,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git b/drivers/staging/media/imx/imx-ic-prpencvf.c a/drivers/staging/media/imx/imx-ic-prpencvf.c
> index 02db7dbb884b..ec73c901079e 100644
> --- b/drivers/staging/media/imx/imx-ic-prpencvf.c
> +++ a/drivers/staging/media/imx/imx-ic-prpencvf.c
> @@ -790,8 +790,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git a/drivers/media/i2c/st-mipid02.c b/drivers/media/i2c/st-mipid02.c
> index 9c9361354c00..b08a249b5fdd 100644
> --- a/drivers/media/i2c/st-mipid02.c
> +++ b/drivers/media/i2c/st-mipid02.c
> @@ -751,7 +751,7 @@ static void mipid02_set_fmt_source(struct v4l2_subdev *sd,
> format->format = bridge->fmt;
> else
> format->format = *v4l2_subdev_state_get_format(sd_state,
> - MIPID02_SINK_0);
> + MIPID02_SINK_0);
>
> /* but code may need to be converted */
> format->format.code = serial_to_parallel_code(format->format.code);
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> index 117912d3bfbd..96353648c032 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> @@ -319,7 +319,7 @@ static void rkisp1_isp_start(struct rkisp1_isp *isp,
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
>
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_info = rkisp1_mbus_info_get_by_code(src_fmt->code);
>
> if (src_info->pixel_enc != V4L2_PIXEL_ENC_BAYER)
> @@ -475,9 +475,9 @@ static void rkisp1_isp_set_src_fmt(struct rkisp1_isp *isp,
> sink_fmt = v4l2_subdev_state_get_format(sd_state,
> RKISP1_ISP_PAD_SINK_VIDEO);
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_crop = v4l2_subdev_state_get_crop(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
>
> /*
> * Media bus code. The ISP can operate in pass-through mode (Bayer in,
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
2023-10-13 09:37:10 +02:00
|
|
|
mf = v4l2_subdev_state_get_format(sd_state, i);
|
2017-06-19 14:00:16 -03:00
|
|
|
*mf = fmt_default;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
static int vimc_sensor_enum_mbus_code(struct v4l2_subdev *sd,
|
|
|
|
struct v4l2_subdev_state *sd_state,
|
|
|
|
struct v4l2_subdev_mbus_code_enum *code)
|
2019-08-08 21:27:41 -03:00
|
|
|
{
|
2020-05-01 15:11:02 +02:00
|
|
|
u32 mbus_code = vimc_mbus_code_by_index(code->index);
|
2019-08-08 21:27:41 -03:00
|
|
|
|
2020-05-01 15:11:02 +02:00
|
|
|
if (!mbus_code)
|
2019-08-08 21:27:41 -03:00
|
|
|
return -EINVAL;
|
|
|
|
|
2020-05-01 15:11:02 +02:00
|
|
|
code->code = mbus_code;
|
2019-08-08 21:27:41 -03:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
static int vimc_sensor_enum_frame_size(struct v4l2_subdev *sd,
|
|
|
|
struct v4l2_subdev_state *sd_state,
|
|
|
|
struct v4l2_subdev_frame_size_enum *fse)
|
2017-04-07 14:55:19 -03:00
|
|
|
{
|
2019-08-08 21:27:41 -03:00
|
|
|
const struct vimc_pix_map *vpix;
|
|
|
|
|
2017-04-07 14:55:19 -03:00
|
|
|
if (fse->index)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2019-08-08 21:27:41 -03:00
|
|
|
/* Only accept code in the pix map table */
|
|
|
|
vpix = vimc_pix_map_by_code(fse->code);
|
|
|
|
if (!vpix)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2017-06-19 14:00:16 -03:00
|
|
|
fse->min_width = VIMC_FRAME_MIN_WIDTH;
|
|
|
|
fse->max_width = VIMC_FRAME_MAX_WIDTH;
|
|
|
|
fse->min_height = VIMC_FRAME_MIN_HEIGHT;
|
|
|
|
fse->max_height = VIMC_FRAME_MAX_HEIGHT;
|
2017-04-07 14:55:19 -03:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
static int vimc_sensor_get_fmt(struct v4l2_subdev *sd,
|
|
|
|
struct v4l2_subdev_state *sd_state,
|
|
|
|
struct v4l2_subdev_format *fmt)
|
2017-04-07 14:55:19 -03:00
|
|
|
{
|
2022-06-16 11:07:45 +01:00
|
|
|
struct vimc_sensor_device *vsensor =
|
|
|
|
container_of(sd, struct vimc_sensor_device, sd);
|
2017-04-07 14:55:19 -03:00
|
|
|
|
2017-06-19 14:00:16 -03:00
|
|
|
fmt->format = fmt->which == V4L2_SUBDEV_FORMAT_TRY ?
|
media: v4l: subdev: Switch to stream-aware state functions
Switch all drivers accessing sub-device state to use the stream-aware
functions. We will soon remove the old ones.
This patch has been generated using the following Coccinelle script:
---------8<------------
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
---------8<------------
Additionally drivers/media/i2c/s5k5baf.c and
drivers/media/platform/samsung/s3c-camif/camif-capture.c have been
manually changed as Coccinelle didn't. Further local variables have been
removed as they became unused as a result of the other changes.
Also Coccinelle introduced indentation by space in files
drivers/media/i2c/st-mipid02.c and
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c. This has been also
corrected.
The diff from Coccinelle-generated changes are:
> diff --git b/drivers/media/i2c/imx319.c a/drivers/media/i2c/imx319.c
> index e549692ff478..420984382173 100644
> --- b/drivers/media/i2c/imx319.c
> +++ a/drivers/media/i2c/imx319.c
> @@ -2001,7 +2001,6 @@ static int imx319_do_get_pad_format(struct imx319 *imx319,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx319->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/imx355.c a/drivers/media/i2c/imx355.c
> index 96bdde685d65..e1b1d2fc79dd 100644
> --- b/drivers/media/i2c/imx355.c
> +++ a/drivers/media/i2c/imx355.c
> @@ -1299,7 +1299,6 @@ static int imx355_do_get_pad_format(struct imx355 *imx355,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx355->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov08x40.c a/drivers/media/i2c/ov08x40.c
> index ca799bbcfdb7..abbb0b774d43 100644
> --- b/drivers/media/i2c/ov08x40.c
> +++ a/drivers/media/i2c/ov08x40.c
> @@ -2774,7 +2774,6 @@ static int ov08x40_do_get_pad_format(struct ov08x40 *ov08x,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov08x->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13858.c a/drivers/media/i2c/ov13858.c
> index 7816d9787c61..09387e335d80 100644
> --- b/drivers/media/i2c/ov13858.c
> +++ a/drivers/media/i2c/ov13858.c
> @@ -1316,7 +1316,6 @@ static int ov13858_do_get_pad_format(struct ov13858 *ov13858,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13858->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13b10.c a/drivers/media/i2c/ov13b10.c
> index 268cd4b03f9c..c06411d5ee2b 100644
> --- b/drivers/media/i2c/ov13b10.c
> +++ a/drivers/media/i2c/ov13b10.c
> @@ -1001,7 +1001,6 @@ static int ov13b10_do_get_pad_format(struct ov13b10 *ov13b,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13b->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/s5c73m3/s5c73m3-core.c a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> index 47605e36bc60..8f9b5713daf7 100644
> --- b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> +++ a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> @@ -819,7 +819,6 @@ static void s5c73m3_oif_try_format(struct s5c73m3 *state,
> struct v4l2_subdev_format *fmt,
> const struct s5c73m3_frame_size **fs)
> {
> - struct v4l2_subdev *sd = &state->sensor_sd;
> u32 code;
>
> switch (fmt->pad) {
> diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
> index 67da2045f543..03ccfb0e1e11 100644
> --- a/drivers/media/i2c/s5k5baf.c
> +++ b/drivers/media/i2c/s5k5baf.c
> @@ -1472,14 +1472,11 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
>
> if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
> rects = (struct v4l2_rect * []) {
> - &s5k5baf_cis_rect,
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_compose(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_OUT)
> - };
> + &s5k5baf_cis_rect,
> + v4l2_subdev_state_get_crop(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_compose(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_crop(sd_state, PAD_OUT)
> + };
> s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
> return 0;
> }
> diff --git b/drivers/media/platform/samsung/s3c-camif/camif-capture.c a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> index 295e083f38e8..be58260ea67e 100644
> --- b/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> +++ a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> @@ -1216,7 +1216,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
> struct v4l2_mbus_framefmt *mf = &fmt->format;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> fmt->format = *mf;
> return 0;
> }
> @@ -1305,7 +1305,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
> __camif_subdev_try_format(camif, mf, fmt->pad);
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> *mf = fmt->format;
> mutex_unlock(&camif->lock);
> return 0;
> diff --git b/drivers/media/platform/ti/cal/cal-camerarx.c a/drivers/media/platform/ti/cal/cal-camerarx.c
> index cea454ed9c20..61433744c6c4 100644
> --- b/drivers/media/platform/ti/cal/cal-camerarx.c
> +++ a/drivers/media/platform/ti/cal/cal-camerarx.c
> @@ -621,8 +621,6 @@ static int cal_camerarx_sd_enum_mbus_code(struct v4l2_subdev *sd,
> struct v4l2_subdev_state *state,
> struct v4l2_subdev_mbus_code_enum *code)
> {
> - struct cal_camerarx *phy = to_cal_camerarx(sd);
> -
> /* No transcoding, source and sink codes must match. */
> if (cal_rx_pad_is_source(code->pad)) {
> struct v4l2_mbus_framefmt *fmt;
> diff --git b/drivers/staging/media/imx/imx-ic-prp.c a/drivers/staging/media/imx/imx-ic-prp.c
> index dd558fac6477..61d69f19657e 100644
> --- b/drivers/staging/media/imx/imx-ic-prp.c
> +++ a/drivers/staging/media/imx/imx-ic-prp.c
> @@ -82,8 +82,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git b/drivers/staging/media/imx/imx-ic-prpencvf.c a/drivers/staging/media/imx/imx-ic-prpencvf.c
> index 02db7dbb884b..ec73c901079e 100644
> --- b/drivers/staging/media/imx/imx-ic-prpencvf.c
> +++ a/drivers/staging/media/imx/imx-ic-prpencvf.c
> @@ -790,8 +790,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git a/drivers/media/i2c/st-mipid02.c b/drivers/media/i2c/st-mipid02.c
> index 9c9361354c00..b08a249b5fdd 100644
> --- a/drivers/media/i2c/st-mipid02.c
> +++ b/drivers/media/i2c/st-mipid02.c
> @@ -751,7 +751,7 @@ static void mipid02_set_fmt_source(struct v4l2_subdev *sd,
> format->format = bridge->fmt;
> else
> format->format = *v4l2_subdev_state_get_format(sd_state,
> - MIPID02_SINK_0);
> + MIPID02_SINK_0);
>
> /* but code may need to be converted */
> format->format.code = serial_to_parallel_code(format->format.code);
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> index 117912d3bfbd..96353648c032 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> @@ -319,7 +319,7 @@ static void rkisp1_isp_start(struct rkisp1_isp *isp,
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
>
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_info = rkisp1_mbus_info_get_by_code(src_fmt->code);
>
> if (src_info->pixel_enc != V4L2_PIXEL_ENC_BAYER)
> @@ -475,9 +475,9 @@ static void rkisp1_isp_set_src_fmt(struct rkisp1_isp *isp,
> sink_fmt = v4l2_subdev_state_get_format(sd_state,
> RKISP1_ISP_PAD_SINK_VIDEO);
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_crop = v4l2_subdev_state_get_crop(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
>
> /*
> * Media bus code. The ISP can operate in pass-through mode (Bayer in,
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
2023-10-13 09:37:10 +02:00
|
|
|
*v4l2_subdev_state_get_format(sd_state, fmt->pad) :
|
2022-06-16 11:07:45 +01:00
|
|
|
vsensor->mbus_format;
|
2017-04-07 14:55:19 -03:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
static void vimc_sensor_tpg_s_format(struct vimc_sensor_device *vsensor)
|
2017-06-19 14:00:10 -03:00
|
|
|
{
|
2019-08-08 21:27:41 -03:00
|
|
|
const struct vimc_pix_map *vpix =
|
2022-06-16 11:07:45 +01:00
|
|
|
vimc_pix_map_by_code(vsensor->mbus_format.code);
|
2017-06-19 14:00:10 -03:00
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
tpg_reset_source(&vsensor->tpg, vsensor->mbus_format.width,
|
|
|
|
vsensor->mbus_format.height, vsensor->mbus_format.field);
|
|
|
|
tpg_s_bytesperline(&vsensor->tpg, 0, vsensor->mbus_format.width * vpix->bpp);
|
|
|
|
tpg_s_buf_height(&vsensor->tpg, vsensor->mbus_format.height);
|
|
|
|
tpg_s_fourcc(&vsensor->tpg, vpix->pixelformat);
|
2017-06-19 14:00:10 -03:00
|
|
|
/* TODO: add support for V4L2_FIELD_ALTERNATE */
|
2022-06-16 11:07:45 +01:00
|
|
|
tpg_s_field(&vsensor->tpg, vsensor->mbus_format.field, false);
|
|
|
|
tpg_s_colorspace(&vsensor->tpg, vsensor->mbus_format.colorspace);
|
|
|
|
tpg_s_ycbcr_enc(&vsensor->tpg, vsensor->mbus_format.ycbcr_enc);
|
|
|
|
tpg_s_quantization(&vsensor->tpg, vsensor->mbus_format.quantization);
|
|
|
|
tpg_s_xfer_func(&vsensor->tpg, vsensor->mbus_format.xfer_func);
|
2017-06-19 14:00:10 -03:00
|
|
|
}
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
static void vimc_sensor_adjust_fmt(struct v4l2_mbus_framefmt *fmt)
|
2017-06-19 14:00:16 -03:00
|
|
|
{
|
2019-08-08 21:27:41 -03:00
|
|
|
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;
|
|
|
|
|
2017-06-19 14:00:16 -03:00
|
|
|
fmt->width = clamp_t(u32, fmt->width, VIMC_FRAME_MIN_WIDTH,
|
|
|
|
VIMC_FRAME_MAX_WIDTH) & ~1;
|
|
|
|
fmt->height = clamp_t(u32, fmt->height, VIMC_FRAME_MIN_HEIGHT,
|
|
|
|
VIMC_FRAME_MAX_HEIGHT) & ~1;
|
|
|
|
|
|
|
|
/* TODO: add support for V4L2_FIELD_ALTERNATE */
|
|
|
|
if (fmt->field == V4L2_FIELD_ANY || fmt->field == V4L2_FIELD_ALTERNATE)
|
|
|
|
fmt->field = fmt_default.field;
|
|
|
|
|
|
|
|
vimc_colorimetry_clamp(fmt);
|
|
|
|
}
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
static int vimc_sensor_set_fmt(struct v4l2_subdev *sd,
|
|
|
|
struct v4l2_subdev_state *sd_state,
|
|
|
|
struct v4l2_subdev_format *fmt)
|
2017-06-19 14:00:16 -03:00
|
|
|
{
|
2022-06-16 11:07:45 +01:00
|
|
|
struct vimc_sensor_device *vsensor = v4l2_get_subdevdata(sd);
|
2017-06-19 14:00:16 -03:00
|
|
|
struct v4l2_mbus_framefmt *mf;
|
|
|
|
|
|
|
|
if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
|
|
|
|
/* Do not change the format while stream is on */
|
2022-06-16 11:07:45 +01:00
|
|
|
if (vsensor->frame)
|
2017-06-19 14:00:16 -03:00
|
|
|
return -EBUSY;
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
mf = &vsensor->mbus_format;
|
2017-06-19 14:00:16 -03:00
|
|
|
} else {
|
media: v4l: subdev: Switch to stream-aware state functions
Switch all drivers accessing sub-device state to use the stream-aware
functions. We will soon remove the old ones.
This patch has been generated using the following Coccinelle script:
---------8<------------
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_pad_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_format(E1, E2, E3)
+ v4l2_subdev_state_get_format(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_crop(E1, E2, E3)
+ v4l2_subdev_state_get_crop(E2, E3)
@@
expression E1, E2, E3;
@@
- v4l2_subdev_get_try_compose(E1, E2, E3)
+ v4l2_subdev_state_get_compose(E2, E3)
---------8<------------
Additionally drivers/media/i2c/s5k5baf.c and
drivers/media/platform/samsung/s3c-camif/camif-capture.c have been
manually changed as Coccinelle didn't. Further local variables have been
removed as they became unused as a result of the other changes.
Also Coccinelle introduced indentation by space in files
drivers/media/i2c/st-mipid02.c and
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c. This has been also
corrected.
The diff from Coccinelle-generated changes are:
> diff --git b/drivers/media/i2c/imx319.c a/drivers/media/i2c/imx319.c
> index e549692ff478..420984382173 100644
> --- b/drivers/media/i2c/imx319.c
> +++ a/drivers/media/i2c/imx319.c
> @@ -2001,7 +2001,6 @@ static int imx319_do_get_pad_format(struct imx319 *imx319,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx319->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/imx355.c a/drivers/media/i2c/imx355.c
> index 96bdde685d65..e1b1d2fc79dd 100644
> --- b/drivers/media/i2c/imx355.c
> +++ a/drivers/media/i2c/imx355.c
> @@ -1299,7 +1299,6 @@ static int imx355_do_get_pad_format(struct imx355 *imx355,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &imx355->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov08x40.c a/drivers/media/i2c/ov08x40.c
> index ca799bbcfdb7..abbb0b774d43 100644
> --- b/drivers/media/i2c/ov08x40.c
> +++ a/drivers/media/i2c/ov08x40.c
> @@ -2774,7 +2774,6 @@ static int ov08x40_do_get_pad_format(struct ov08x40 *ov08x,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov08x->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13858.c a/drivers/media/i2c/ov13858.c
> index 7816d9787c61..09387e335d80 100644
> --- b/drivers/media/i2c/ov13858.c
> +++ a/drivers/media/i2c/ov13858.c
> @@ -1316,7 +1316,6 @@ static int ov13858_do_get_pad_format(struct ov13858 *ov13858,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13858->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/ov13b10.c a/drivers/media/i2c/ov13b10.c
> index 268cd4b03f9c..c06411d5ee2b 100644
> --- b/drivers/media/i2c/ov13b10.c
> +++ a/drivers/media/i2c/ov13b10.c
> @@ -1001,7 +1001,6 @@ static int ov13b10_do_get_pad_format(struct ov13b10 *ov13b,
> struct v4l2_subdev_format *fmt)
> {
> struct v4l2_mbus_framefmt *framefmt;
> - struct v4l2_subdev *sd = &ov13b->sd;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> diff --git b/drivers/media/i2c/s5c73m3/s5c73m3-core.c a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> index 47605e36bc60..8f9b5713daf7 100644
> --- b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> +++ a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
> @@ -819,7 +819,6 @@ static void s5c73m3_oif_try_format(struct s5c73m3 *state,
> struct v4l2_subdev_format *fmt,
> const struct s5c73m3_frame_size **fs)
> {
> - struct v4l2_subdev *sd = &state->sensor_sd;
> u32 code;
>
> switch (fmt->pad) {
> diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
> index 67da2045f543..03ccfb0e1e11 100644
> --- a/drivers/media/i2c/s5k5baf.c
> +++ b/drivers/media/i2c/s5k5baf.c
> @@ -1472,14 +1472,11 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
>
> if (sel->which == V4L2_SUBDEV_FORMAT_TRY) {
> rects = (struct v4l2_rect * []) {
> - &s5k5baf_cis_rect,
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_compose(sd, sd_state,
> - PAD_CIS),
> - v4l2_subdev_get_try_crop(sd, sd_state,
> - PAD_OUT)
> - };
> + &s5k5baf_cis_rect,
> + v4l2_subdev_state_get_crop(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_compose(sd_state, PAD_CIS),
> + v4l2_subdev_state_get_crop(sd_state, PAD_OUT)
> + };
> s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
> return 0;
> }
> diff --git b/drivers/media/platform/samsung/s3c-camif/camif-capture.c a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> index 295e083f38e8..be58260ea67e 100644
> --- b/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> +++ a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
> @@ -1216,7 +1216,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
> struct v4l2_mbus_framefmt *mf = &fmt->format;
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> fmt->format = *mf;
> return 0;
> }
> @@ -1305,7 +1305,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
> __camif_subdev_try_format(camif, mf, fmt->pad);
>
> if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
> - mf = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
> + mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
> *mf = fmt->format;
> mutex_unlock(&camif->lock);
> return 0;
> diff --git b/drivers/media/platform/ti/cal/cal-camerarx.c a/drivers/media/platform/ti/cal/cal-camerarx.c
> index cea454ed9c20..61433744c6c4 100644
> --- b/drivers/media/platform/ti/cal/cal-camerarx.c
> +++ a/drivers/media/platform/ti/cal/cal-camerarx.c
> @@ -621,8 +621,6 @@ static int cal_camerarx_sd_enum_mbus_code(struct v4l2_subdev *sd,
> struct v4l2_subdev_state *state,
> struct v4l2_subdev_mbus_code_enum *code)
> {
> - struct cal_camerarx *phy = to_cal_camerarx(sd);
> -
> /* No transcoding, source and sink codes must match. */
> if (cal_rx_pad_is_source(code->pad)) {
> struct v4l2_mbus_framefmt *fmt;
> diff --git b/drivers/staging/media/imx/imx-ic-prp.c a/drivers/staging/media/imx/imx-ic-prp.c
> index dd558fac6477..61d69f19657e 100644
> --- b/drivers/staging/media/imx/imx-ic-prp.c
> +++ a/drivers/staging/media/imx/imx-ic-prp.c
> @@ -82,8 +82,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git b/drivers/staging/media/imx/imx-ic-prpencvf.c a/drivers/staging/media/imx/imx-ic-prpencvf.c
> index 02db7dbb884b..ec73c901079e 100644
> --- b/drivers/staging/media/imx/imx-ic-prpencvf.c
> +++ a/drivers/staging/media/imx/imx-ic-prpencvf.c
> @@ -790,8 +790,6 @@ static struct v4l2_mbus_framefmt *
> __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
> unsigned int pad, enum v4l2_subdev_format_whence which)
> {
> - struct imx_ic_priv *ic_priv = priv->ic_priv;
> -
> if (which == V4L2_SUBDEV_FORMAT_TRY)
> return v4l2_subdev_state_get_format(sd_state, pad);
> else
> diff --git a/drivers/media/i2c/st-mipid02.c b/drivers/media/i2c/st-mipid02.c
> index 9c9361354c00..b08a249b5fdd 100644
> --- a/drivers/media/i2c/st-mipid02.c
> +++ b/drivers/media/i2c/st-mipid02.c
> @@ -751,7 +751,7 @@ static void mipid02_set_fmt_source(struct v4l2_subdev *sd,
> format->format = bridge->fmt;
> else
> format->format = *v4l2_subdev_state_get_format(sd_state,
> - MIPID02_SINK_0);
> + MIPID02_SINK_0);
>
> /* but code may need to be converted */
> format->format.code = serial_to_parallel_code(format->format.code);
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> index 117912d3bfbd..96353648c032 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
> @@ -319,7 +319,7 @@ static void rkisp1_isp_start(struct rkisp1_isp *isp,
> rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
>
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_info = rkisp1_mbus_info_get_by_code(src_fmt->code);
>
> if (src_info->pixel_enc != V4L2_PIXEL_ENC_BAYER)
> @@ -475,9 +475,9 @@ static void rkisp1_isp_set_src_fmt(struct rkisp1_isp *isp,
> sink_fmt = v4l2_subdev_state_get_format(sd_state,
> RKISP1_ISP_PAD_SINK_VIDEO);
> src_fmt = v4l2_subdev_state_get_format(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
> src_crop = v4l2_subdev_state_get_crop(sd_state,
> - RKISP1_ISP_PAD_SOURCE_VIDEO);
> + RKISP1_ISP_PAD_SOURCE_VIDEO);
>
> /*
> * Media bus code. The ISP can operate in pass-through mode (Bayer in,
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
2023-10-13 09:37:10 +02:00
|
|
|
mf = v4l2_subdev_state_get_format(sd_state, fmt->pad);
|
2017-06-19 14:00:16 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Set the new format */
|
2022-06-16 11:07:45 +01:00
|
|
|
vimc_sensor_adjust_fmt(&fmt->format);
|
2017-06-19 14:00:16 -03:00
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
dev_dbg(vsensor->ved.dev, "%s: format update: "
|
2017-06-19 14:00:16 -03:00
|
|
|
"old:%dx%d (0x%x, %d, %d, %d, %d) "
|
2022-06-16 11:07:45 +01:00
|
|
|
"new:%dx%d (0x%x, %d, %d, %d, %d)\n", vsensor->sd.name,
|
2017-06-19 14:00:16 -03:00
|
|
|
/* old */
|
|
|
|
mf->width, mf->height, mf->code,
|
|
|
|
mf->colorspace, mf->quantization,
|
|
|
|
mf->xfer_func, mf->ycbcr_enc,
|
|
|
|
/* new */
|
|
|
|
fmt->format.width, fmt->format.height, fmt->format.code,
|
|
|
|
fmt->format.colorspace, fmt->format.quantization,
|
|
|
|
fmt->format.xfer_func, fmt->format.ycbcr_enc);
|
|
|
|
|
|
|
|
*mf = fmt->format;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
static const struct v4l2_subdev_pad_ops vimc_sensor_pad_ops = {
|
|
|
|
.enum_mbus_code = vimc_sensor_enum_mbus_code,
|
|
|
|
.enum_frame_size = vimc_sensor_enum_frame_size,
|
|
|
|
.get_fmt = vimc_sensor_get_fmt,
|
|
|
|
.set_fmt = vimc_sensor_set_fmt,
|
2017-04-07 14:55:19 -03:00
|
|
|
};
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
static void *vimc_sensor_process_frame(struct vimc_ent_device *ved,
|
|
|
|
const void *sink_frame)
|
2017-04-07 14:55:19 -03:00
|
|
|
{
|
2022-06-16 11:07:45 +01:00
|
|
|
struct vimc_sensor_device *vsensor =
|
|
|
|
container_of(ved, struct vimc_sensor_device, ved);
|
|
|
|
|
2020-07-05 15:53:06 +02:00
|
|
|
const unsigned int line_height = 16;
|
|
|
|
u8 *basep[TPG_MAX_PLANES][2];
|
|
|
|
unsigned int line = 1;
|
|
|
|
char str[100];
|
2017-04-07 14:55:19 -03:00
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
tpg_fill_plane_buffer(&vsensor->tpg, 0, 0, vsensor->frame);
|
|
|
|
tpg_calc_text_basep(&vsensor->tpg, basep, 0, vsensor->frame);
|
|
|
|
switch (vsensor->osd_value) {
|
|
|
|
case VIMC_SENSOR_OSD_SHOW_ALL: {
|
|
|
|
const char *order = tpg_g_color_order(&vsensor->tpg);
|
2020-07-05 15:53:06 +02:00
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
tpg_gen_text(&vsensor->tpg, basep, line++ * line_height,
|
2020-07-05 15:53:06 +02:00
|
|
|
16, order);
|
|
|
|
snprintf(str, sizeof(str),
|
|
|
|
"brightness %3d, contrast %3d, saturation %3d, hue %d ",
|
2022-06-16 11:07:45 +01:00
|
|
|
vsensor->tpg.brightness,
|
|
|
|
vsensor->tpg.contrast,
|
|
|
|
vsensor->tpg.saturation,
|
|
|
|
vsensor->tpg.hue);
|
|
|
|
tpg_gen_text(&vsensor->tpg, basep, line++ * line_height, 16, str);
|
2020-07-05 15:53:06 +02:00
|
|
|
snprintf(str, sizeof(str), "sensor size: %dx%d",
|
2022-06-16 11:07:45 +01:00
|
|
|
vsensor->mbus_format.width,
|
|
|
|
vsensor->mbus_format.height);
|
|
|
|
tpg_gen_text(&vsensor->tpg, basep, line++ * line_height, 16, str);
|
2020-07-05 15:53:06 +02:00
|
|
|
fallthrough;
|
|
|
|
}
|
2022-06-16 11:07:45 +01:00
|
|
|
case VIMC_SENSOR_OSD_SHOW_COUNTERS: {
|
2020-07-05 15:53:06 +02:00
|
|
|
unsigned int ms;
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
ms = div_u64(ktime_get_ns() - vsensor->start_stream_ts, 1000000);
|
2020-07-05 15:53:06 +02:00
|
|
|
snprintf(str, sizeof(str), "%02d:%02d:%02d:%03d",
|
|
|
|
(ms / (60 * 60 * 1000)) % 24,
|
|
|
|
(ms / (60 * 1000)) % 60,
|
|
|
|
(ms / 1000) % 60,
|
|
|
|
ms % 1000);
|
2022-06-16 11:07:45 +01:00
|
|
|
tpg_gen_text(&vsensor->tpg, basep, line++ * line_height, 16, str);
|
2020-07-05 15:53:06 +02:00
|
|
|
break;
|
|
|
|
}
|
2022-06-16 11:07:45 +01:00
|
|
|
case VIMC_SENSOR_OSD_SHOW_NONE:
|
2020-07-05 15:53:06 +02:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
return vsensor->frame;
|
2017-04-07 14:55:19 -03:00
|
|
|
}
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
static int vimc_sensor_s_stream(struct v4l2_subdev *sd, int enable)
|
2017-04-07 14:55:19 -03:00
|
|
|
{
|
2022-06-16 11:07:45 +01:00
|
|
|
struct vimc_sensor_device *vsensor =
|
|
|
|
container_of(sd, struct vimc_sensor_device, sd);
|
2017-04-07 14:55:19 -03:00
|
|
|
|
|
|
|
if (enable) {
|
2019-08-08 21:27:41 -03:00
|
|
|
const struct vimc_pix_map *vpix;
|
2017-06-19 14:00:10 -03:00
|
|
|
unsigned int frame_size;
|
2017-04-07 14:55:19 -03:00
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
vsensor->start_stream_ts = ktime_get_ns();
|
2020-07-05 15:53:06 +02:00
|
|
|
|
2017-04-07 14:55:19 -03:00
|
|
|
/* Calculate the frame size */
|
2022-06-16 11:07:45 +01:00
|
|
|
vpix = vimc_pix_map_by_code(vsensor->mbus_format.code);
|
|
|
|
frame_size = vsensor->mbus_format.width * vpix->bpp *
|
|
|
|
vsensor->mbus_format.height;
|
2017-04-07 14:55:19 -03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Allocate the frame buffer. Use vmalloc to be able to
|
|
|
|
* allocate a large amount of memory
|
|
|
|
*/
|
2022-06-16 11:07:45 +01:00
|
|
|
vsensor->frame = vmalloc(frame_size);
|
|
|
|
if (!vsensor->frame)
|
2017-04-07 14:55:19 -03:00
|
|
|
return -ENOMEM;
|
|
|
|
|
2017-06-19 14:00:10 -03:00
|
|
|
/* configure the test pattern generator */
|
2022-06-16 11:07:45 +01:00
|
|
|
vimc_sensor_tpg_s_format(vsensor);
|
2017-06-19 14:00:10 -03:00
|
|
|
|
2017-04-07 14:55:19 -03:00
|
|
|
} else {
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
vfree(vsensor->frame);
|
|
|
|
vsensor->frame = NULL;
|
2017-04-07 14:55:19 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
static const struct v4l2_subdev_core_ops vimc_sensor_core_ops = {
|
2018-02-02 08:00:32 -05:00
|
|
|
.log_status = v4l2_ctrl_subdev_log_status,
|
|
|
|
.subscribe_event = v4l2_ctrl_subdev_subscribe_event,
|
|
|
|
.unsubscribe_event = v4l2_event_subdev_unsubscribe,
|
|
|
|
};
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
static const struct v4l2_subdev_video_ops vimc_sensor_video_ops = {
|
|
|
|
.s_stream = vimc_sensor_s_stream,
|
2017-04-07 14:55:19 -03:00
|
|
|
};
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
static const struct v4l2_subdev_ops vimc_sensor_ops = {
|
|
|
|
.core = &vimc_sensor_core_ops,
|
|
|
|
.pad = &vimc_sensor_pad_ops,
|
|
|
|
.video = &vimc_sensor_video_ops,
|
2017-04-07 14:55:19 -03:00
|
|
|
};
|
|
|
|
|
2023-11-27 11:07:44 +02:00
|
|
|
static const struct v4l2_subdev_internal_ops vimc_sensor_internal_ops = {
|
|
|
|
.init_state = vimc_sensor_init_state,
|
|
|
|
};
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
static int vimc_sensor_s_ctrl(struct v4l2_ctrl *ctrl)
|
2017-11-06 05:20:01 -05:00
|
|
|
{
|
2022-06-16 11:07:45 +01:00
|
|
|
struct vimc_sensor_device *vsensor =
|
|
|
|
container_of(ctrl->handler, struct vimc_sensor_device, hdl);
|
2017-11-06 05:20:01 -05:00
|
|
|
|
|
|
|
switch (ctrl->id) {
|
|
|
|
case VIMC_CID_TEST_PATTERN:
|
2022-06-16 11:07:45 +01:00
|
|
|
tpg_s_pattern(&vsensor->tpg, ctrl->val);
|
2017-11-06 05:20:01 -05:00
|
|
|
break;
|
|
|
|
case V4L2_CID_HFLIP:
|
2022-06-16 11:07:45 +01:00
|
|
|
tpg_s_hflip(&vsensor->tpg, ctrl->val);
|
2017-11-06 05:20:01 -05:00
|
|
|
break;
|
|
|
|
case V4L2_CID_VFLIP:
|
2022-06-16 11:07:45 +01:00
|
|
|
tpg_s_vflip(&vsensor->tpg, ctrl->val);
|
2017-11-06 05:20:01 -05:00
|
|
|
break;
|
2018-09-03 21:45:59 -04:00
|
|
|
case V4L2_CID_BRIGHTNESS:
|
2022-06-16 11:07:45 +01:00
|
|
|
tpg_s_brightness(&vsensor->tpg, ctrl->val);
|
2018-09-03 21:45:59 -04:00
|
|
|
break;
|
|
|
|
case V4L2_CID_CONTRAST:
|
2022-06-16 11:07:45 +01:00
|
|
|
tpg_s_contrast(&vsensor->tpg, ctrl->val);
|
2018-09-03 21:45:59 -04:00
|
|
|
break;
|
|
|
|
case V4L2_CID_HUE:
|
2022-06-16 11:07:45 +01:00
|
|
|
tpg_s_hue(&vsensor->tpg, ctrl->val);
|
2018-09-03 21:45:59 -04:00
|
|
|
break;
|
|
|
|
case V4L2_CID_SATURATION:
|
2022-06-16 11:07:45 +01:00
|
|
|
tpg_s_saturation(&vsensor->tpg, ctrl->val);
|
2018-09-03 21:45:59 -04:00
|
|
|
break;
|
2020-07-05 15:53:06 +02:00
|
|
|
case VIMC_CID_OSD_TEXT_MODE:
|
2022-06-16 11:07:45 +01:00
|
|
|
vsensor->osd_value = ctrl->val;
|
2020-07-05 15:53:06 +02:00
|
|
|
break;
|
2017-11-06 05:20:01 -05:00
|
|
|
default:
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
static const struct v4l2_ctrl_ops vimc_sensor_ctrl_ops = {
|
|
|
|
.s_ctrl = vimc_sensor_s_ctrl,
|
2017-11-06 05:20:01 -05:00
|
|
|
};
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
static void vimc_sensor_release(struct vimc_ent_device *ved)
|
2019-03-05 03:36:20 -05:00
|
|
|
{
|
2022-06-16 11:07:45 +01:00
|
|
|
struct vimc_sensor_device *vsensor =
|
|
|
|
container_of(ved, struct vimc_sensor_device, ved);
|
2019-03-05 03:36:20 -05:00
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
v4l2_ctrl_handler_free(&vsensor->hdl);
|
|
|
|
tpg_free(&vsensor->tpg);
|
|
|
|
media_entity_cleanup(vsensor->ved.ent);
|
|
|
|
kfree(vsensor);
|
2019-03-05 03:36:20 -05:00
|
|
|
}
|
|
|
|
|
2017-11-06 05:20:01 -05:00
|
|
|
/* Image Processing Controls */
|
2022-06-16 11:07:45 +01:00
|
|
|
static const struct v4l2_ctrl_config vimc_sensor_ctrl_class = {
|
2017-11-06 05:20:01 -05:00
|
|
|
.flags = V4L2_CTRL_FLAG_READ_ONLY | V4L2_CTRL_FLAG_WRITE_ONLY,
|
|
|
|
.id = VIMC_CID_VIMC_CLASS,
|
|
|
|
.name = "VIMC Controls",
|
|
|
|
.type = V4L2_CTRL_TYPE_CTRL_CLASS,
|
|
|
|
};
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
static const struct v4l2_ctrl_config vimc_sensor_ctrl_test_pattern = {
|
|
|
|
.ops = &vimc_sensor_ctrl_ops,
|
2017-11-06 05:20:01 -05:00
|
|
|
.id = VIMC_CID_TEST_PATTERN,
|
|
|
|
.name = "Test Pattern",
|
|
|
|
.type = V4L2_CTRL_TYPE_MENU,
|
|
|
|
.max = TPG_PAT_NOISE,
|
|
|
|
.qmenu = tpg_pattern_strings,
|
|
|
|
};
|
|
|
|
|
2020-07-05 15:53:06 +02:00
|
|
|
static const char * const vimc_ctrl_osd_mode_strings[] = {
|
|
|
|
"All",
|
|
|
|
"Counters Only",
|
|
|
|
"None",
|
|
|
|
NULL,
|
|
|
|
};
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
static const struct v4l2_ctrl_config vimc_sensor_ctrl_osd_mode = {
|
|
|
|
.ops = &vimc_sensor_ctrl_ops,
|
2020-07-05 15:53:06 +02:00
|
|
|
.id = VIMC_CID_OSD_TEXT_MODE,
|
|
|
|
.name = "Show Information",
|
|
|
|
.type = V4L2_CTRL_TYPE_MENU,
|
|
|
|
.max = ARRAY_SIZE(vimc_ctrl_osd_mode_strings) - 2,
|
|
|
|
.qmenu = vimc_ctrl_osd_mode_strings,
|
|
|
|
};
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
static struct vimc_ent_device *vimc_sensor_add(struct vimc_device *vimc,
|
|
|
|
const char *vcfg_name)
|
2017-04-07 14:55:19 -03:00
|
|
|
{
|
2019-09-17 13:35:08 -03:00
|
|
|
struct v4l2_device *v4l2_dev = &vimc->v4l2_dev;
|
2022-06-16 11:07:45 +01:00
|
|
|
struct vimc_sensor_device *vsensor;
|
2017-04-07 14:55:19 -03:00
|
|
|
int ret;
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
/* Allocate the vsensor struct */
|
|
|
|
vsensor = kzalloc(sizeof(*vsensor), GFP_KERNEL);
|
|
|
|
if (!vsensor)
|
2020-03-28 08:52:52 +01:00
|
|
|
return ERR_PTR(-ENOMEM);
|
2017-04-07 14:55:19 -03:00
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
v4l2_ctrl_handler_init(&vsensor->hdl, 4);
|
2017-11-06 05:20:01 -05:00
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
v4l2_ctrl_new_custom(&vsensor->hdl, &vimc_sensor_ctrl_class, NULL);
|
|
|
|
v4l2_ctrl_new_custom(&vsensor->hdl, &vimc_sensor_ctrl_test_pattern, NULL);
|
|
|
|
v4l2_ctrl_new_custom(&vsensor->hdl, &vimc_sensor_ctrl_osd_mode, NULL);
|
|
|
|
v4l2_ctrl_new_std(&vsensor->hdl, &vimc_sensor_ctrl_ops,
|
2017-11-06 05:20:01 -05:00
|
|
|
V4L2_CID_VFLIP, 0, 1, 1, 0);
|
2022-06-16 11:07:45 +01:00
|
|
|
v4l2_ctrl_new_std(&vsensor->hdl, &vimc_sensor_ctrl_ops,
|
2017-11-06 05:20:01 -05:00
|
|
|
V4L2_CID_HFLIP, 0, 1, 1, 0);
|
2022-06-16 11:07:45 +01:00
|
|
|
v4l2_ctrl_new_std(&vsensor->hdl, &vimc_sensor_ctrl_ops,
|
2018-09-03 21:45:59 -04:00
|
|
|
V4L2_CID_BRIGHTNESS, 0, 255, 1, 128);
|
2022-06-16 11:07:45 +01:00
|
|
|
v4l2_ctrl_new_std(&vsensor->hdl, &vimc_sensor_ctrl_ops,
|
2018-09-03 21:45:59 -04:00
|
|
|
V4L2_CID_CONTRAST, 0, 255, 1, 128);
|
2022-06-16 11:07:45 +01:00
|
|
|
v4l2_ctrl_new_std(&vsensor->hdl, &vimc_sensor_ctrl_ops,
|
2018-09-03 21:45:59 -04:00
|
|
|
V4L2_CID_HUE, -128, 127, 1, 0);
|
2022-06-16 11:07:45 +01:00
|
|
|
v4l2_ctrl_new_std(&vsensor->hdl, &vimc_sensor_ctrl_ops,
|
2018-09-03 21:45:59 -04:00
|
|
|
V4L2_CID_SATURATION, 0, 255, 1, 128);
|
2022-06-16 11:07:45 +01:00
|
|
|
vsensor->sd.ctrl_handler = &vsensor->hdl;
|
|
|
|
if (vsensor->hdl.error) {
|
|
|
|
ret = vsensor->hdl.error;
|
|
|
|
goto err_free_vsensor;
|
2017-11-06 05:20:01 -05:00
|
|
|
}
|
|
|
|
|
2019-10-07 10:50:01 -03:00
|
|
|
/* Initialize the test pattern generator */
|
2022-06-16 11:07:45 +01:00
|
|
|
tpg_init(&vsensor->tpg, vsensor->mbus_format.width,
|
|
|
|
vsensor->mbus_format.height);
|
|
|
|
ret = tpg_alloc(&vsensor->tpg, VIMC_FRAME_MAX_WIDTH);
|
2019-10-07 10:50:01 -03:00
|
|
|
if (ret)
|
|
|
|
goto err_free_hdl;
|
|
|
|
|
2017-06-19 14:00:12 -03:00
|
|
|
/* Initialize ved and sd */
|
2022-06-16 11:07:45 +01:00
|
|
|
vsensor->pad.flags = MEDIA_PAD_FL_SOURCE;
|
|
|
|
ret = vimc_ent_sd_register(&vsensor->ved, &vsensor->sd, v4l2_dev,
|
2019-09-17 13:35:08 -03:00
|
|
|
vcfg_name,
|
2022-06-16 11:07:45 +01:00
|
|
|
MEDIA_ENT_F_CAM_SENSOR, 1, &vsensor->pad,
|
|
|
|
&vimc_sensor_ops);
|
2017-04-07 14:55:19 -03:00
|
|
|
if (ret)
|
2019-10-07 10:50:01 -03:00
|
|
|
goto err_free_tpg;
|
2017-04-07 14:55:19 -03:00
|
|
|
|
2023-11-27 11:07:44 +02:00
|
|
|
vsensor->sd.internal_ops = &vimc_sensor_internal_ops;
|
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
vsensor->ved.process_frame = vimc_sensor_process_frame;
|
|
|
|
vsensor->ved.dev = vimc->mdev.dev;
|
2017-06-19 14:00:18 -03:00
|
|
|
|
2017-06-19 14:00:16 -03:00
|
|
|
/* Initialize the frame format */
|
2022-06-16 11:07:45 +01:00
|
|
|
vsensor->mbus_format = fmt_default;
|
2017-04-07 14:55:19 -03:00
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
return &vsensor->ved;
|
2017-04-07 14:55:19 -03:00
|
|
|
|
2019-10-07 10:50:01 -03:00
|
|
|
err_free_tpg:
|
2022-06-16 11:07:45 +01:00
|
|
|
tpg_free(&vsensor->tpg);
|
2017-11-06 05:20:01 -05:00
|
|
|
err_free_hdl:
|
2022-06-16 11:07:45 +01:00
|
|
|
v4l2_ctrl_handler_free(&vsensor->hdl);
|
|
|
|
err_free_vsensor:
|
|
|
|
kfree(vsensor);
|
2017-04-07 14:55:19 -03:00
|
|
|
|
2020-03-28 08:52:52 +01:00
|
|
|
return ERR_PTR(ret);
|
2017-04-07 14:55:19 -03:00
|
|
|
}
|
2020-03-31 20:45:15 +02:00
|
|
|
|
2022-06-16 11:07:45 +01:00
|
|
|
struct vimc_ent_type vimc_sensor_type = {
|
|
|
|
.add = vimc_sensor_add,
|
|
|
|
.release = vimc_sensor_release
|
2020-03-31 20:45:15 +02:00
|
|
|
};
|