All the mail mirrored from lore.kernel.org
 help / color / mirror / Atom feed
From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	linux-media@vger.kernel.org
Cc: Dave Stevenson <dave.stevenson@raspberrypi.com>,
	David Plowman <david.plowman@raspberrypi.com>,
	Jean-Michel Hautbois <jeanmichel.hautbois@yoseli.org>,
	Hans Verkuil <hverkuil-cisco@xs4all.nl>,
	Naushir Patuck <naush@raspberrypi.com>,
	Sakari Ailus <sakari.ailus@linux.intel.com>,
	kernel-list@raspberrypi.com,
	linux-rpi-kernel@lists.infradead.org,
	Florian Fainelli <florian.fainelli@broadcom.com>,
	Ray Jui <rjui@broadcom.com>,
	Scott Branden <sbranden@broadcom.com>,
	bcm-kernel-feedback-list@broadcom.com
Subject: Re: [PATCH v7 04/15] media: i2c: imx219: Report streams using frame descriptors
Date: Wed, 27 Mar 2024 12:08:22 +0200	[thread overview]
Message-ID: <0f3d4f4a-bc0a-43ac-aa5c-8cc7a54417d9@ideasonboard.com> (raw)
In-Reply-To: <20240324220854.15010-5-laurent.pinchart@ideasonboard.com>

On 25/03/2024 00:08, Laurent Pinchart wrote:
> Implement the .get_frame_desc() subdev operation to report information
> about streams to the connected CSI-2 receiver. This is required to let
> the CSI-2 receiver driver know about virtual channels and data types for
> each stream.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
> ---
> Changes since v6:
> 
> - Replace v4l2_subdev_state_get_stream_format() with
>    v4l2_subdev_state_get_format()
> - Make imx219_format_bpp() return an unsigned int
> ---
>   drivers/media/i2c/imx219.c | 67 ++++++++++++++++++++++++++++----------
>   1 file changed, 50 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
> index 6602250834be..fa64bc402c9a 100644
> --- a/drivers/media/i2c/imx219.c
> +++ b/drivers/media/i2c/imx219.c
> @@ -23,6 +23,7 @@
>   #include <linux/pm_runtime.h>
>   #include <linux/regulator/consumer.h>
>   
> +#include <media/mipi-csi2.h>
>   #include <media/v4l2-cci.h>
>   #include <media/v4l2-ctrls.h>
>   #include <media/v4l2-device.h>
> @@ -591,6 +592,24 @@ static void imx219_free_controls(struct imx219 *imx219)
>    * Subdev operations
>    */
>   
> +static unsigned int imx219_format_bpp(u32 code)
> +{
> +	switch (code) {
> +	case MEDIA_BUS_FMT_SRGGB8_1X8:
> +	case MEDIA_BUS_FMT_SGRBG8_1X8:
> +	case MEDIA_BUS_FMT_SGBRG8_1X8:
> +	case MEDIA_BUS_FMT_SBGGR8_1X8:
> +		return 8;
> +
> +	case MEDIA_BUS_FMT_SRGGB10_1X10:
> +	case MEDIA_BUS_FMT_SGRBG10_1X10:
> +	case MEDIA_BUS_FMT_SGBRG10_1X10:
> +	case MEDIA_BUS_FMT_SBGGR10_1X10:
> +	default:
> +		return 10;
> +	}
> +}
> +
>   static int imx219_set_framefmt(struct imx219 *imx219,
>   			       struct v4l2_subdev_state *state)
>   {
> @@ -602,23 +621,7 @@ static int imx219_set_framefmt(struct imx219 *imx219,
>   
>   	format = v4l2_subdev_state_get_format(state, IMX219_PAD_SOURCE);
>   	crop = v4l2_subdev_state_get_crop(state, IMX219_PAD_IMAGE);
> -
> -	switch (format->code) {
> -	case MEDIA_BUS_FMT_SRGGB8_1X8:
> -	case MEDIA_BUS_FMT_SGRBG8_1X8:
> -	case MEDIA_BUS_FMT_SGBRG8_1X8:
> -	case MEDIA_BUS_FMT_SBGGR8_1X8:
> -		bpp = 8;
> -		break;
> -
> -	case MEDIA_BUS_FMT_SRGGB10_1X10:
> -	case MEDIA_BUS_FMT_SGRBG10_1X10:
> -	case MEDIA_BUS_FMT_SGBRG10_1X10:
> -	case MEDIA_BUS_FMT_SBGGR10_1X10:
> -	default:
> -		bpp = 10;
> -		break;
> -	}
> +	bpp = imx219_format_bpp(format->code);
>   
>   	cci_write(imx219->regmap, IMX219_REG_X_ADD_STA_A,
>   		  crop->left - IMX219_PIXEL_ARRAY_LEFT, &ret);
> @@ -1029,6 +1032,35 @@ static int imx219_init_state(struct v4l2_subdev *sd,
>   	return 0;
>   }
>   
> +static int imx219_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad,
> +				 struct v4l2_mbus_frame_desc *fd)
> +{
> +	const struct v4l2_mbus_framefmt *fmt;
> +	struct v4l2_subdev_state *state;
> +	u32 code;
> +
> +	if (pad != IMX219_PAD_SOURCE)
> +		return -EINVAL;
> +
> +	state = v4l2_subdev_lock_and_get_active_state(sd);
> +	fmt = v4l2_subdev_state_get_format(state, IMX219_PAD_SOURCE, 0);

I was going to say change 0 to IMX219_STREAM_IMAGE, but you only add it 
in the next patch. Perhaps a pointless reshuffling, but you could 
introduce IMX219_STREAM_IMAGE in patch 3, or maybe as a separate patch, 
so that in patch 5 (embedded data) you don't need to convert the lines 
related to the image stream.

> +	code = fmt->code;
> +	v4l2_subdev_unlock_state(state);
> +
> +	fd->type = V4L2_MBUS_FRAME_DESC_TYPE_CSI2;
> +	fd->num_entries = 1;
> +
> +	memset(fd->entry, 0, sizeof(fd->entry));

The whole fd has been already cleared in call_get_frame_desc().

> +
> +	fd->entry[0].pixelcode = code;
> +	fd->entry[0].stream = 0;
> +	fd->entry[0].bus.csi2.vc = 0;
> +	fd->entry[0].bus.csi2.dt = imx219_format_bpp(code) == 8
> +				 ? MIPI_CSI2_DT_RAW8 : MIPI_CSI2_DT_RAW10;
> +
> +	return 0;
> +}
> +
>   static const struct v4l2_subdev_core_ops imx219_core_ops = {
>   	.subscribe_event = v4l2_ctrl_subdev_subscribe_event,
>   	.unsubscribe_event = v4l2_event_subdev_unsubscribe,
> @@ -1044,6 +1076,7 @@ static const struct v4l2_subdev_pad_ops imx219_pad_ops = {
>   	.set_fmt = imx219_set_pad_format,
>   	.get_selection = imx219_get_selection,
>   	.enum_frame_size = imx219_enum_frame_size,
> +	.get_frame_desc = imx219_get_frame_desc,
>   };
>   
>   static const struct v4l2_subdev_ops imx219_subdev_ops = {

  Tomi


  reply	other threads:[~2024-03-27 10:08 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-24 22:08 [PATCH v7 00/15] media: Add driver for the Raspberry Pi <5 CSI-2 receiver Laurent Pinchart
2024-03-24 22:08 ` [PATCH v7 01/15] media: i2c: imx219: Inline imx219_update_pad_format() in its caller Laurent Pinchart
2024-03-24 22:08 ` [PATCH v7 02/15] media: i2c: imx219: Add internal image sink pad Laurent Pinchart
2024-03-27  9:51   ` Tomi Valkeinen
2024-03-28 16:09     ` Laurent Pinchart
2024-03-28 16:18       ` Tomi Valkeinen
2024-03-28 16:56         ` Laurent Pinchart
2024-03-24 22:08 ` [PATCH v7 03/15] media: i2c: imx219: Report internal routes to userspace Laurent Pinchart
2024-03-27  9:56   ` Tomi Valkeinen
2024-04-04  8:19   ` Tomi Valkeinen
2024-04-04  8:29     ` Sakari Ailus
2024-04-04 10:29       ` Tomi Valkeinen
2024-04-04 10:34       ` Laurent Pinchart
2024-03-24 22:08 ` [PATCH v7 04/15] media: i2c: imx219: Report streams using frame descriptors Laurent Pinchart
2024-03-27 10:08   ` Tomi Valkeinen [this message]
2024-03-28 17:17     ` Laurent Pinchart
2024-03-24 22:08 ` [PATCH v7 05/15] media: i2c: imx219: Add embedded data support Laurent Pinchart
2024-03-26 23:30   ` Sakari Ailus
2024-03-27  0:22     ` Laurent Pinchart
2024-03-27  6:52       ` Sakari Ailus
2024-03-27 10:51   ` Tomi Valkeinen
2024-03-28 21:49     ` Laurent Pinchart
2024-03-29  9:13       ` Tomi Valkeinen
2024-03-24 22:08 ` [PATCH v7 06/15] media: v4l: Add V4L2-PIX-FMT-Y12P format Laurent Pinchart
2024-03-27 11:08   ` Tomi Valkeinen
2024-03-27 11:18     ` Laurent Pinchart
2024-03-24 22:08 ` [PATCH v7 07/15] media: v4l: Add V4L2-PIX-FMT-Y14P format Laurent Pinchart
2024-03-24 22:08 ` [PATCH v7 08/15] dt-bindings: media: Add bindings for bcm2835-unicam Laurent Pinchart
2024-03-24 22:08 ` [PATCH v7 09/15] media: bcm2835-unicam: Add support for CCP2/CSI2 camera interface Laurent Pinchart
2024-03-27 11:21   ` Tomi Valkeinen
2024-04-01 13:52     ` Laurent Pinchart
2024-04-02  6:00       ` Tomi Valkeinen
2024-04-02  6:05         ` Laurent Pinchart
2024-03-24 22:08 ` [PATCH v7 10/15] ARM: dts: bcm2835-rpi: Move firmware-clocks from bcm2711 to bcm2835 Laurent Pinchart
2024-03-24 22:08 ` [PATCH v7 11/15] ARM: dts: bcm2835: Add Unicam CSI nodes Laurent Pinchart
2024-03-24 22:08 ` [PATCH v7 12/15] ARM: dts: bcm2711-rpi: Add pinctrl-based multiplexing for I2C0 Laurent Pinchart
2024-03-24 22:08 ` [PATCH v7 13/15] ARM: dts: bcm2711-rpi-cm4-io: Add RTC on I2C0 Laurent Pinchart
2024-03-24 22:08 ` [PATCH v7 14/15] ARM: dts: bcm2711-rpi-4-b: Add CAM1 regulator Laurent Pinchart
2024-03-24 22:08 ` [PATCH v7 15/15] [DNI] arm64: dts: broadcom: Add overlay for Raspberry Pi 4B IMX219 camera Laurent Pinchart
2024-03-25 13:55 ` [PATCH v7 00/15] media: Add driver for the Raspberry Pi <5 CSI-2 receiver Rob Herring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0f3d4f4a-bc0a-43ac-aa5c-8cc7a54417d9@ideasonboard.com \
    --to=tomi.valkeinen@ideasonboard.com \
    --cc=bcm-kernel-feedback-list@broadcom.com \
    --cc=dave.stevenson@raspberrypi.com \
    --cc=david.plowman@raspberrypi.com \
    --cc=florian.fainelli@broadcom.com \
    --cc=hverkuil-cisco@xs4all.nl \
    --cc=jeanmichel.hautbois@yoseli.org \
    --cc=kernel-list@raspberrypi.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-rpi-kernel@lists.infradead.org \
    --cc=naush@raspberrypi.com \
    --cc=rjui@broadcom.com \
    --cc=sakari.ailus@linux.intel.com \
    --cc=sbranden@broadcom.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.