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 v6 40/43] media: sun6i-csi: Only configure capture when streaming
Date: Fri, 26 Aug 2022 20:32:37 +0200 [thread overview]
Message-ID: <20220826183240.604834-41-paul.kocialkowski@bootlin.com> (raw)
In-Reply-To: <20220826183240.604834-1-paul.kocialkowski@bootlin.com>
Add a streaming element to the capture state structure to know if the
capture device is used or not. Only configure things related to output
when streaming, including the output format, irq, state (dma buffer)
and window configuration registers.
After this change, it becomes possible to use the bridge without the
capture device, which will be the case in the isp media flow.
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
.../sunxi/sun6i-csi/sun6i_csi_bridge.c | 50 ++++++++++++-------
.../sunxi/sun6i-csi/sun6i_csi_capture.c | 11 +++-
.../sunxi/sun6i-csi/sun6i_csi_capture.h | 1 +
3 files changed, 41 insertions(+), 21 deletions(-)
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c
index 69c1fa7151d9..492f93b0db28 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c
@@ -338,6 +338,7 @@ sun6i_csi_bridge_configure_mipi_csi2(struct sun6i_csi_device *csi_dev)
static void sun6i_csi_bridge_configure_format(struct sun6i_csi_device *csi_dev)
{
struct regmap *regmap = csi_dev->regmap;
+ bool capture_streaming = csi_dev->capture.state.streaming;
const struct sun6i_csi_bridge_format *bridge_format;
const struct sun6i_csi_capture_format *capture_format;
u32 mbus_code, field, pixelformat;
@@ -353,26 +354,29 @@ static void sun6i_csi_bridge_configure_format(struct sun6i_csi_device *csi_dev)
input_format = bridge_format->input_format;
input_yuv_seq = bridge_format->input_yuv_seq;
- sun6i_csi_capture_format(csi_dev, &pixelformat, NULL);
+ if (capture_streaming) {
+ sun6i_csi_capture_format(csi_dev, &pixelformat, NULL);
- capture_format = sun6i_csi_capture_format_find(pixelformat);
- if (WARN_ON(!capture_format))
- return;
+ capture_format = sun6i_csi_capture_format_find(pixelformat);
+ if (WARN_ON(!capture_format))
+ return;
- if (capture_format->input_format_raw)
- input_format = SUN6I_CSI_INPUT_FMT_RAW;
+ if (capture_format->input_format_raw)
+ input_format = SUN6I_CSI_INPUT_FMT_RAW;
- if (capture_format->input_yuv_seq_invert)
- input_yuv_seq = bridge_format->input_yuv_seq_invert;
+ if (capture_format->input_yuv_seq_invert)
+ input_yuv_seq = bridge_format->input_yuv_seq_invert;
- if (field == V4L2_FIELD_INTERLACED ||
- field == V4L2_FIELD_INTERLACED_TB ||
- field == V4L2_FIELD_INTERLACED_BT)
- output_format = capture_format->output_format_field;
- else
- output_format = capture_format->output_format_frame;
+ if (field == V4L2_FIELD_INTERLACED ||
+ field == V4L2_FIELD_INTERLACED_TB ||
+ field == V4L2_FIELD_INTERLACED_BT)
+ output_format = capture_format->output_format_field;
+ else
+ output_format = capture_format->output_format_frame;
+
+ value |= SUN6I_CSI_CH_CFG_OUTPUT_FMT(output_format);
+ }
- value |= SUN6I_CSI_CH_CFG_OUTPUT_FMT(output_format);
value |= SUN6I_CSI_CH_CFG_INPUT_FMT(input_format);
value |= SUN6I_CSI_CH_CFG_INPUT_YUV_SEQ(input_yuv_seq);
@@ -406,6 +410,7 @@ static int sun6i_csi_bridge_s_stream(struct v4l2_subdev *subdev, int on)
struct sun6i_csi_device *csi_dev = v4l2_get_subdevdata(subdev);
struct sun6i_csi_bridge *bridge = &csi_dev->bridge;
struct media_pad *local_pad = &bridge->pads[SUN6I_CSI_BRIDGE_PAD_SINK];
+ bool capture_streaming = csi_dev->capture.state.streaming;
struct device *dev = csi_dev->dev;
struct sun6i_csi_bridge_source *source;
struct v4l2_subdev *source_subdev;
@@ -447,15 +452,20 @@ static int sun6i_csi_bridge_s_stream(struct v4l2_subdev *subdev, int on)
/* Configure */
sun6i_csi_bridge_configure(csi_dev, source);
- sun6i_csi_capture_configure(csi_dev);
+
+ if (capture_streaming)
+ sun6i_csi_capture_configure(csi_dev);
/* State Update */
- sun6i_csi_capture_state_update(csi_dev);
+ if (capture_streaming)
+ sun6i_csi_capture_state_update(csi_dev);
/* Enable */
- sun6i_csi_bridge_irq_enable(csi_dev);
+ if (capture_streaming)
+ sun6i_csi_bridge_irq_enable(csi_dev);
+
sun6i_csi_bridge_enable(csi_dev);
ret = v4l2_subdev_call(source_subdev, video, s_stream, 1);
@@ -465,7 +475,9 @@ static int sun6i_csi_bridge_s_stream(struct v4l2_subdev *subdev, int on)
return 0;
disable:
- sun6i_csi_bridge_irq_disable(csi_dev);
+ if (capture_streaming)
+ sun6i_csi_bridge_irq_disable(csi_dev);
+
sun6i_csi_bridge_disable(csi_dev);
pm_runtime_put(dev);
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 36ddc190a919..c9e7526b84c4 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c
@@ -616,13 +616,17 @@ static int sun6i_csi_capture_start_streaming(struct vb2_queue *queue,
if (ret < 0)
goto error_state;
+ state->streaming = true;
+
ret = v4l2_subdev_call(subdev, video, s_stream, 1);
if (ret && ret != -ENOIOCTLCMD)
- goto error_media_pipeline;
+ goto error_streaming;
return 0;
-error_media_pipeline:
+error_streaming:
+ state->streaming = false;
+
media_pipeline_stop(&video_dev->entity);
error_state:
@@ -634,11 +638,14 @@ static int sun6i_csi_capture_start_streaming(struct vb2_queue *queue,
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_state *state = &csi_dev->capture.state;
struct video_device *video_dev = &csi_dev->capture.video_dev;
struct v4l2_subdev *subdev = &csi_dev->bridge.subdev;
v4l2_subdev_call(subdev, video, s_stream, 0);
+ state->streaming = false;
+
media_pipeline_stop(&video_dev->entity);
sun6i_csi_capture_state_cleanup(csi_dev, true);
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h
index ceceb030aef6..29893cf96f6b 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h
@@ -44,6 +44,7 @@ struct sun6i_csi_capture_state {
struct sun6i_csi_buffer *complete;
unsigned int sequence;
+ bool streaming;
};
struct sun6i_csi_capture {
--
2.37.1
next prev parent reply other threads:[~2022-08-26 18:33 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-26 18:31 [PATCH v6 00/43] Allwinner A31/A83T MIPI CSI-2 and A31 ISP / CSI Rework Paul Kocialkowski
2022-08-26 18:31 ` [PATCH v6 01/43] media: sun6i-csi: Define and use driver name and (reworked) description Paul Kocialkowski
2022-08-26 18:31 ` [PATCH v6 02/43] media: sun6i-csi: Refactor main driver data structures Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 03/43] media: sun6i-csi: Tidy up platform code Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 04/43] media: sun6i-csi: Always set exclusive module clock rate Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 05/43] media: sun6i-csi: Define and use variant to get " Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 06/43] media: sun6i-csi: Use runtime pm for clocks and reset Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 07/43] media: sun6i-csi: Tidy up Kconfig Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 08/43] media: sun6i-csi: Tidy up v4l2 code Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 09/43] media: sun6i-csi: Tidy up video code Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 10/43] media: sun6i-csi: Pass and store csi device directly in " Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 11/43] media: sun6i-csi: Register the media device after creation Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 12/43] media: sun6i-csi: Remove controls handler from the driver Paul Kocialkowski
2022-10-31 9:06 ` Jernej Škrabec
2022-08-26 18:32 ` [PATCH v6 13/43] media: sun6i-csi: Add media ops with link notify callback Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 14/43] media: sun6i-csi: Introduce and use video helper functions Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 15/43] media: sun6i-csi: Move csi buffer definition to main header file Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 16/43] media: sun6i-csi: Add bridge v4l2 subdev with port management Paul Kocialkowski
2022-10-31 9:10 ` Jernej Škrabec
2022-08-26 18:32 ` [PATCH v6 17/43] media: sun6i-csi: Rename sun6i_video to sun6i_csi_capture Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 18/43] media: sun6i-csi: Add capture state using vsync for page flip Paul Kocialkowski
2022-10-31 9:15 ` Jernej Škrabec
2022-08-26 18:32 ` [PATCH v6 19/43] media: sun6i-csi: Rework register definitions, invert misleading fields Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 20/43] media: sun6i-csi: Add dimensions and format helpers to capture Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 21/43] media: sun6i-csi: Implement address configuration without indirection Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 22/43] media: sun6i-csi: Split stream sequences and irq code in capture Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 23/43] media: sun6i-csi: Move power management to runtime pm " Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 24/43] media: sun6i-csi: Move register configuration to capture Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 25/43] media: sun6i-csi: Rework capture format management with helper Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 26/43] media: sun6i-csi: Remove custom format helper and rework configure Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 27/43] media: sun6i-csi: Add bridge dimensions and format helpers Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 28/43] media: sun6i-csi: Get mbus code from bridge instead of storing it Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 29/43] media: sun6i-csi: Tidy capture configure code Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 30/43] media: sun6i-csi: Introduce bridge format structure, list and helper Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 31/43] media: sun6i-csi: Introduce capture " Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 32/43] media: sun6i-csi: Configure registers from format tables Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 33/43] media: sun6i-csi: Introduce format match structure, list and helper Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 34/43] media: sun6i-csi: Implement capture link validation with logic Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 35/43] media: sun6i-csi: Get bridge subdev directly in capture stream ops Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 36/43] media: sun6i-csi: Move hardware control to the bridge Paul Kocialkowski
2022-10-31 9:18 ` Jernej Škrabec
2022-08-26 18:32 ` [PATCH v6 37/43] media: sun6i-csi: Rename the capture video device to sun6i-csi-capture Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 38/43] media: sun6i-csi: Cleanup headers and includes, update copyright lines Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 39/43] media: sun6i-csi: Add support for MIPI CSI-2 to the bridge code Paul Kocialkowski
2022-08-26 18:32 ` Paul Kocialkowski [this message]
2022-08-26 18:32 ` [PATCH v6 41/43] media: sun6i-csi: Add extra checks to the interrupt routine Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 42/43] media: sun6i-csi: Request a shared interrupt Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 43/43] MAINTAINERS: Add myself as sun6i-csi maintainer and rename/move entry Paul Kocialkowski
2022-09-07 8:47 ` [PATCH v6 00/43] Allwinner A31/A83T MIPI CSI-2 and A31 ISP / CSI Rework Hans Verkuil
2022-09-07 10:03 ` Paul Kocialkowski
2022-10-21 14:13 ` Paul Kocialkowski
2022-10-31 9:21 ` Sakari Ailus
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=20220826183240.604834-41-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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox