mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 13:22:23 +00:00
0d346d2a6f
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>
|
||
|---|---|---|
| .. | ||
| adv748x | ||
| ccs | ||
| cx25840 | ||
| et8ek8 | ||
| m5mols | ||
| s5c73m3 | ||
| ad5820.c | ||
| ad9389b.c | ||
| adp1653.c | ||
| adv7170.c | ||
| adv7175.c | ||
| adv7180.c | ||
| adv7183_regs.h | ||
| adv7183.c | ||
| adv7343_regs.h | ||
| adv7343.c | ||
| adv7393_regs.h | ||
| adv7393.c | ||
| adv7511-v4l2.c | ||
| adv7604.c | ||
| adv7842.c | ||
| ak881x.c | ||
| ak7375.c | ||
| aptina-pll.c | ||
| aptina-pll.h | ||
| bt819.c | ||
| bt856.c | ||
| bt866.c | ||
| ccs-pll.c | ||
| ccs-pll.h | ||
| cs53l32a.c | ||
| cs3308.c | ||
| cs5345.c | ||
| dw9714.c | ||
| dw9768.c | ||
| dw9807-vcm.c | ||
| hi556.c | ||
| imx208.c | ||
| imx214.c | ||
| imx219.c | ||
| imx258.c | ||
| imx274.c | ||
| imx290.c | ||
| imx319.c | ||
| imx334.c | ||
| imx355.c | ||
| ir-kbd-i2c.c | ||
| Kconfig | ||
| ks0127.c | ||
| ks0127.h | ||
| lm3560.c | ||
| lm3646.c | ||
| m52790.c | ||
| Makefile | ||
| max2175.c | ||
| max2175.h | ||
| max9271.c | ||
| max9271.h | ||
| max9286.c | ||
| ml86v7667.c | ||
| msp3400-driver.c | ||
| msp3400-driver.h | ||
| msp3400-kthreads.c | ||
| mt9m001.c | ||
| mt9m032.c | ||
| mt9m111.c | ||
| mt9p031.c | ||
| mt9t001.c | ||
| mt9t112.c | ||
| mt9v011.c | ||
| mt9v032.c | ||
| mt9v111.c | ||
| noon010pc30.c | ||
| ov02a10.c | ||
| ov772x.c | ||
| ov2640.c | ||
| ov2659.c | ||
| ov2680.c | ||
| ov2685.c | ||
| ov2740.c | ||
| ov5640.c | ||
| ov5645.c | ||
| ov5647.c | ||
| ov5648.c | ||
| ov5670.c | ||
| ov5675.c | ||
| ov5695.c | ||
| ov6650.c | ||
| ov7251.c | ||
| ov7640.c | ||
| ov7670.c | ||
| ov7740.c | ||
| ov8856.c | ||
| ov8865.c | ||
| ov9640.c | ||
| ov9640.h | ||
| ov9650.c | ||
| ov9734.c | ||
| ov13858.c | ||
| rdacm20.c | ||
| rdacm21.c | ||
| rj54n1cb0c.c | ||
| s5k4ecgx.c | ||
| s5k5baf.c | ||
| s5k6a3.c | ||
| s5k6aa.c | ||
| saa711x_regs.h | ||
| saa717x.c | ||
| saa6588.c | ||
| saa6752hs.c | ||
| saa7110.c | ||
| saa7115.c | ||
| saa7127.c | ||
| saa7185.c | ||
| sony-btf-mpx.c | ||
| sr030pc30.c | ||
| st-mipid02.c | ||
| tc358743_regs.h | ||
| tc358743.c | ||
| tda1997x_regs.h | ||
| tda1997x.c | ||
| tda7432.c | ||
| tda9840.c | ||
| tea6415c.c | ||
| tea6415c.h | ||
| tea6420.c | ||
| tea6420.h | ||
| ths7303.c | ||
| ths8200_regs.h | ||
| ths8200.c | ||
| tlv320aic23b.c | ||
| tvaudio.c | ||
| tvp514x_regs.h | ||
| tvp514x.c | ||
| tvp5150_reg.h | ||
| tvp5150.c | ||
| tvp7002_reg.h | ||
| tvp7002.c | ||
| tw2804.c | ||
| tw9903.c | ||
| tw9906.c | ||
| tw9910.c | ||
| uda1342.c | ||
| upd64031a.c | ||
| upd64083.c | ||
| video-i2c.c | ||
| vp27smpx.c | ||
| vpx3220.c | ||
| vs6624_regs.h | ||
| vs6624.c | ||
| wm8739.c | ||
| wm8775.c | ||