Re: [PATCH v3 24/29] media: ti: cal: Use v4l2_subdev_get_frame_desc()

On Mon, Aug 24, 2026 at 03:14:46PM +0300, Sakari Ailus wrote:
> Call v4l2_subdev_get_frame_desc() to obtain the frame descriptor. This is
> preferred over calling the get_frame_desc() pad operation directly.
>
> Signed-off-by: Sakari Ailus <[email protected]>
> ---
>  drivers/media/platform/ti/cal/cal-camerarx.c | 26 +++++------
>  drivers/media/platform/ti/cal/cal.c          | 49 ++++++--------------
>  2 files changed, 27 insertions(+), 48 deletions(-)
>
> diff --git a/drivers/media/platform/ti/cal/cal-camerarx.c b/drivers/media/platform/ti/cal/cal-camerarx.c
> index 00a71dac0ff4..9ea1f3551d22 100644
> --- a/drivers/media/platform/ti/cal/cal-camerarx.c
> +++ b/drivers/media/platform/ti/cal/cal-camerarx.c
> @@ -9,6 +9,7 @@
>   *	Laurent Pinchart <[email protected]>
>   */
>
> +#include <linux/cleanup.h>
>  #include <linux/clk.h>
>  #include <linux/delay.h>
>  #include <linux/mfd/syscon.h>
> @@ -872,7 +873,8 @@ static int cal_camerarx_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad,
>  				       struct v4l2_mbus_frame_desc *fd)
>  {
>  	struct cal_camerarx *phy = to_cal_camerarx(sd);
> -	struct v4l2_mbus_frame_desc remote_desc;
> +	struct v4l2_mbus_frame_desc *remote_desc
> +		__free(v4l2_subdev_free_frame_desc) = NULL;
>  	const struct media_pad *remote_pad;
>  	struct v4l2_subdev_state *state;
>  	u32 sink_stream;
> @@ -893,24 +895,20 @@ static int cal_camerarx_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad,
>  		goto out_unlock;
>  	}
>
> -	ret = v4l2_subdev_call(phy->source, pad, get_frame_desc,
> -			       remote_pad->index, &remote_desc);
> -	if (ret)
> -		goto out_unlock;
> -
> -	if (remote_desc.type != V4L2_MBUS_FRAME_DESC_TYPE_CSI2) {
> -		cal_err(phy->cal,
> -			"Frame descriptor does not describe CSI-2 link");
> -		ret = -EINVAL;
> +	remote_desc =

cleanup prefer declean variable here
	struct v4l2_mbus_frame_desc *remote_desc __free(v4l2_subdev_free_frame_desc)
		=

Frank
> +		v4l2_subdev_get_frame_desc(phy->source, remote_pad->index,
> +					   V4L2_MBUS_FRAME_DESC_TYPE_CSI2);
> +	if (IS_ERR(remote_desc)) {
> +		ret = PTR_ERR(remote_desc);
>  		goto out_unlock;
>  	}
>
> -	for (i = 0; i < remote_desc.num_entries; i++) {
> -		if (remote_desc.entry[i].stream == sink_stream)
> +	for (i = 0; i < remote_desc->num_entries; i++) {
> +		if (remote_desc->entry[i].stream == sink_stream)
>  			break;
>  	}
>
> -	if (i == remote_desc.num_entries) {
> +	if (i == remote_desc->num_entries) {
>  		cal_err(phy->cal, "Stream %u not found in remote frame desc\n",
>  			sink_stream);
>  		ret = -EINVAL;
> @@ -919,7 +917,7 @@ static int cal_camerarx_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad,
>
>  	fd->type = V4L2_MBUS_FRAME_DESC_TYPE_CSI2;
>  	fd->num_entries = 1;
> -	fd->entry[0] = remote_desc.entry[i];
> +	fd->entry[0] = remote_desc->entry[i];
>
>  out_unlock:
>  	v4l2_subdev_unlock_state(state);
> diff --git a/drivers/media/platform/ti/cal/cal.c b/drivers/media/platform/ti/cal/cal.c
> index b7e77b6b8950..20192f90d5b3 100644
> --- a/drivers/media/platform/ti/cal/cal.c
> +++ b/drivers/media/platform/ti/cal/cal.c
> @@ -445,55 +445,36 @@ static bool cal_ctx_wr_dma_stopped(struct cal_ctx *ctx)
>  	return stopped;
>  }
>
> -static int
> -cal_get_remote_frame_desc_entry(struct cal_ctx *ctx,
> -				struct v4l2_mbus_frame_desc_entry *entry)
> +int cal_ctx_prepare(struct cal_ctx *ctx)
>  {
> -	struct v4l2_mbus_frame_desc fd;
>  	struct media_pad *phy_source_pad;
> -	int ret;
>
>  	phy_source_pad = media_pad_remote_pad_first(&ctx->pad);
>  	if (!phy_source_pad)
>  		return -ENODEV;
>
> -	ret = v4l2_subdev_call(&ctx->phy->subdev, pad, get_frame_desc,
> -			       phy_source_pad->index, &fd);
> -	if (ret)
> -		return ret;
> +	struct v4l2_mbus_frame_desc *fd __free(v4l2_subdev_free_frame_desc) =
> +		v4l2_subdev_get_frame_desc(&ctx->phy->subdev,
> +					   phy_source_pad->index,
> +					   V4L2_MBUS_FRAME_DESC_TYPE_CSI2);
> +	if (IS_ERR(fd))
> +		return PTR_ERR(fd);
>
> -	if (fd.num_entries != 1)
> +	if (fd->num_entries != 1)
>  		return -EINVAL;
>
> -	*entry = fd.entry[0];
> +	ctx_dbg(2, ctx, "Framedesc: stream %u, len %u, vc %u, dt %#x\n",
> +		fd->entry[0].stream, fd->entry[0].length,
> +		fd->entry[0].bus.csi2.vc, fd->entry[0].bus.csi2.dt);
>
> -	return 0;
> -}
> -
> -int cal_ctx_prepare(struct cal_ctx *ctx)
> -{
> -	struct v4l2_mbus_frame_desc_entry entry;
> -	int ret;
> -
> -	ret = cal_get_remote_frame_desc_entry(ctx, &entry);
> -
> -	if (ret == -ENOIOCTLCMD) {
> -		ctx->vc = 0;
> -		ctx->datatype = CAL_CSI2_CTX_DT_ANY;
> -	} else if (!ret) {
> -		ctx_dbg(2, ctx, "Framedesc: stream %u, len %u, vc %u, dt %#x\n",
> -			entry.stream, entry.length, entry.bus.csi2.vc,
> -			entry.bus.csi2.dt);
> -
> -		ctx->vc = entry.bus.csi2.vc;
> -		ctx->datatype = entry.bus.csi2.dt;
> -	} else {
> -		return ret;
> -	}
> +	ctx->vc = fd->entry[0].bus.csi2.vc;
> +	ctx->datatype = fd->entry[0].bus.csi2.dt;
>
>  	ctx->use_pix_proc = ctx->vb_vidq.type == V4L2_BUF_TYPE_VIDEO_CAPTURE;
>
>  	if (ctx->use_pix_proc) {
> +		int ret;
> +
>  		ret = cal_reserve_pix_proc(ctx->cal);
>  		if (ret < 0) {
>  			ctx_err(ctx, "Failed to reserve pix proc: %d\n", ret);
> --
> 2.47.3
>