From: Paul Kocialkowski <paul.kocialkowski@bootlin.com> To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Cc: Yong Deng <yong.deng@magewell.com>, Paul Kocialkowski <paul.kocialkowski@bootlin.com>, Mauro Carvalho Chehab <mchehab@kernel.org>, Chen-Yu Tsai <wens@csie.org>, Jernej Skrabec <jernej.skrabec@gmail.com>, Samuel Holland <samuel@sholland.org>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Maxime Ripard <mripard@kernel.org>, Thomas Petazzoni <thomas.petazzoni@bootlin.com> Subject: [PATCH v7 20/28] media: sun6i-csi: Get bridge subdev directly in capture stream ops Date: Thu, 3 Nov 2022 17:31:05 +0100 [thread overview] Message-ID: <20221103163113.245462-21-paul.kocialkowski@bootlin.com> (raw) In-Reply-To: <20221103163113.245462-1-paul.kocialkowski@bootlin.com> The remote subdev connected to the capture video device is always our bridge, so get the bridge subdev directly instead of using a dedicated helper (which is removed by this commit). Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com> --- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 30 ++----------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c index 35a30fcbad98..e59a219ca480 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c @@ -42,22 +42,6 @@ void sun6i_csi_capture_format(struct sun6i_csi_device *csi_dev, *field = csi_dev->capture.format.fmt.pix.field; } -static struct v4l2_subdev * -sun6i_csi_capture_remote_subdev(struct sun6i_csi_capture *capture, u32 *pad) -{ - struct media_pad *remote; - - remote = media_pad_remote_pad_first(&video->pad); - - if (!remote || !is_media_entity_v4l2_subdev(remote->entity)) - return NULL; - - if (pad) - *pad = remote->index; - - return media_entity_to_v4l2_subdev(remote->entity); -} - /* Format */ static const struct sun6i_csi_capture_format sun6i_csi_capture_formats[] = { @@ -822,8 +806,8 @@ static int sun6i_csi_capture_start_streaming(struct vb2_queue *queue, struct sun6i_csi_capture *capture = &csi_dev->capture; struct sun6i_csi_capture_state *state = &capture->state; struct video_device *video_dev = &capture->video_dev; + struct v4l2_subdev *subdev = &csi_dev->bridge.subdev; struct device *dev = csi_dev->dev; - struct v4l2_subdev *subdev; int ret; state->sequence = 0; @@ -832,12 +816,6 @@ static int sun6i_csi_capture_start_streaming(struct vb2_queue *queue, if (ret < 0) goto error_state; - subdev = sun6i_csi_capture_remote_subdev(capture, NULL); - if (!subdev) { - ret = -EINVAL; - goto error_media_pipeline; - } - /* PM */ ret = pm_runtime_resume_and_get(dev); @@ -886,12 +864,10 @@ static void sun6i_csi_capture_stop_streaming(struct vb2_queue *queue) { struct sun6i_csi_device *csi_dev = vb2_get_drv_priv(queue); struct sun6i_csi_capture *capture = &csi_dev->capture; + struct v4l2_subdev *subdev = &csi_dev->bridge.subdev; struct device *dev = csi_dev->dev; - struct v4l2_subdev *subdev; - subdev = sun6i_csi_capture_remote_subdev(capture, NULL); - if (subdev) - v4l2_subdev_call(subdev, video, s_stream, 0); + v4l2_subdev_call(subdev, video, s_stream, 0); sun6i_csi_capture_disable(csi_dev); sun6i_csi_capture_irq_disable(csi_dev); -- 2.38.1
WARNING: multiple messages have this Message-ID (diff)
From: Paul Kocialkowski <paul.kocialkowski@bootlin.com> To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Cc: Yong Deng <yong.deng@magewell.com>, Paul Kocialkowski <paul.kocialkowski@bootlin.com>, Mauro Carvalho Chehab <mchehab@kernel.org>, Chen-Yu Tsai <wens@csie.org>, Jernej Skrabec <jernej.skrabec@gmail.com>, Samuel Holland <samuel@sholland.org>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Maxime Ripard <mripard@kernel.org>, Thomas Petazzoni <thomas.petazzoni@bootlin.com> Subject: [PATCH v7 20/28] media: sun6i-csi: Get bridge subdev directly in capture stream ops Date: Thu, 3 Nov 2022 17:31:05 +0100 [thread overview] Message-ID: <20221103163113.245462-21-paul.kocialkowski@bootlin.com> (raw) In-Reply-To: <20221103163113.245462-1-paul.kocialkowski@bootlin.com> The remote subdev connected to the capture video device is always our bridge, so get the bridge subdev directly instead of using a dedicated helper (which is removed by this commit). Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com> --- .../sunxi/sun6i-csi/sun6i_csi_capture.c | 30 ++----------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c index 35a30fcbad98..e59a219ca480 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c @@ -42,22 +42,6 @@ void sun6i_csi_capture_format(struct sun6i_csi_device *csi_dev, *field = csi_dev->capture.format.fmt.pix.field; } -static struct v4l2_subdev * -sun6i_csi_capture_remote_subdev(struct sun6i_csi_capture *capture, u32 *pad) -{ - struct media_pad *remote; - - remote = media_pad_remote_pad_first(&video->pad); - - if (!remote || !is_media_entity_v4l2_subdev(remote->entity)) - return NULL; - - if (pad) - *pad = remote->index; - - return media_entity_to_v4l2_subdev(remote->entity); -} - /* Format */ static const struct sun6i_csi_capture_format sun6i_csi_capture_formats[] = { @@ -822,8 +806,8 @@ static int sun6i_csi_capture_start_streaming(struct vb2_queue *queue, struct sun6i_csi_capture *capture = &csi_dev->capture; struct sun6i_csi_capture_state *state = &capture->state; struct video_device *video_dev = &capture->video_dev; + struct v4l2_subdev *subdev = &csi_dev->bridge.subdev; struct device *dev = csi_dev->dev; - struct v4l2_subdev *subdev; int ret; state->sequence = 0; @@ -832,12 +816,6 @@ static int sun6i_csi_capture_start_streaming(struct vb2_queue *queue, if (ret < 0) goto error_state; - subdev = sun6i_csi_capture_remote_subdev(capture, NULL); - if (!subdev) { - ret = -EINVAL; - goto error_media_pipeline; - } - /* PM */ ret = pm_runtime_resume_and_get(dev); @@ -886,12 +864,10 @@ static void sun6i_csi_capture_stop_streaming(struct vb2_queue *queue) { struct sun6i_csi_device *csi_dev = vb2_get_drv_priv(queue); struct sun6i_csi_capture *capture = &csi_dev->capture; + struct v4l2_subdev *subdev = &csi_dev->bridge.subdev; struct device *dev = csi_dev->dev; - struct v4l2_subdev *subdev; - subdev = sun6i_csi_capture_remote_subdev(capture, NULL); - if (subdev) - v4l2_subdev_call(subdev, video, s_stream, 0); + v4l2_subdev_call(subdev, video, s_stream, 0); sun6i_csi_capture_disable(csi_dev); sun6i_csi_capture_irq_disable(csi_dev); -- 2.38.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-11-03 16:32 UTC|newest] Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-11-03 16:30 [PATCH v7 00/28] Allwinner A31/A83T MIPI CSI-2 and A31 ISP / CSI Rework Paul Kocialkowski 2022-11-03 16:30 ` Paul Kocialkowski 2022-11-03 16:30 ` [PATCH v7 01/28] media: sun6i-csi: Add bridge v4l2 subdev with port management Paul Kocialkowski 2022-11-03 16:30 ` Paul Kocialkowski 2022-11-09 18:23 ` kernel test robot 2022-11-03 16:30 ` [PATCH v7 02/28] media: sun6i-csi: Rename sun6i_video to sun6i_csi_capture Paul Kocialkowski 2022-11-03 16:30 ` Paul Kocialkowski 2022-11-14 10:06 ` Sakari Ailus 2022-11-14 10:06 ` Sakari Ailus 2022-11-03 16:30 ` [PATCH v7 03/28] media: sun6i-csi: Add capture state using vsync for page flip Paul Kocialkowski 2022-11-03 16:30 ` Paul Kocialkowski 2022-11-03 16:30 ` [PATCH v7 04/28] media: sun6i-csi: Rework register definitions, invert misleading fields Paul Kocialkowski 2022-11-03 16:30 ` Paul Kocialkowski 2022-11-03 16:30 ` [PATCH v7 05/28] media: sun6i-csi: Add dimensions and format helpers to capture Paul Kocialkowski 2022-11-03 16:30 ` Paul Kocialkowski 2022-11-03 16:30 ` [PATCH v7 06/28] media: sun6i-csi: Implement address configuration without indirection Paul Kocialkowski 2022-11-03 16:30 ` Paul Kocialkowski 2022-11-03 16:30 ` [PATCH v7 07/28] media: sun6i-csi: Split stream sequences and irq code in capture Paul Kocialkowski 2022-11-03 16:30 ` Paul Kocialkowski 2022-11-03 16:30 ` [PATCH v7 08/28] media: sun6i-csi: Move power management to runtime pm " Paul Kocialkowski 2022-11-03 16:30 ` Paul Kocialkowski 2022-11-03 16:30 ` [PATCH v7 09/28] media: sun6i-csi: Move register configuration to capture Paul Kocialkowski 2022-11-03 16:30 ` Paul Kocialkowski 2022-11-03 16:30 ` [PATCH v7 10/28] media: sun6i-csi: Rework capture format management with helper Paul Kocialkowski 2022-11-03 16:30 ` Paul Kocialkowski 2022-11-03 16:30 ` [PATCH v7 11/28] media: sun6i-csi: Remove custom format helper and rework configure Paul Kocialkowski 2022-11-03 16:30 ` Paul Kocialkowski 2022-11-03 16:30 ` [PATCH v7 12/28] media: sun6i-csi: Add bridge dimensions and format helpers Paul Kocialkowski 2022-11-03 16:30 ` Paul Kocialkowski 2022-11-03 16:30 ` [PATCH v7 13/28] media: sun6i-csi: Get mbus code from bridge instead of storing it Paul Kocialkowski 2022-11-03 16:30 ` Paul Kocialkowski 2022-11-03 16:30 ` [PATCH v7 14/28] media: sun6i-csi: Tidy capture configure code Paul Kocialkowski 2022-11-03 16:30 ` Paul Kocialkowski 2022-11-03 16:31 ` [PATCH v7 15/28] media: sun6i-csi: Introduce bridge format structure, list and helper Paul Kocialkowski 2022-11-03 16:31 ` Paul Kocialkowski 2022-11-03 16:31 ` [PATCH v7 16/28] media: sun6i-csi: Introduce capture " Paul Kocialkowski 2022-11-03 16:31 ` Paul Kocialkowski 2022-11-03 16:31 ` [PATCH v7 17/28] media: sun6i-csi: Configure registers from format tables Paul Kocialkowski 2022-11-03 16:31 ` Paul Kocialkowski 2022-11-03 16:31 ` [PATCH v7 18/28] media: sun6i-csi: Introduce format match structure, list and helper Paul Kocialkowski 2022-11-03 16:31 ` Paul Kocialkowski 2022-11-11 10:18 ` Sakari Ailus 2022-11-11 10:18 ` Sakari Ailus 2022-11-11 10:21 ` Sakari Ailus 2022-11-11 10:21 ` Sakari Ailus 2022-11-03 16:31 ` [PATCH v7 19/28] media: sun6i-csi: Implement capture link validation with logic Paul Kocialkowski 2022-11-03 16:31 ` Paul Kocialkowski 2022-11-03 16:31 ` Paul Kocialkowski [this message] 2022-11-03 16:31 ` [PATCH v7 20/28] media: sun6i-csi: Get bridge subdev directly in capture stream ops Paul Kocialkowski 2022-11-03 16:31 ` [PATCH v7 21/28] media: sun6i-csi: Move hardware control to the bridge Paul Kocialkowski 2022-11-03 16:31 ` Paul Kocialkowski 2022-11-03 16:31 ` [PATCH v7 22/28] media: sun6i-csi: Rename the capture video device to sun6i-csi-capture Paul Kocialkowski 2022-11-03 16:31 ` Paul Kocialkowski 2022-11-03 16:31 ` [PATCH v7 23/28] media: sun6i-csi: Cleanup headers and includes, update copyright lines Paul Kocialkowski 2022-11-03 16:31 ` Paul Kocialkowski 2022-11-03 16:31 ` [PATCH v7 24/28] media: sun6i-csi: Add support for MIPI CSI-2 to the bridge code Paul Kocialkowski 2022-11-03 16:31 ` Paul Kocialkowski 2022-11-03 16:31 ` [PATCH v7 25/28] media: sun6i-csi: Only configure capture when streaming Paul Kocialkowski 2022-11-03 16:31 ` Paul Kocialkowski 2022-11-03 16:31 ` [PATCH v7 26/28] media: sun6i-csi: Add extra checks to the interrupt routine Paul Kocialkowski 2022-11-03 16:31 ` Paul Kocialkowski 2022-11-03 16:31 ` [PATCH v7 27/28] media: sun6i-csi: Request a shared interrupt Paul Kocialkowski 2022-11-03 16:31 ` Paul Kocialkowski 2022-11-03 16:31 ` [PATCH v7 28/28] MAINTAINERS: Add myself as sun6i-csi maintainer and rename/move entry Paul Kocialkowski 2022-11-03 16:31 ` Paul Kocialkowski 2022-11-09 21:25 [PATCH v7 01/28] media: sun6i-csi: Add bridge v4l2 subdev with port management kernel test robot 2022-11-10 6:57 ` Dan Carpenter 2022-11-10 6:57 ` Dan Carpenter
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=20221103163113.245462-21-paul.kocialkowski@bootlin.com \ --to=paul.kocialkowski@bootlin.com \ --cc=jernej.skrabec@gmail.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-sunxi@lists.linux.dev \ --cc=mchehab@kernel.org \ --cc=mripard@kernel.org \ --cc=samuel@sholland.org \ --cc=thomas.petazzoni@bootlin.com \ --cc=wens@csie.org \ --cc=yong.deng@magewell.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: linkBe 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.