<feed xmlns='http://www.w3.org/2005/Atom'>
<title>linux.git/drivers/media/test-drivers/vimc/vimc-sensor.c, branch v6.8</title>
<subtitle>Linux kernel source tree</subtitle>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/'/>
<entry>
<title>media: v4l2-subdev: Rename .init_cfg() operation to .init_state()</title>
<updated>2023-12-04T09:37:47+00:00</updated>
<author>
<name>Laurent Pinchart</name>
<email>laurent.pinchart@ideasonboard.com</email>
</author>
<published>2023-11-27T09:07:44+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=5755be5f15d9e651ed433e5dbf7b7b968efb3064'/>
<id>5755be5f15d9e651ed433e5dbf7b7b968efb3064</id>
<content type='text'>
The subdev .init_cfg() operation is affected by two issues:

- It has long been extended to initialize a whole v4l2_subdev_state
  instead of just a v4l2_subdev_pad_config, but its name has stuck
  around.

- Despite operating on a whole subdev state and not being directly
  exposed to the subdev users (either in-kernel or through the userspace
  API), .init_cfg() is categorized as a subdev pad operation.

This participates in making the subdev API confusing for new developers.
Fix it by renaming the operation to .init_state(), and make it a subdev
internal operation.

Signed-off-by: Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt;
Acked-by: Michael Riesch &lt;michael.riesch@wolfvision.net&gt; # for imx415
Acked-by: Shuah Khan &lt;skhan@linuxfoundation.org&gt; # for vimc
Reviewed-by: Philipp Zabel &lt;p.zabel@pengutronix.de&gt;
Reviewed-by: Tomi Valkeinen &lt;tomi.valkeinen@ideasonboard.com&gt;
[Sakari Ailus: Resolved a conflict in Renesas vsp1 driver.]
Signed-off-by: Sakari Ailus &lt;sakari.ailus@linux.intel.com&gt;
Signed-off-by: Hans Verkuil &lt;hverkuil-cisco@xs4all.nl&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
The subdev .init_cfg() operation is affected by two issues:

- It has long been extended to initialize a whole v4l2_subdev_state
  instead of just a v4l2_subdev_pad_config, but its name has stuck
  around.

- Despite operating on a whole subdev state and not being directly
  exposed to the subdev users (either in-kernel or through the userspace
  API), .init_cfg() is categorized as a subdev pad operation.

This participates in making the subdev API confusing for new developers.
Fix it by renaming the operation to .init_state(), and make it a subdev
internal operation.

Signed-off-by: Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt;
Acked-by: Michael Riesch &lt;michael.riesch@wolfvision.net&gt; # for imx415
Acked-by: Shuah Khan &lt;skhan@linuxfoundation.org&gt; # for vimc
Reviewed-by: Philipp Zabel &lt;p.zabel@pengutronix.de&gt;
Reviewed-by: Tomi Valkeinen &lt;tomi.valkeinen@ideasonboard.com&gt;
[Sakari Ailus: Resolved a conflict in Renesas vsp1 driver.]
Signed-off-by: Sakari Ailus &lt;sakari.ailus@linux.intel.com&gt;
Signed-off-by: Hans Verkuil &lt;hverkuil-cisco@xs4all.nl&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>media: v4l: subdev: Switch to stream-aware state functions</title>
<updated>2023-11-23T17:57:47+00:00</updated>
<author>
<name>Sakari Ailus</name>
<email>sakari.ailus@linux.intel.com</email>
</author>
<published>2023-10-13T07:37:10+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=bc0e8d91feec72b19199298dca470c5816a52105'/>
<id>bc0e8d91feec72b19199298dca470c5816a52105</id>
<content type='text'>
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&lt;------------
@@
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&lt;------------

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:

&gt; diff --git b/drivers/media/i2c/imx319.c a/drivers/media/i2c/imx319.c
&gt; index e549692ff478..420984382173 100644
&gt; --- b/drivers/media/i2c/imx319.c
&gt; +++ a/drivers/media/i2c/imx319.c
&gt; @@ -2001,7 +2001,6 @@ static int imx319_do_get_pad_format(struct imx319 *imx319,
&gt;  				    struct v4l2_subdev_format *fmt)
&gt;  {
&gt;  	struct v4l2_mbus_framefmt *framefmt;
&gt; -	struct v4l2_subdev *sd = &amp;imx319-&gt;sd;
&gt;
&gt;  	if (fmt-&gt;which == V4L2_SUBDEV_FORMAT_TRY) {
&gt;  		framefmt = v4l2_subdev_state_get_format(sd_state, fmt-&gt;pad);
&gt; diff --git b/drivers/media/i2c/imx355.c a/drivers/media/i2c/imx355.c
&gt; index 96bdde685d65..e1b1d2fc79dd 100644
&gt; --- b/drivers/media/i2c/imx355.c
&gt; +++ a/drivers/media/i2c/imx355.c
&gt; @@ -1299,7 +1299,6 @@ static int imx355_do_get_pad_format(struct imx355 *imx355,
&gt;  				    struct v4l2_subdev_format *fmt)
&gt;  {
&gt;  	struct v4l2_mbus_framefmt *framefmt;
&gt; -	struct v4l2_subdev *sd = &amp;imx355-&gt;sd;
&gt;
&gt;  	if (fmt-&gt;which == V4L2_SUBDEV_FORMAT_TRY) {
&gt;  		framefmt = v4l2_subdev_state_get_format(sd_state, fmt-&gt;pad);
&gt; diff --git b/drivers/media/i2c/ov08x40.c a/drivers/media/i2c/ov08x40.c
&gt; index ca799bbcfdb7..abbb0b774d43 100644
&gt; --- b/drivers/media/i2c/ov08x40.c
&gt; +++ a/drivers/media/i2c/ov08x40.c
&gt; @@ -2774,7 +2774,6 @@ static int ov08x40_do_get_pad_format(struct ov08x40 *ov08x,
&gt;  				     struct v4l2_subdev_format *fmt)
&gt;  {
&gt;  	struct v4l2_mbus_framefmt *framefmt;
&gt; -	struct v4l2_subdev *sd = &amp;ov08x-&gt;sd;
&gt;
&gt;  	if (fmt-&gt;which == V4L2_SUBDEV_FORMAT_TRY) {
&gt;  		framefmt = v4l2_subdev_state_get_format(sd_state, fmt-&gt;pad);
&gt; diff --git b/drivers/media/i2c/ov13858.c a/drivers/media/i2c/ov13858.c
&gt; index 7816d9787c61..09387e335d80 100644
&gt; --- b/drivers/media/i2c/ov13858.c
&gt; +++ a/drivers/media/i2c/ov13858.c
&gt; @@ -1316,7 +1316,6 @@ static int ov13858_do_get_pad_format(struct ov13858 *ov13858,
&gt;  				     struct v4l2_subdev_format *fmt)
&gt;  {
&gt;  	struct v4l2_mbus_framefmt *framefmt;
&gt; -	struct v4l2_subdev *sd = &amp;ov13858-&gt;sd;
&gt;
&gt;  	if (fmt-&gt;which == V4L2_SUBDEV_FORMAT_TRY) {
&gt;  		framefmt = v4l2_subdev_state_get_format(sd_state, fmt-&gt;pad);
&gt; diff --git b/drivers/media/i2c/ov13b10.c a/drivers/media/i2c/ov13b10.c
&gt; index 268cd4b03f9c..c06411d5ee2b 100644
&gt; --- b/drivers/media/i2c/ov13b10.c
&gt; +++ a/drivers/media/i2c/ov13b10.c
&gt; @@ -1001,7 +1001,6 @@ static int ov13b10_do_get_pad_format(struct ov13b10 *ov13b,
&gt;  				     struct v4l2_subdev_format *fmt)
&gt;  {
&gt;  	struct v4l2_mbus_framefmt *framefmt;
&gt; -	struct v4l2_subdev *sd = &amp;ov13b-&gt;sd;
&gt;
&gt;  	if (fmt-&gt;which == V4L2_SUBDEV_FORMAT_TRY) {
&gt;  		framefmt = v4l2_subdev_state_get_format(sd_state, fmt-&gt;pad);
&gt; diff --git b/drivers/media/i2c/s5c73m3/s5c73m3-core.c a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
&gt; index 47605e36bc60..8f9b5713daf7 100644
&gt; --- b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
&gt; +++ a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
&gt; @@ -819,7 +819,6 @@ static void s5c73m3_oif_try_format(struct s5c73m3 *state,
&gt;  				   struct v4l2_subdev_format *fmt,
&gt;  				   const struct s5c73m3_frame_size **fs)
&gt;  {
&gt; -	struct v4l2_subdev *sd = &amp;state-&gt;sensor_sd;
&gt;  	u32 code;
&gt;
&gt;  	switch (fmt-&gt;pad) {
&gt; diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
&gt; index 67da2045f543..03ccfb0e1e11 100644
&gt; --- a/drivers/media/i2c/s5k5baf.c
&gt; +++ b/drivers/media/i2c/s5k5baf.c
&gt; @@ -1472,14 +1472,11 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&gt;
&gt;  	if (sel-&gt;which == V4L2_SUBDEV_FORMAT_TRY) {
&gt;  		rects = (struct v4l2_rect * []) {
&gt; -				&amp;s5k5baf_cis_rect,
&gt; -				v4l2_subdev_get_try_crop(sd, sd_state,
&gt; -							 PAD_CIS),
&gt; -				v4l2_subdev_get_try_compose(sd, sd_state,
&gt; -							    PAD_CIS),
&gt; -				v4l2_subdev_get_try_crop(sd, sd_state,
&gt; -							 PAD_OUT)
&gt; -			};
&gt; +			&amp;s5k5baf_cis_rect,
&gt; +			v4l2_subdev_state_get_crop(sd_state, PAD_CIS),
&gt; +			v4l2_subdev_state_get_compose(sd_state, PAD_CIS),
&gt; +			v4l2_subdev_state_get_crop(sd_state, PAD_OUT)
&gt; +		};
&gt;  		s5k5baf_set_rect_and_adjust(rects, rtype, &amp;sel-&gt;r);
&gt;  		return 0;
&gt;  	}
&gt; diff --git b/drivers/media/platform/samsung/s3c-camif/camif-capture.c a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
&gt; index 295e083f38e8..be58260ea67e 100644
&gt; --- b/drivers/media/platform/samsung/s3c-camif/camif-capture.c
&gt; +++ a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
&gt; @@ -1216,7 +1216,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
&gt;  	struct v4l2_mbus_framefmt *mf = &amp;fmt-&gt;format;
&gt;
&gt;  	if (fmt-&gt;which == V4L2_SUBDEV_FORMAT_TRY) {
&gt; -		mf = v4l2_subdev_get_try_format(sd, sd_state, fmt-&gt;pad);
&gt; +		mf = v4l2_subdev_state_get_format(sd_state, fmt-&gt;pad);
&gt;  		fmt-&gt;format = *mf;
&gt;  		return 0;
&gt;  	}
&gt; @@ -1305,7 +1305,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
&gt;  	__camif_subdev_try_format(camif, mf, fmt-&gt;pad);
&gt;
&gt;  	if (fmt-&gt;which == V4L2_SUBDEV_FORMAT_TRY) {
&gt; -		mf = v4l2_subdev_get_try_format(sd, sd_state, fmt-&gt;pad);
&gt; +		mf = v4l2_subdev_state_get_format(sd_state, fmt-&gt;pad);
&gt;  		*mf = fmt-&gt;format;
&gt;  		mutex_unlock(&amp;camif-&gt;lock);
&gt;  		return 0;
&gt; diff --git b/drivers/media/platform/ti/cal/cal-camerarx.c a/drivers/media/platform/ti/cal/cal-camerarx.c
&gt; index cea454ed9c20..61433744c6c4 100644
&gt; --- b/drivers/media/platform/ti/cal/cal-camerarx.c
&gt; +++ a/drivers/media/platform/ti/cal/cal-camerarx.c
&gt; @@ -621,8 +621,6 @@ static int cal_camerarx_sd_enum_mbus_code(struct v4l2_subdev *sd,
&gt;  					  struct v4l2_subdev_state *state,
&gt;  					  struct v4l2_subdev_mbus_code_enum *code)
&gt;  {
&gt; -	struct cal_camerarx *phy = to_cal_camerarx(sd);
&gt; -
&gt;  	/* No transcoding, source and sink codes must match. */
&gt;  	if (cal_rx_pad_is_source(code-&gt;pad)) {
&gt;  		struct v4l2_mbus_framefmt *fmt;
&gt; diff --git b/drivers/staging/media/imx/imx-ic-prp.c a/drivers/staging/media/imx/imx-ic-prp.c
&gt; index dd558fac6477..61d69f19657e 100644
&gt; --- b/drivers/staging/media/imx/imx-ic-prp.c
&gt; +++ a/drivers/staging/media/imx/imx-ic-prp.c
&gt; @@ -82,8 +82,6 @@ static struct v4l2_mbus_framefmt *
&gt;  __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
&gt;  	      unsigned int pad, enum v4l2_subdev_format_whence which)
&gt;  {
&gt; -	struct imx_ic_priv *ic_priv = priv-&gt;ic_priv;
&gt; -
&gt;  	if (which == V4L2_SUBDEV_FORMAT_TRY)
&gt;  		return v4l2_subdev_state_get_format(sd_state, pad);
&gt;  	else
&gt; diff --git b/drivers/staging/media/imx/imx-ic-prpencvf.c a/drivers/staging/media/imx/imx-ic-prpencvf.c
&gt; index 02db7dbb884b..ec73c901079e 100644
&gt; --- b/drivers/staging/media/imx/imx-ic-prpencvf.c
&gt; +++ a/drivers/staging/media/imx/imx-ic-prpencvf.c
&gt; @@ -790,8 +790,6 @@ static struct v4l2_mbus_framefmt *
&gt;  __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
&gt;  	      unsigned int pad, enum v4l2_subdev_format_whence which)
&gt;  {
&gt; -	struct imx_ic_priv *ic_priv = priv-&gt;ic_priv;
&gt; -
&gt;  	if (which == V4L2_SUBDEV_FORMAT_TRY)
&gt;  		return v4l2_subdev_state_get_format(sd_state, pad);
&gt;  	else
&gt; diff --git a/drivers/media/i2c/st-mipid02.c b/drivers/media/i2c/st-mipid02.c
&gt; index 9c9361354c00..b08a249b5fdd 100644
&gt; --- a/drivers/media/i2c/st-mipid02.c
&gt; +++ b/drivers/media/i2c/st-mipid02.c
&gt; @@ -751,7 +751,7 @@ static void mipid02_set_fmt_source(struct v4l2_subdev *sd,
&gt;  		format-&gt;format = bridge-&gt;fmt;
&gt;  	else
&gt;  		format-&gt;format = *v4l2_subdev_state_get_format(sd_state,
&gt; -						               MIPID02_SINK_0);
&gt; +							       MIPID02_SINK_0);
&gt;
&gt;  	/* but code may need to be converted */
&gt;  	format-&gt;format.code = serial_to_parallel_code(format-&gt;format.code);
&gt; diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
&gt; index 117912d3bfbd..96353648c032 100644
&gt; --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
&gt; +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
&gt; @@ -319,7 +319,7 @@ static void rkisp1_isp_start(struct rkisp1_isp *isp,
&gt;  	rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
&gt;
&gt;  	src_fmt = v4l2_subdev_state_get_format(sd_state,
&gt; -				               RKISP1_ISP_PAD_SOURCE_VIDEO);
&gt; +					       RKISP1_ISP_PAD_SOURCE_VIDEO);
&gt;  	src_info = rkisp1_mbus_info_get_by_code(src_fmt-&gt;code);
&gt;
&gt;  	if (src_info-&gt;pixel_enc != V4L2_PIXEL_ENC_BAYER)
&gt; @@ -475,9 +475,9 @@ static void rkisp1_isp_set_src_fmt(struct rkisp1_isp *isp,
&gt;  	sink_fmt = v4l2_subdev_state_get_format(sd_state,
&gt;  						RKISP1_ISP_PAD_SINK_VIDEO);
&gt;  	src_fmt = v4l2_subdev_state_get_format(sd_state,
&gt; -				               RKISP1_ISP_PAD_SOURCE_VIDEO);
&gt; +					       RKISP1_ISP_PAD_SOURCE_VIDEO);
&gt;  	src_crop = v4l2_subdev_state_get_crop(sd_state,
&gt; -				              RKISP1_ISP_PAD_SOURCE_VIDEO);
&gt; +					      RKISP1_ISP_PAD_SOURCE_VIDEO);
&gt;
&gt;  	/*
&gt;  	 * Media bus code. The ISP can operate in pass-through mode (Bayer in,

Signed-off-by: Sakari Ailus &lt;sakari.ailus@linux.intel.com&gt;
Reviewed-by: Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt;
Signed-off-by: Mauro Carvalho Chehab &lt;mchehab@kernel.org&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
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&lt;------------
@@
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&lt;------------

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:

&gt; diff --git b/drivers/media/i2c/imx319.c a/drivers/media/i2c/imx319.c
&gt; index e549692ff478..420984382173 100644
&gt; --- b/drivers/media/i2c/imx319.c
&gt; +++ a/drivers/media/i2c/imx319.c
&gt; @@ -2001,7 +2001,6 @@ static int imx319_do_get_pad_format(struct imx319 *imx319,
&gt;  				    struct v4l2_subdev_format *fmt)
&gt;  {
&gt;  	struct v4l2_mbus_framefmt *framefmt;
&gt; -	struct v4l2_subdev *sd = &amp;imx319-&gt;sd;
&gt;
&gt;  	if (fmt-&gt;which == V4L2_SUBDEV_FORMAT_TRY) {
&gt;  		framefmt = v4l2_subdev_state_get_format(sd_state, fmt-&gt;pad);
&gt; diff --git b/drivers/media/i2c/imx355.c a/drivers/media/i2c/imx355.c
&gt; index 96bdde685d65..e1b1d2fc79dd 100644
&gt; --- b/drivers/media/i2c/imx355.c
&gt; +++ a/drivers/media/i2c/imx355.c
&gt; @@ -1299,7 +1299,6 @@ static int imx355_do_get_pad_format(struct imx355 *imx355,
&gt;  				    struct v4l2_subdev_format *fmt)
&gt;  {
&gt;  	struct v4l2_mbus_framefmt *framefmt;
&gt; -	struct v4l2_subdev *sd = &amp;imx355-&gt;sd;
&gt;
&gt;  	if (fmt-&gt;which == V4L2_SUBDEV_FORMAT_TRY) {
&gt;  		framefmt = v4l2_subdev_state_get_format(sd_state, fmt-&gt;pad);
&gt; diff --git b/drivers/media/i2c/ov08x40.c a/drivers/media/i2c/ov08x40.c
&gt; index ca799bbcfdb7..abbb0b774d43 100644
&gt; --- b/drivers/media/i2c/ov08x40.c
&gt; +++ a/drivers/media/i2c/ov08x40.c
&gt; @@ -2774,7 +2774,6 @@ static int ov08x40_do_get_pad_format(struct ov08x40 *ov08x,
&gt;  				     struct v4l2_subdev_format *fmt)
&gt;  {
&gt;  	struct v4l2_mbus_framefmt *framefmt;
&gt; -	struct v4l2_subdev *sd = &amp;ov08x-&gt;sd;
&gt;
&gt;  	if (fmt-&gt;which == V4L2_SUBDEV_FORMAT_TRY) {
&gt;  		framefmt = v4l2_subdev_state_get_format(sd_state, fmt-&gt;pad);
&gt; diff --git b/drivers/media/i2c/ov13858.c a/drivers/media/i2c/ov13858.c
&gt; index 7816d9787c61..09387e335d80 100644
&gt; --- b/drivers/media/i2c/ov13858.c
&gt; +++ a/drivers/media/i2c/ov13858.c
&gt; @@ -1316,7 +1316,6 @@ static int ov13858_do_get_pad_format(struct ov13858 *ov13858,
&gt;  				     struct v4l2_subdev_format *fmt)
&gt;  {
&gt;  	struct v4l2_mbus_framefmt *framefmt;
&gt; -	struct v4l2_subdev *sd = &amp;ov13858-&gt;sd;
&gt;
&gt;  	if (fmt-&gt;which == V4L2_SUBDEV_FORMAT_TRY) {
&gt;  		framefmt = v4l2_subdev_state_get_format(sd_state, fmt-&gt;pad);
&gt; diff --git b/drivers/media/i2c/ov13b10.c a/drivers/media/i2c/ov13b10.c
&gt; index 268cd4b03f9c..c06411d5ee2b 100644
&gt; --- b/drivers/media/i2c/ov13b10.c
&gt; +++ a/drivers/media/i2c/ov13b10.c
&gt; @@ -1001,7 +1001,6 @@ static int ov13b10_do_get_pad_format(struct ov13b10 *ov13b,
&gt;  				     struct v4l2_subdev_format *fmt)
&gt;  {
&gt;  	struct v4l2_mbus_framefmt *framefmt;
&gt; -	struct v4l2_subdev *sd = &amp;ov13b-&gt;sd;
&gt;
&gt;  	if (fmt-&gt;which == V4L2_SUBDEV_FORMAT_TRY) {
&gt;  		framefmt = v4l2_subdev_state_get_format(sd_state, fmt-&gt;pad);
&gt; diff --git b/drivers/media/i2c/s5c73m3/s5c73m3-core.c a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
&gt; index 47605e36bc60..8f9b5713daf7 100644
&gt; --- b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
&gt; +++ a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
&gt; @@ -819,7 +819,6 @@ static void s5c73m3_oif_try_format(struct s5c73m3 *state,
&gt;  				   struct v4l2_subdev_format *fmt,
&gt;  				   const struct s5c73m3_frame_size **fs)
&gt;  {
&gt; -	struct v4l2_subdev *sd = &amp;state-&gt;sensor_sd;
&gt;  	u32 code;
&gt;
&gt;  	switch (fmt-&gt;pad) {
&gt; diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
&gt; index 67da2045f543..03ccfb0e1e11 100644
&gt; --- a/drivers/media/i2c/s5k5baf.c
&gt; +++ b/drivers/media/i2c/s5k5baf.c
&gt; @@ -1472,14 +1472,11 @@ static int s5k5baf_set_selection(struct v4l2_subdev *sd,
&gt;
&gt;  	if (sel-&gt;which == V4L2_SUBDEV_FORMAT_TRY) {
&gt;  		rects = (struct v4l2_rect * []) {
&gt; -				&amp;s5k5baf_cis_rect,
&gt; -				v4l2_subdev_get_try_crop(sd, sd_state,
&gt; -							 PAD_CIS),
&gt; -				v4l2_subdev_get_try_compose(sd, sd_state,
&gt; -							    PAD_CIS),
&gt; -				v4l2_subdev_get_try_crop(sd, sd_state,
&gt; -							 PAD_OUT)
&gt; -			};
&gt; +			&amp;s5k5baf_cis_rect,
&gt; +			v4l2_subdev_state_get_crop(sd_state, PAD_CIS),
&gt; +			v4l2_subdev_state_get_compose(sd_state, PAD_CIS),
&gt; +			v4l2_subdev_state_get_crop(sd_state, PAD_OUT)
&gt; +		};
&gt;  		s5k5baf_set_rect_and_adjust(rects, rtype, &amp;sel-&gt;r);
&gt;  		return 0;
&gt;  	}
&gt; diff --git b/drivers/media/platform/samsung/s3c-camif/camif-capture.c a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
&gt; index 295e083f38e8..be58260ea67e 100644
&gt; --- b/drivers/media/platform/samsung/s3c-camif/camif-capture.c
&gt; +++ a/drivers/media/platform/samsung/s3c-camif/camif-capture.c
&gt; @@ -1216,7 +1216,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd,
&gt;  	struct v4l2_mbus_framefmt *mf = &amp;fmt-&gt;format;
&gt;
&gt;  	if (fmt-&gt;which == V4L2_SUBDEV_FORMAT_TRY) {
&gt; -		mf = v4l2_subdev_get_try_format(sd, sd_state, fmt-&gt;pad);
&gt; +		mf = v4l2_subdev_state_get_format(sd_state, fmt-&gt;pad);
&gt;  		fmt-&gt;format = *mf;
&gt;  		return 0;
&gt;  	}
&gt; @@ -1305,7 +1305,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd,
&gt;  	__camif_subdev_try_format(camif, mf, fmt-&gt;pad);
&gt;
&gt;  	if (fmt-&gt;which == V4L2_SUBDEV_FORMAT_TRY) {
&gt; -		mf = v4l2_subdev_get_try_format(sd, sd_state, fmt-&gt;pad);
&gt; +		mf = v4l2_subdev_state_get_format(sd_state, fmt-&gt;pad);
&gt;  		*mf = fmt-&gt;format;
&gt;  		mutex_unlock(&amp;camif-&gt;lock);
&gt;  		return 0;
&gt; diff --git b/drivers/media/platform/ti/cal/cal-camerarx.c a/drivers/media/platform/ti/cal/cal-camerarx.c
&gt; index cea454ed9c20..61433744c6c4 100644
&gt; --- b/drivers/media/platform/ti/cal/cal-camerarx.c
&gt; +++ a/drivers/media/platform/ti/cal/cal-camerarx.c
&gt; @@ -621,8 +621,6 @@ static int cal_camerarx_sd_enum_mbus_code(struct v4l2_subdev *sd,
&gt;  					  struct v4l2_subdev_state *state,
&gt;  					  struct v4l2_subdev_mbus_code_enum *code)
&gt;  {
&gt; -	struct cal_camerarx *phy = to_cal_camerarx(sd);
&gt; -
&gt;  	/* No transcoding, source and sink codes must match. */
&gt;  	if (cal_rx_pad_is_source(code-&gt;pad)) {
&gt;  		struct v4l2_mbus_framefmt *fmt;
&gt; diff --git b/drivers/staging/media/imx/imx-ic-prp.c a/drivers/staging/media/imx/imx-ic-prp.c
&gt; index dd558fac6477..61d69f19657e 100644
&gt; --- b/drivers/staging/media/imx/imx-ic-prp.c
&gt; +++ a/drivers/staging/media/imx/imx-ic-prp.c
&gt; @@ -82,8 +82,6 @@ static struct v4l2_mbus_framefmt *
&gt;  __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
&gt;  	      unsigned int pad, enum v4l2_subdev_format_whence which)
&gt;  {
&gt; -	struct imx_ic_priv *ic_priv = priv-&gt;ic_priv;
&gt; -
&gt;  	if (which == V4L2_SUBDEV_FORMAT_TRY)
&gt;  		return v4l2_subdev_state_get_format(sd_state, pad);
&gt;  	else
&gt; diff --git b/drivers/staging/media/imx/imx-ic-prpencvf.c a/drivers/staging/media/imx/imx-ic-prpencvf.c
&gt; index 02db7dbb884b..ec73c901079e 100644
&gt; --- b/drivers/staging/media/imx/imx-ic-prpencvf.c
&gt; +++ a/drivers/staging/media/imx/imx-ic-prpencvf.c
&gt; @@ -790,8 +790,6 @@ static struct v4l2_mbus_framefmt *
&gt;  __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,
&gt;  	      unsigned int pad, enum v4l2_subdev_format_whence which)
&gt;  {
&gt; -	struct imx_ic_priv *ic_priv = priv-&gt;ic_priv;
&gt; -
&gt;  	if (which == V4L2_SUBDEV_FORMAT_TRY)
&gt;  		return v4l2_subdev_state_get_format(sd_state, pad);
&gt;  	else
&gt; diff --git a/drivers/media/i2c/st-mipid02.c b/drivers/media/i2c/st-mipid02.c
&gt; index 9c9361354c00..b08a249b5fdd 100644
&gt; --- a/drivers/media/i2c/st-mipid02.c
&gt; +++ b/drivers/media/i2c/st-mipid02.c
&gt; @@ -751,7 +751,7 @@ static void mipid02_set_fmt_source(struct v4l2_subdev *sd,
&gt;  		format-&gt;format = bridge-&gt;fmt;
&gt;  	else
&gt;  		format-&gt;format = *v4l2_subdev_state_get_format(sd_state,
&gt; -						               MIPID02_SINK_0);
&gt; +							       MIPID02_SINK_0);
&gt;
&gt;  	/* but code may need to be converted */
&gt;  	format-&gt;format.code = serial_to_parallel_code(format-&gt;format.code);
&gt; diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
&gt; index 117912d3bfbd..96353648c032 100644
&gt; --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
&gt; +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
&gt; @@ -319,7 +319,7 @@ static void rkisp1_isp_start(struct rkisp1_isp *isp,
&gt;  	rkisp1_write(rkisp1, RKISP1_CIF_ISP_CTRL, val);
&gt;
&gt;  	src_fmt = v4l2_subdev_state_get_format(sd_state,
&gt; -				               RKISP1_ISP_PAD_SOURCE_VIDEO);
&gt; +					       RKISP1_ISP_PAD_SOURCE_VIDEO);
&gt;  	src_info = rkisp1_mbus_info_get_by_code(src_fmt-&gt;code);
&gt;
&gt;  	if (src_info-&gt;pixel_enc != V4L2_PIXEL_ENC_BAYER)
&gt; @@ -475,9 +475,9 @@ static void rkisp1_isp_set_src_fmt(struct rkisp1_isp *isp,
&gt;  	sink_fmt = v4l2_subdev_state_get_format(sd_state,
&gt;  						RKISP1_ISP_PAD_SINK_VIDEO);
&gt;  	src_fmt = v4l2_subdev_state_get_format(sd_state,
&gt; -				               RKISP1_ISP_PAD_SOURCE_VIDEO);
&gt; +					       RKISP1_ISP_PAD_SOURCE_VIDEO);
&gt;  	src_crop = v4l2_subdev_state_get_crop(sd_state,
&gt; -				              RKISP1_ISP_PAD_SOURCE_VIDEO);
&gt; +					      RKISP1_ISP_PAD_SOURCE_VIDEO);
&gt;
&gt;  	/*
&gt;  	 * Media bus code. The ISP can operate in pass-through mode (Bayer in,

Signed-off-by: Sakari Ailus &lt;sakari.ailus@linux.intel.com&gt;
Reviewed-by: Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt;
Signed-off-by: Mauro Carvalho Chehab &lt;mchehab@kernel.org&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>media: vimc: expand the names of vimc entity types</title>
<updated>2022-07-15T13:42:14+00:00</updated>
<author>
<name>Daniel Oakley</name>
<email>daniel.oakley@ideasonboard.com</email>
</author>
<published>2022-06-16T10:07:45+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=ec917d77c57c0b3499442d2148bc4ca3598a5e8a'/>
<id>ec917d77c57c0b3499442d2148bc4ca3598a5e8a</id>
<content type='text'>
When introducing the lens controller, it became apparent that the vimc
entity type names were hard to understand, e.g. vimc_len_type refers to the
lens. The names of the vimc entity types have been expanded to make the
code easier to understand. There is no functional change intended.

Suggested-by: Kieran Bingham &lt;kieran.bingham@ideasonboard.com&gt;
Signed-off-by: Daniel Oakley &lt;daniel.oakley@ideasonboard.com&gt;
Signed-off-by: Shuah Khan &lt;skhan@linuxfoundation.org&gt;
Signed-off-by: Mauro Carvalho Chehab &lt;mchehab@kernel.org&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
When introducing the lens controller, it became apparent that the vimc
entity type names were hard to understand, e.g. vimc_len_type refers to the
lens. The names of the vimc entity types have been expanded to make the
code easier to understand. There is no functional change intended.

Suggested-by: Kieran Bingham &lt;kieran.bingham@ideasonboard.com&gt;
Signed-off-by: Daniel Oakley &lt;daniel.oakley@ideasonboard.com&gt;
Signed-off-by: Shuah Khan &lt;skhan@linuxfoundation.org&gt;
Signed-off-by: Mauro Carvalho Chehab &lt;mchehab@kernel.org&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>media: v4l2-subdev: add subdev-wide state struct</title>
<updated>2021-06-17T08:01:27+00:00</updated>
<author>
<name>Tomi Valkeinen</name>
<email>tomi.valkeinen@ideasonboard.com</email>
</author>
<published>2021-06-10T14:55:58+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=0d346d2a6f54f06f36b224fd27cd6eafe8c83be9'/>
<id>0d346d2a6f54f06f36b224fd27cd6eafe8c83be9</id>
<content type='text'>
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,
	 				&amp;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, &amp;sel-&gt;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-&gt;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-&gt;width = camif-&gt;camif_crop.width;
	 		mf-&gt;height = camif-&gt;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-&gt;code = camif-&gt;mbus_fmt.code;
	 		mf-&gt;width = crop-&gt;width;

The semantic patch is:

// &lt;smpl&gt;

// Change function parameter

@@
identifier func;
identifier cfg;
@@

 func(...,
-   struct v4l2_subdev_pad_config *cfg
+   struct v4l2_subdev_state *sd_state
    , ...)
 {
 &lt;...
- cfg
+ sd_state
 ...&gt;
 }

// 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 = &amp;pad_cfg };

    &lt;+...

(
    v4l2_subdev_call
|
    sensor_call
|
    isi_try_fse
|
    isc_try_fse
|
    saa_call_all
)
    (...,
-   &amp;pad_cfg
+   &amp;pad_state
    ,...)

    ...+&gt;
}

// If the function uses fields from pad_config, access via state-&gt;pads

@@
identifier func;
identifier state;
@@
 func(...,
    struct v4l2_subdev_state *state
    , ...)
 {
    &lt;...
(
-   state-&gt;try_fmt
+   state-&gt;pads-&gt;try_fmt
|
-   state-&gt;try_crop
+   state-&gt;pads-&gt;try_crop
|
-   state-&gt;try_compose
+   state-&gt;pads-&gt;try_compose
)
    ...&gt;
}

// If the function accesses the filehandle, use fh-&gt;state instead

@@
struct v4l2_subdev_fh *fh;
@@
-    fh-&gt;pad
+    fh-&gt;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-&gt;config =
-    v4l2_subdev_alloc_pad_config
+    v4l2_subdev_alloc_state
    (&amp;entity-&gt;subdev);
    ...
}

@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
    ...
-   v4l2_subdev_free_pad_config
+   v4l2_subdev_free_state
    (entity-&gt;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);
    &lt;...
-   pad_cfg
+   sd_state
    ...&gt;
-   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-&gt;pad_cfg };
    ...
-   rsz-&gt;pad_cfg
+   &amp;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-&gt;pad_cfg };
    ...
-   isp-&gt;pad_cfg
+   &amp;state
    ...
 }

@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@

 rkisp1_isp_register(...)
 {
+   struct v4l2_subdev_state state = { .pads = rkisp1-&gt;isp.pad_cfg };
    ...
-   rkisp1-&gt;isp.pad_cfg
+   &amp;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);
    &lt;...
-   pad_cfg
+   sd_state
    ...&gt;
-   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;
    &lt;...
-   sd_state-&gt;try_crop
+   sd_state-&gt;pads-&gt;try_crop
    ...&gt;
 }

// End of tegra-video specific

// &lt;/smpl&gt;

Signed-off-by: Tomi Valkeinen &lt;tomi.valkeinen@ideasonboard.com&gt;
Acked-by: Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt;
Acked-by: Sakari Ailus &lt;sakari.ailus@linux.intel.com&gt;
Signed-off-by: Hans Verkuil &lt;hverkuil-cisco@xs4all.nl&gt;
Signed-off-by: Mauro Carvalho Chehab &lt;mchehab+huawei@kernel.org&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
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,
	 				&amp;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, &amp;sel-&gt;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-&gt;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-&gt;width = camif-&gt;camif_crop.width;
	 		mf-&gt;height = camif-&gt;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-&gt;code = camif-&gt;mbus_fmt.code;
	 		mf-&gt;width = crop-&gt;width;

The semantic patch is:

// &lt;smpl&gt;

// Change function parameter

@@
identifier func;
identifier cfg;
@@

 func(...,
-   struct v4l2_subdev_pad_config *cfg
+   struct v4l2_subdev_state *sd_state
    , ...)
 {
 &lt;...
- cfg
+ sd_state
 ...&gt;
 }

// 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 = &amp;pad_cfg };

    &lt;+...

(
    v4l2_subdev_call
|
    sensor_call
|
    isi_try_fse
|
    isc_try_fse
|
    saa_call_all
)
    (...,
-   &amp;pad_cfg
+   &amp;pad_state
    ,...)

    ...+&gt;
}

// If the function uses fields from pad_config, access via state-&gt;pads

@@
identifier func;
identifier state;
@@
 func(...,
    struct v4l2_subdev_state *state
    , ...)
 {
    &lt;...
(
-   state-&gt;try_fmt
+   state-&gt;pads-&gt;try_fmt
|
-   state-&gt;try_crop
+   state-&gt;pads-&gt;try_crop
|
-   state-&gt;try_compose
+   state-&gt;pads-&gt;try_compose
)
    ...&gt;
}

// If the function accesses the filehandle, use fh-&gt;state instead

@@
struct v4l2_subdev_fh *fh;
@@
-    fh-&gt;pad
+    fh-&gt;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-&gt;config =
-    v4l2_subdev_alloc_pad_config
+    v4l2_subdev_alloc_state
    (&amp;entity-&gt;subdev);
    ...
}

@@
symbol entity;
@@
vsp1_entity_destroy(...)
{
    ...
-   v4l2_subdev_free_pad_config
+   v4l2_subdev_free_state
    (entity-&gt;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);
    &lt;...
-   pad_cfg
+   sd_state
    ...&gt;
-   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-&gt;pad_cfg };
    ...
-   rsz-&gt;pad_cfg
+   &amp;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-&gt;pad_cfg };
    ...
-   isp-&gt;pad_cfg
+   &amp;state
    ...
 }

@@
symbol rkisp1;
symbol isp;
symbol pad_cfg;
@@

 rkisp1_isp_register(...)
 {
+   struct v4l2_subdev_state state = { .pads = rkisp1-&gt;isp.pad_cfg };
    ...
-   rkisp1-&gt;isp.pad_cfg
+   &amp;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);
    &lt;...
-   pad_cfg
+   sd_state
    ...&gt;
-   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;
    &lt;...
-   sd_state-&gt;try_crop
+   sd_state-&gt;pads-&gt;try_crop
    ...&gt;
 }

// End of tegra-video specific

// &lt;/smpl&gt;

Signed-off-by: Tomi Valkeinen &lt;tomi.valkeinen@ideasonboard.com&gt;
Acked-by: Laurent Pinchart &lt;laurent.pinchart@ideasonboard.com&gt;
Acked-by: Sakari Ailus &lt;sakari.ailus@linux.intel.com&gt;
Signed-off-by: Hans Verkuil &lt;hverkuil-cisco@xs4all.nl&gt;
Signed-off-by: Mauro Carvalho Chehab &lt;mchehab+huawei@kernel.org&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>media: vimc: Add a control to display info on test image</title>
<updated>2020-07-19T11:39:22+00:00</updated>
<author>
<name>Kaaira Gupta</name>
<email>kgupta@es.iitr.ac.in</email>
</author>
<published>2020-07-05T13:53:06+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=5f3fb5c54d67670fa6743d2434a5bd43a97c01de'/>
<id>5f3fb5c54d67670fa6743d2434a5bd43a97c01de</id>
<content type='text'>
Add a control in VIMC to display information such as the correct order of
colors for a given test pattern, counter, brightness, hue, saturation,
contrast, width and height at sensor over test image.

Signed-off-by: Kaaira Gupta &lt;kgupta@es.iitr.ac.in&gt;
Acked-by: Helen Koike &lt;helen.koike@collabora.com&gt;
Reviewed-by: Kieran Bingham &lt;kieran.bingham@ideasonboard.com&gt;
Signed-off-by: Hans Verkuil &lt;hverkuil-cisco@xs4all.nl&gt;
Signed-off-by: Mauro Carvalho Chehab &lt;mchehab+huawei@kernel.org&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Add a control in VIMC to display information such as the correct order of
colors for a given test pattern, counter, brightness, hue, saturation,
contrast, width and height at sensor over test image.

Signed-off-by: Kaaira Gupta &lt;kgupta@es.iitr.ac.in&gt;
Acked-by: Helen Koike &lt;helen.koike@collabora.com&gt;
Reviewed-by: Kieran Bingham &lt;kieran.bingham@ideasonboard.com&gt;
Signed-off-by: Hans Verkuil &lt;hverkuil-cisco@xs4all.nl&gt;
Signed-off-by: Mauro Carvalho Chehab &lt;mchehab+huawei@kernel.org&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>media: vimc: Support multiple media bus codes for each pixelformat</title>
<updated>2020-05-05T15:25:14+00:00</updated>
<author>
<name>Nícolas F. R. A. Prado</name>
<email>nfraprado@protonmail.com</email>
</author>
<published>2020-05-01T13:11:02+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=b77da87c84f8d3f0290ef96f72edac9a9d2b1d23'/>
<id>b77da87c84f8d3f0290ef96f72edac9a9d2b1d23</id>
<content type='text'>
Change vimc_pix_map_list to allow multiple media bus codes to map to the
same pixelformat, making it possible to add media bus codes for which
there are no pixelformat.

Acked-by: Helen Koike &lt;helen.koike@collabora.com&gt;
Signed-off-by: Nícolas F. R. A. Prado &lt;nfraprado@protonmail.com&gt;
Signed-off-by: Hans Verkuil &lt;hverkuil-cisco@xs4all.nl&gt;
[hverkuil-cisco@xs4all.nl: fix sparse warning: const u32 -&gt; u32]
Signed-off-by: Mauro Carvalho Chehab &lt;mchehab+huawei@kernel.org&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Change vimc_pix_map_list to allow multiple media bus codes to map to the
same pixelformat, making it possible to add media bus codes for which
there are no pixelformat.

Acked-by: Helen Koike &lt;helen.koike@collabora.com&gt;
Signed-off-by: Nícolas F. R. A. Prado &lt;nfraprado@protonmail.com&gt;
Signed-off-by: Hans Verkuil &lt;hverkuil-cisco@xs4all.nl&gt;
[hverkuil-cisco@xs4all.nl: fix sparse warning: const u32 -&gt; u32]
Signed-off-by: Mauro Carvalho Chehab &lt;mchehab+huawei@kernel.org&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>media: vimc: cap: Report a colorspace</title>
<updated>2020-04-29T10:02:30+00:00</updated>
<author>
<name>Niklas Söderlund</name>
<email>niklas.soderlund+renesas@ragnatech.se</email>
</author>
<published>2020-04-17T15:09:29+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=9a42a5ff3daccc37ae4dbcfb6ce5c5d95419740b'/>
<id>9a42a5ff3daccc37ae4dbcfb6ce5c5d95419740b</id>
<content type='text'>
The colorspace reported by a video nodes should not be
V4L2_COLORSPACE_DEFAULT. Instead a default colorspace should be picked
by the driver if V4L2_COLORSPACE_DEFAULT is given by userspace to
{G,S,TRY}_FMT.

The colorspace V4L2_COLORSPACE_SRGB is arbitrary chosen as the vimc
default format to report as it's used for most webcams.

Signed-off-by: Niklas Söderlund &lt;niklas.soderlund+renesas@ragnatech.se&gt;
Acked-by: Helen Koike &lt;helen.koike@collabora.com&gt;
Signed-off-by: Hans Verkuil &lt;hverkuil-cisco@xs4all.nl&gt;
Signed-off-by: Mauro Carvalho Chehab &lt;mchehab+huawei@kernel.org&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
The colorspace reported by a video nodes should not be
V4L2_COLORSPACE_DEFAULT. Instead a default colorspace should be picked
by the driver if V4L2_COLORSPACE_DEFAULT is given by userspace to
{G,S,TRY}_FMT.

The colorspace V4L2_COLORSPACE_SRGB is arbitrary chosen as the vimc
default format to report as it's used for most webcams.

Signed-off-by: Niklas Söderlund &lt;niklas.soderlund+renesas@ragnatech.se&gt;
Acked-by: Helen Koike &lt;helen.koike@collabora.com&gt;
Signed-off-by: Hans Verkuil &lt;hverkuil-cisco@xs4all.nl&gt;
Signed-off-by: Mauro Carvalho Chehab &lt;mchehab+huawei@kernel.org&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>media: media/test_drivers: rename to test-drivers</title>
<updated>2020-04-16T08:38:31+00:00</updated>
<author>
<name>Hans Verkuil</name>
<email>hverkuil-cisco@xs4all.nl</email>
</author>
<published>2020-04-16T08:25:59+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=dacca5f0fa69f04c2e70aad9847e8250b459971c'/>
<id>dacca5f0fa69f04c2e70aad9847e8250b459971c</id>
<content type='text'>
We never use _ in directory names in the media subsystem, so
rename to test-drivers instead for consistency.

Also update MAINTAINERS with the new path.

Signed-off-by: Hans Verkuil &lt;hverkuil-cisco@xs4all.nl&gt;
Signed-off-by: Mauro Carvalho Chehab &lt;mchehab+huawei@kernel.org&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
We never use _ in directory names in the media subsystem, so
rename to test-drivers instead for consistency.

Also update MAINTAINERS with the new path.

Signed-off-by: Hans Verkuil &lt;hverkuil-cisco@xs4all.nl&gt;
Signed-off-by: Mauro Carvalho Chehab &lt;mchehab+huawei@kernel.org&gt;
</pre>
</div>
</content>
</entry>
</feed>
