2018-04-22 17:33:20 -04:00
|
|
|
// SPDX-License-Identifier: GPL-2.0+
|
2013-07-10 12:03:30 -03:00
|
|
|
/*
|
|
|
|
* vsp1_sru.c -- R-Car VSP1 Super Resolution Unit
|
|
|
|
*
|
|
|
|
* Copyright (C) 2013 Renesas Corporation
|
|
|
|
*
|
|
|
|
* Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/device.h>
|
|
|
|
#include <linux/gfp.h>
|
|
|
|
|
|
|
|
#include <media/v4l2-subdev.h>
|
|
|
|
|
|
|
|
#include "vsp1.h"
|
2015-11-22 20:29:25 -02:00
|
|
|
#include "vsp1_dl.h"
|
2025-04-30 02:29:00 +03:00
|
|
|
#include "vsp1_entity.h"
|
2017-08-04 12:32:44 -04:00
|
|
|
#include "vsp1_pipe.h"
|
2013-07-10 12:03:30 -03:00
|
|
|
#include "vsp1_sru.h"
|
|
|
|
|
|
|
|
#define SRU_MIN_SIZE 4U
|
|
|
|
#define SRU_MAX_SIZE 8190U
|
|
|
|
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
|
|
* Device Access
|
|
|
|
*/
|
|
|
|
|
2018-05-18 16:42:02 -04:00
|
|
|
static inline void vsp1_sru_write(struct vsp1_sru *sru,
|
|
|
|
struct vsp1_dl_body *dlb, u32 reg, u32 data)
|
2013-07-10 12:03:30 -03:00
|
|
|
{
|
2018-05-18 16:42:02 -04:00
|
|
|
vsp1_dl_body_write(dlb, reg, data);
|
2013-07-10 12:03:30 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
|
|
* Controls
|
|
|
|
*/
|
|
|
|
|
2016-06-16 19:33:43 -03:00
|
|
|
#define V4L2_CID_VSP1_SRU_INTENSITY (V4L2_CID_USER_BASE | 0x1001)
|
2013-07-10 12:03:30 -03:00
|
|
|
|
|
|
|
struct vsp1_sru_param {
|
|
|
|
u32 ctrl0;
|
|
|
|
u32 ctrl2;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define VI6_SRU_CTRL0_PARAMS(p0, p1) \
|
|
|
|
(((p0) << VI6_SRU_CTRL0_PARAM0_SHIFT) | \
|
|
|
|
((p1) << VI6_SRU_CTRL0_PARAM1_SHIFT))
|
|
|
|
|
|
|
|
#define VI6_SRU_CTRL2_PARAMS(p6, p7, p8) \
|
|
|
|
(((p6) << VI6_SRU_CTRL2_PARAM6_SHIFT) | \
|
|
|
|
((p7) << VI6_SRU_CTRL2_PARAM7_SHIFT) | \
|
|
|
|
((p8) << VI6_SRU_CTRL2_PARAM8_SHIFT))
|
|
|
|
|
|
|
|
static const struct vsp1_sru_param vsp1_sru_params[] = {
|
|
|
|
{
|
|
|
|
.ctrl0 = VI6_SRU_CTRL0_PARAMS(256, 4) | VI6_SRU_CTRL0_EN,
|
|
|
|
.ctrl2 = VI6_SRU_CTRL2_PARAMS(24, 40, 255),
|
|
|
|
}, {
|
|
|
|
.ctrl0 = VI6_SRU_CTRL0_PARAMS(256, 4) | VI6_SRU_CTRL0_EN,
|
|
|
|
.ctrl2 = VI6_SRU_CTRL2_PARAMS(8, 16, 255),
|
|
|
|
}, {
|
|
|
|
.ctrl0 = VI6_SRU_CTRL0_PARAMS(384, 5) | VI6_SRU_CTRL0_EN,
|
|
|
|
.ctrl2 = VI6_SRU_CTRL2_PARAMS(36, 60, 255),
|
|
|
|
}, {
|
|
|
|
.ctrl0 = VI6_SRU_CTRL0_PARAMS(384, 5) | VI6_SRU_CTRL0_EN,
|
|
|
|
.ctrl2 = VI6_SRU_CTRL2_PARAMS(12, 27, 255),
|
|
|
|
}, {
|
|
|
|
.ctrl0 = VI6_SRU_CTRL0_PARAMS(511, 6) | VI6_SRU_CTRL0_EN,
|
|
|
|
.ctrl2 = VI6_SRU_CTRL2_PARAMS(48, 80, 255),
|
|
|
|
}, {
|
|
|
|
.ctrl0 = VI6_SRU_CTRL0_PARAMS(511, 6) | VI6_SRU_CTRL0_EN,
|
|
|
|
.ctrl2 = VI6_SRU_CTRL2_PARAMS(16, 36, 255),
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2014-05-31 20:30:11 -03:00
|
|
|
static int sru_s_ctrl(struct v4l2_ctrl *ctrl)
|
|
|
|
{
|
|
|
|
struct vsp1_sru *sru =
|
|
|
|
container_of(ctrl->handler, struct vsp1_sru, ctrls);
|
|
|
|
|
|
|
|
switch (ctrl->id) {
|
|
|
|
case V4L2_CID_VSP1_SRU_INTENSITY:
|
2015-11-01 12:19:42 -02:00
|
|
|
sru->intensity = ctrl->val;
|
2014-05-31 20:30:11 -03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct v4l2_ctrl_ops sru_ctrl_ops = {
|
|
|
|
.s_ctrl = sru_s_ctrl,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct v4l2_ctrl_config sru_intensity_control = {
|
|
|
|
.ops = &sru_ctrl_ops,
|
|
|
|
.id = V4L2_CID_VSP1_SRU_INTENSITY,
|
|
|
|
.name = "Intensity",
|
|
|
|
.type = V4L2_CTRL_TYPE_INTEGER,
|
|
|
|
.min = 1,
|
|
|
|
.max = 6,
|
|
|
|
.def = 1,
|
|
|
|
.step = 1,
|
|
|
|
};
|
|
|
|
|
|
|
|
/* -----------------------------------------------------------------------------
|
2015-11-17 13:10:26 -02:00
|
|
|
* V4L2 Subdevice Operations
|
2013-07-10 12:03:30 -03:00
|
|
|
*/
|
|
|
|
|
|
|
|
static int sru_enum_mbus_code(struct v4l2_subdev *subdev,
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 17:55:58 +03:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2013-07-10 12:03:30 -03:00
|
|
|
struct v4l2_subdev_mbus_code_enum *code)
|
|
|
|
{
|
|
|
|
static const unsigned int codes[] = {
|
2014-11-10 14:28:31 -03:00
|
|
|
MEDIA_BUS_FMT_ARGB8888_1X32,
|
|
|
|
MEDIA_BUS_FMT_AYUV8_1X32,
|
2013-07-10 12:03:30 -03:00
|
|
|
};
|
|
|
|
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 17:55:58 +03:00
|
|
|
return vsp1_subdev_enum_mbus_code(subdev, sd_state, code, codes,
|
2016-02-24 20:25:42 -03:00
|
|
|
ARRAY_SIZE(codes));
|
2013-07-10 12:03:30 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static int sru_enum_frame_size(struct v4l2_subdev *subdev,
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 17:55:58 +03:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2013-07-10 12:03:30 -03:00
|
|
|
struct v4l2_subdev_frame_size_enum *fse)
|
|
|
|
{
|
2015-03-04 01:47:58 -08:00
|
|
|
struct vsp1_sru *sru = to_sru(subdev);
|
2023-11-26 03:37:15 +02:00
|
|
|
struct v4l2_subdev_state *state;
|
2013-07-10 12:03:30 -03:00
|
|
|
struct v4l2_mbus_framefmt *format;
|
2016-06-26 08:09:31 -03:00
|
|
|
int ret = 0;
|
2013-07-10 12:03:30 -03:00
|
|
|
|
2023-11-26 03:37:15 +02:00
|
|
|
state = vsp1_entity_get_state(&sru->entity, sd_state, fse->which);
|
|
|
|
if (!state)
|
2015-11-15 19:14:22 -02:00
|
|
|
return -EINVAL;
|
|
|
|
|
2023-11-12 04:14:05 +02:00
|
|
|
format = v4l2_subdev_state_get_format(state, SRU_PAD_SINK);
|
2013-07-10 12:03:30 -03:00
|
|
|
|
2016-06-26 08:09:31 -03:00
|
|
|
mutex_lock(&sru->entity.lock);
|
|
|
|
|
|
|
|
if (fse->index || fse->code != format->code) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto done;
|
|
|
|
}
|
2013-07-10 12:03:30 -03:00
|
|
|
|
|
|
|
if (fse->pad == SRU_PAD_SINK) {
|
|
|
|
fse->min_width = SRU_MIN_SIZE;
|
|
|
|
fse->max_width = SRU_MAX_SIZE;
|
|
|
|
fse->min_height = SRU_MIN_SIZE;
|
|
|
|
fse->max_height = SRU_MAX_SIZE;
|
|
|
|
} else {
|
|
|
|
fse->min_width = format->width;
|
|
|
|
fse->min_height = format->height;
|
|
|
|
if (format->width <= SRU_MAX_SIZE / 2 &&
|
|
|
|
format->height <= SRU_MAX_SIZE / 2) {
|
|
|
|
fse->max_width = format->width * 2;
|
|
|
|
fse->max_height = format->height * 2;
|
|
|
|
} else {
|
|
|
|
fse->max_width = format->width;
|
|
|
|
fse->max_height = format->height;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-06-26 08:09:31 -03:00
|
|
|
done:
|
|
|
|
mutex_unlock(&sru->entity.lock);
|
|
|
|
return ret;
|
2013-07-10 12:03:30 -03:00
|
|
|
}
|
|
|
|
|
2015-11-01 15:18:32 -02:00
|
|
|
static void sru_try_format(struct vsp1_sru *sru,
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 17:55:58 +03:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2015-11-15 19:14:22 -02:00
|
|
|
unsigned int pad, struct v4l2_mbus_framefmt *fmt)
|
2013-07-10 12:03:30 -03:00
|
|
|
{
|
|
|
|
struct v4l2_mbus_framefmt *format;
|
|
|
|
unsigned int input_area;
|
|
|
|
unsigned int output_area;
|
|
|
|
|
|
|
|
switch (pad) {
|
|
|
|
case SRU_PAD_SINK:
|
|
|
|
/* Default to YUV if the requested format is not supported. */
|
2014-11-10 14:28:31 -03:00
|
|
|
if (fmt->code != MEDIA_BUS_FMT_ARGB8888_1X32 &&
|
|
|
|
fmt->code != MEDIA_BUS_FMT_AYUV8_1X32)
|
|
|
|
fmt->code = MEDIA_BUS_FMT_AYUV8_1X32;
|
2013-07-10 12:03:30 -03:00
|
|
|
|
2025-04-30 02:29:00 +03:00
|
|
|
vsp1_entity_adjust_color_space(fmt);
|
|
|
|
|
2013-07-10 12:03:30 -03:00
|
|
|
fmt->width = clamp(fmt->width, SRU_MIN_SIZE, SRU_MAX_SIZE);
|
|
|
|
fmt->height = clamp(fmt->height, SRU_MIN_SIZE, SRU_MAX_SIZE);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SRU_PAD_SOURCE:
|
|
|
|
/* The SRU can't perform format conversion. */
|
2023-11-12 04:14:05 +02:00
|
|
|
format = v4l2_subdev_state_get_format(sd_state, SRU_PAD_SINK);
|
2013-07-10 12:03:30 -03:00
|
|
|
fmt->code = format->code;
|
|
|
|
|
2025-04-30 02:29:00 +03:00
|
|
|
fmt->colorspace = format->colorspace;
|
|
|
|
fmt->xfer_func = format->xfer_func;
|
|
|
|
fmt->ycbcr_enc = format->ycbcr_enc;
|
|
|
|
fmt->quantization = format->quantization;
|
|
|
|
|
2017-02-26 10:29:50 -03:00
|
|
|
/*
|
|
|
|
* We can upscale by 2 in both direction, but not independently.
|
2013-07-10 12:03:30 -03:00
|
|
|
* Compare the input and output rectangles areas (avoiding
|
|
|
|
* integer overflows on the output): if the requested output
|
|
|
|
* area is larger than 1.5^2 the input area upscale by two,
|
|
|
|
* otherwise don't scale.
|
|
|
|
*/
|
|
|
|
input_area = format->width * format->height;
|
|
|
|
output_area = min(fmt->width, SRU_MAX_SIZE)
|
|
|
|
* min(fmt->height, SRU_MAX_SIZE);
|
|
|
|
|
|
|
|
if (fmt->width <= SRU_MAX_SIZE / 2 &&
|
|
|
|
fmt->height <= SRU_MAX_SIZE / 2 &&
|
|
|
|
output_area > input_area * 9 / 4) {
|
|
|
|
fmt->width = format->width * 2;
|
|
|
|
fmt->height = format->height * 2;
|
|
|
|
} else {
|
|
|
|
fmt->width = format->width;
|
|
|
|
fmt->height = format->height;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
fmt->field = V4L2_FIELD_NONE;
|
|
|
|
}
|
|
|
|
|
2015-11-01 15:18:32 -02:00
|
|
|
static int sru_set_format(struct v4l2_subdev *subdev,
|
media: v4l2-subdev: add subdev-wide state struct
We have 'struct v4l2_subdev_pad_config' which contains configuration for
a single pad used for the TRY functionality, and an array of those
structs is passed to various v4l2_subdev_pad_ops.
I was working on subdev internal routing between pads, and realized that
there's no way to add TRY functionality for routes, which is not pad
specific configuration. Adding a separate struct for try-route config
wouldn't work either, as e.g. set-fmt needs to know the try-route
configuration to propagate the settings.
This patch adds a new struct, 'struct v4l2_subdev_state' (which at the
moment only contains the v4l2_subdev_pad_config array) and the new
struct is used in most of the places where v4l2_subdev_pad_config was
used. All v4l2_subdev_pad_ops functions taking v4l2_subdev_pad_config
are changed to instead take v4l2_subdev_state.
The changes to drivers/media/v4l2-core/v4l2-subdev.c and
include/media/v4l2-subdev.h were written by hand, and all the driver
changes were done with the semantic patch below. The spatch needs to be
applied to a select list of directories. I used the following shell
commands to apply the spatch:
dirs="drivers/media/i2c drivers/media/platform drivers/media/usb drivers/media/test-drivers/vimc drivers/media/pci drivers/staging/media"
for dir in $dirs; do spatch -j8 --dir --include-headers --no-show-diff --in-place --sp-file v4l2-subdev-state.cocci $dir; done
Note that Coccinelle chokes on a few drivers (gcc extensions?). With
minor changes we can make Coccinelle run fine, and these changes can be
reverted after spatch. The diff for these changes is:
For drivers/media/i2c/s5k5baf.c:
@@ -1481,7 +1481,7 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&s5k5baf_cis_rect,
v4l2_subdev_get_try_crop(sd, cfg, PAD_CIS),
v4l2_subdev_get_try_compose(sd, cfg, PAD_CIS),
- v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT)
+ v4l2_subdev_get_try_crop(sd, cfg, PAD_OUT),
};
s5k5baf_set_rect_and_adjust(rects, rtype, &sel->r);
return 0;
For drivers/media/platform/s3c-camif/camif-capture.c:
@@ -1230,7 +1230,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
*mf = camif->mbus_fmt;
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* crop rectangle at camera interface input */
mf->width = camif->camif_crop.width;
mf->height = camif->camif_crop.height;
@@ -1332,7 +1332,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
}
break;
- case CAMIF_SD_PAD_SOURCE_C...CAMIF_SD_PAD_SOURCE_P:
+ case CAMIF_SD_PAD_SOURCE_C:
/* Pixel format can be only changed on the sink pad. */
mf->code = camif->mbus_fmt.code;
mf->width = crop->width;
The semantic patch is:
// <smpl>
// Change function parameter
@@
identifier func;
identifier cfg;
@@
func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...)
{
<...
- cfg
+ sd_state
...>
}
// Change function declaration parameter
@@
identifier func;
identifier cfg;
type T;
@@
T func(...,
- struct v4l2_subdev_pad_config *cfg
+ struct v4l2_subdev_state *sd_state
, ...);
// Change function return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...)
{
...
}
// Change function declaration return value
@@
identifier func;
@@
- struct v4l2_subdev_pad_config
+ struct v4l2_subdev_state
*func(...);
// Some drivers pass a local pad_cfg for a single pad to a called function. Wrap it
// inside a pad_state.
@@
identifier func;
identifier pad_cfg;
@@
func(...)
{
...
struct v4l2_subdev_pad_config pad_cfg;
+ struct v4l2_subdev_state pad_state = { .pads = &pad_cfg };
<+...
(
v4l2_subdev_call
|
sensor_call
|
isi_try_fse
|
isc_try_fse
|
saa_call_all
)
(...,
- &pad_cfg
+ &pad_state
,...)
...+>
}
// If the function uses fields from pad_config, access via state->pads
@@
identifier func;
identifier state;
@@
func(...,
struct v4l2_subdev_state *state
, ...)
{
<...
(
- state->try_fmt
+ state->pads->try_fmt
|
- state->try_crop
+ state->pads->try_crop
|
- state->try_compose
+ state->pads->try_compose
)
...>
}
// If the function accesses the filehandle, use fh->state instead
@@
struct v4l2_subdev_fh *fh;
@@
- fh->pad
+ fh->state
@@
struct v4l2_subdev_fh fh;
@@
- fh.pad
+ fh.state
// Start of vsp1 specific
@@
@@
struct vsp1_entity {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
};
@@
symbol entity;
@@
vsp1_entity_init(...)
{
...
entity->config =
- v4l2_subdev_alloc_pad_config
+ v4l2_subdev_alloc_state
(&entity->subdev);
...
}
@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
...
- v4l2_subdev_free_pad_config
+ v4l2_subdev_free_state
(entity->config);
...
}
@exists@
identifier func =~ "(^vsp1.*)|(hsit_set_format)|(sru_enum_frame_size)|(sru_set_format)|(uif_get_selection)|(uif_set_selection)|(uds_enum_frame_size)|(uds_set_format)|(brx_set_format)|(brx_get_selection)|(histo_get_selection)|(histo_set_selection)|(brx_set_selection)";
symbol config;
@@
func(...) {
...
- struct v4l2_subdev_pad_config *config;
+ struct v4l2_subdev_state *config;
...
}
// End of vsp1 specific
// Start of rcar specific
@@
identifier sd;
identifier pad_cfg;
@@
rvin_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
// End of rcar specific
// Start of rockchip specific
@@
identifier func =~ "(rkisp1_rsz_get_pad_fmt)|(rkisp1_rsz_get_pad_crop)|(rkisp1_rsz_register)";
symbol rsz;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = rsz->pad_cfg };
...
- rsz->pad_cfg
+ &state
...
}
@@
identifier func =~ "(rkisp1_isp_get_pad_fmt)|(rkisp1_isp_get_pad_crop)";
symbol isp;
symbol pad_cfg;
@@
func(...)
{
+ struct v4l2_subdev_state state = { .pads = isp->pad_cfg };
...
- isp->pad_cfg
+ &state
...
}
@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@
rkisp1_isp_register(...)
{
+ struct v4l2_subdev_state state = { .pads = rkisp1->isp.pad_cfg };
...
- rkisp1->isp.pad_cfg
+ &state
...
}
// End of rockchip specific
// Start of tegra-video specific
@@
identifier sd;
identifier pad_cfg;
@@
__tegra_channel_try_format(...)
{
...
- struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_state *sd_state;
...
- pad_cfg = v4l2_subdev_alloc_pad_config(sd);
+ sd_state = v4l2_subdev_alloc_state(sd);
<...
- pad_cfg
+ sd_state
...>
- v4l2_subdev_free_pad_config(pad_cfg);
+ v4l2_subdev_free_state(sd_state);
...
}
@@
identifier sd_state;
@@
__tegra_channel_try_format(...)
{
...
struct v4l2_subdev_state *sd_state;
<...
- sd_state->try_crop
+ sd_state->pads->try_crop
...>
}
// End of tegra-video specific
// </smpl>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-06-10 17:55:58 +03:00
|
|
|
struct v4l2_subdev_state *sd_state,
|
2013-07-10 12:03:30 -03:00
|
|
|
struct v4l2_subdev_format *fmt)
|
|
|
|
{
|
|
|
|
struct vsp1_sru *sru = to_sru(subdev);
|
2023-11-26 03:37:15 +02:00
|
|
|
struct v4l2_subdev_state *state;
|
2013-07-10 12:03:30 -03:00
|
|
|
struct v4l2_mbus_framefmt *format;
|
2016-06-26 08:09:31 -03:00
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
mutex_lock(&sru->entity.lock);
|
2013-07-10 12:03:30 -03:00
|
|
|
|
2023-11-26 03:37:15 +02:00
|
|
|
state = vsp1_entity_get_state(&sru->entity, sd_state, fmt->which);
|
|
|
|
if (!state) {
|
2016-06-26 08:09:31 -03:00
|
|
|
ret = -EINVAL;
|
|
|
|
goto done;
|
|
|
|
}
|
2015-11-15 19:14:22 -02:00
|
|
|
|
2023-11-26 03:37:15 +02:00
|
|
|
sru_try_format(sru, state, fmt->pad, &fmt->format);
|
2013-07-10 12:03:30 -03:00
|
|
|
|
2023-11-12 04:14:05 +02:00
|
|
|
format = v4l2_subdev_state_get_format(state, fmt->pad);
|
2013-07-10 12:03:30 -03:00
|
|
|
*format = fmt->format;
|
|
|
|
|
|
|
|
if (fmt->pad == SRU_PAD_SINK) {
|
|
|
|
/* Propagate the format to the source pad. */
|
2023-11-12 04:14:05 +02:00
|
|
|
format = v4l2_subdev_state_get_format(state, SRU_PAD_SOURCE);
|
2013-07-10 12:03:30 -03:00
|
|
|
*format = fmt->format;
|
|
|
|
|
2023-11-26 03:37:15 +02:00
|
|
|
sru_try_format(sru, state, SRU_PAD_SOURCE, format);
|
2013-07-10 12:03:30 -03:00
|
|
|
}
|
|
|
|
|
2016-06-26 08:09:31 -03:00
|
|
|
done:
|
|
|
|
mutex_unlock(&sru->entity.lock);
|
|
|
|
return ret;
|
2013-07-10 12:03:30 -03:00
|
|
|
}
|
|
|
|
|
2016-06-17 21:11:26 -03:00
|
|
|
static const struct v4l2_subdev_pad_ops sru_pad_ops = {
|
2013-07-10 12:03:30 -03:00
|
|
|
.enum_mbus_code = sru_enum_mbus_code,
|
|
|
|
.enum_frame_size = sru_enum_frame_size,
|
2016-02-24 21:10:13 -03:00
|
|
|
.get_fmt = vsp1_subdev_get_pad_format,
|
2013-07-10 12:03:30 -03:00
|
|
|
.set_fmt = sru_set_format,
|
|
|
|
};
|
|
|
|
|
2016-06-17 21:11:26 -03:00
|
|
|
static const struct v4l2_subdev_ops sru_ops = {
|
2013-07-10 12:03:30 -03:00
|
|
|
.pad = &sru_pad_ops,
|
|
|
|
};
|
|
|
|
|
2015-11-17 13:10:26 -02:00
|
|
|
/* -----------------------------------------------------------------------------
|
|
|
|
* VSP1 Entity Operations
|
|
|
|
*/
|
|
|
|
|
2018-05-18 16:42:01 -04:00
|
|
|
static void sru_configure_stream(struct vsp1_entity *entity,
|
2023-11-12 04:14:05 +02:00
|
|
|
struct v4l2_subdev_state *state,
|
2018-05-18 16:42:01 -04:00
|
|
|
struct vsp1_pipeline *pipe,
|
2019-03-11 20:13:43 +02:00
|
|
|
struct vsp1_dl_list *dl,
|
2018-05-18 16:42:02 -04:00
|
|
|
struct vsp1_dl_body *dlb)
|
2015-11-17 13:10:26 -02:00
|
|
|
{
|
|
|
|
const struct vsp1_sru_param *param;
|
|
|
|
struct vsp1_sru *sru = to_sru(&entity->subdev);
|
|
|
|
struct v4l2_mbus_framefmt *input;
|
|
|
|
struct v4l2_mbus_framefmt *output;
|
|
|
|
u32 ctrl0;
|
|
|
|
|
2023-11-12 04:14:05 +02:00
|
|
|
input = v4l2_subdev_state_get_format(state, SRU_PAD_SINK);
|
|
|
|
output = v4l2_subdev_state_get_format(state, SRU_PAD_SOURCE);
|
2015-11-17 13:10:26 -02:00
|
|
|
|
|
|
|
if (input->code == MEDIA_BUS_FMT_ARGB8888_1X32)
|
|
|
|
ctrl0 = VI6_SRU_CTRL0_PARAM2 | VI6_SRU_CTRL0_PARAM3
|
|
|
|
| VI6_SRU_CTRL0_PARAM4;
|
|
|
|
else
|
|
|
|
ctrl0 = VI6_SRU_CTRL0_PARAM3;
|
|
|
|
|
|
|
|
if (input->width != output->width)
|
|
|
|
ctrl0 |= VI6_SRU_CTRL0_MODE_UPSCALE;
|
|
|
|
|
|
|
|
param = &vsp1_sru_params[sru->intensity - 1];
|
|
|
|
|
|
|
|
ctrl0 |= param->ctrl0;
|
|
|
|
|
2018-05-18 16:42:02 -04:00
|
|
|
vsp1_sru_write(sru, dlb, VI6_SRU_CTRL0, ctrl0);
|
|
|
|
vsp1_sru_write(sru, dlb, VI6_SRU_CTRL1, VI6_SRU_CTRL1_PARAM5);
|
|
|
|
vsp1_sru_write(sru, dlb, VI6_SRU_CTRL2, param->ctrl2);
|
2015-11-17 13:10:26 -02:00
|
|
|
}
|
|
|
|
|
2016-07-12 10:06:34 -03:00
|
|
|
static unsigned int sru_max_width(struct vsp1_entity *entity,
|
2023-11-12 04:14:05 +02:00
|
|
|
struct v4l2_subdev_state *state,
|
2016-07-12 10:06:34 -03:00
|
|
|
struct vsp1_pipeline *pipe)
|
|
|
|
{
|
|
|
|
struct v4l2_mbus_framefmt *input;
|
|
|
|
struct v4l2_mbus_framefmt *output;
|
|
|
|
|
2023-11-12 04:14:05 +02:00
|
|
|
input = v4l2_subdev_state_get_format(state, SRU_PAD_SINK);
|
|
|
|
output = v4l2_subdev_state_get_format(state, SRU_PAD_SOURCE);
|
2016-07-12 10:06:34 -03:00
|
|
|
|
2018-09-14 10:26:51 -04:00
|
|
|
/*
|
|
|
|
* The maximum input width of the SRU is 288 input pixels, but 32
|
|
|
|
* pixels are reserved to support overlapping partition windows when
|
|
|
|
* scaling.
|
|
|
|
*/
|
2016-07-12 10:06:34 -03:00
|
|
|
if (input->width != output->width)
|
|
|
|
return 512;
|
|
|
|
else
|
|
|
|
return 256;
|
|
|
|
}
|
|
|
|
|
2017-08-04 12:32:44 -04:00
|
|
|
static void sru_partition(struct vsp1_entity *entity,
|
2023-11-12 04:14:05 +02:00
|
|
|
struct v4l2_subdev_state *state,
|
2017-08-04 12:32:44 -04:00
|
|
|
struct vsp1_pipeline *pipe,
|
|
|
|
struct vsp1_partition *partition,
|
|
|
|
unsigned int partition_idx,
|
2023-11-14 00:53:07 +02:00
|
|
|
struct v4l2_rect *window)
|
2017-08-04 12:32:44 -04:00
|
|
|
{
|
|
|
|
struct v4l2_mbus_framefmt *input;
|
|
|
|
struct v4l2_mbus_framefmt *output;
|
|
|
|
|
2023-11-12 04:14:05 +02:00
|
|
|
input = v4l2_subdev_state_get_format(state, SRU_PAD_SINK);
|
|
|
|
output = v4l2_subdev_state_get_format(state, SRU_PAD_SOURCE);
|
2017-08-04 12:32:44 -04:00
|
|
|
|
2018-08-31 10:40:44 -04:00
|
|
|
/* Adapt if SRUx2 is enabled. */
|
2017-08-04 12:32:44 -04:00
|
|
|
if (input->width != output->width) {
|
|
|
|
window->width /= 2;
|
|
|
|
window->left /= 2;
|
2023-11-14 00:53:07 +02:00
|
|
|
window->height /= 2;
|
|
|
|
window->top /= 2;
|
2017-08-04 12:32:44 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
partition->sru = *window;
|
|
|
|
}
|
|
|
|
|
2015-11-17 13:10:26 -02:00
|
|
|
static const struct vsp1_entity_operations sru_entity_ops = {
|
2018-05-18 16:42:01 -04:00
|
|
|
.configure_stream = sru_configure_stream,
|
2016-07-12 10:06:34 -03:00
|
|
|
.max_width = sru_max_width,
|
2017-08-04 12:32:44 -04:00
|
|
|
.partition = sru_partition,
|
2015-11-17 13:10:26 -02:00
|
|
|
};
|
|
|
|
|
2013-07-10 12:03:30 -03:00
|
|
|
/* -----------------------------------------------------------------------------
|
|
|
|
* Initialization and Cleanup
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct vsp1_sru *vsp1_sru_create(struct vsp1_device *vsp1)
|
|
|
|
{
|
|
|
|
struct vsp1_sru *sru;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
sru = devm_kzalloc(vsp1->dev, sizeof(*sru), GFP_KERNEL);
|
|
|
|
if (sru == NULL)
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
|
2015-11-17 13:10:26 -02:00
|
|
|
sru->entity.ops = &sru_entity_ops;
|
2013-07-10 12:03:30 -03:00
|
|
|
sru->entity.type = VSP1_ENTITY_SRU;
|
|
|
|
|
2016-02-15 22:10:26 -02:00
|
|
|
ret = vsp1_entity_init(vsp1, &sru->entity, "sru", 2, &sru_ops,
|
|
|
|
MEDIA_ENT_F_PROC_VIDEO_SCALER);
|
2013-07-10 12:03:30 -03:00
|
|
|
if (ret < 0)
|
|
|
|
return ERR_PTR(ret);
|
|
|
|
|
|
|
|
/* Initialize the control handler. */
|
|
|
|
v4l2_ctrl_handler_init(&sru->ctrls, 1);
|
|
|
|
v4l2_ctrl_new_custom(&sru->ctrls, &sru_intensity_control, NULL);
|
2014-05-21 19:00:05 -03:00
|
|
|
|
2015-11-01 12:19:42 -02:00
|
|
|
sru->intensity = 1;
|
|
|
|
|
2013-07-10 12:03:30 -03:00
|
|
|
sru->entity.subdev.ctrl_handler = &sru->ctrls;
|
|
|
|
|
2014-05-21 19:00:05 -03:00
|
|
|
if (sru->ctrls.error) {
|
|
|
|
dev_err(vsp1->dev, "sru: failed to initialize controls\n");
|
|
|
|
ret = sru->ctrls.error;
|
|
|
|
vsp1_entity_destroy(&sru->entity);
|
|
|
|
return ERR_PTR(ret);
|
|
|
|
}
|
|
|
|
|
2013-07-10 12:03:30 -03:00
|
|
|
return sru;
|
|
|
|
}
|