From: Luca Ceresoli <luca.ceresoli@bootlin.com>
To: David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Sowjanya Komatineni <skomatineni@nvidia.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Dmitry Osipenko <digetx@gmail.com>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>
Cc: Luca Ceresoli <luca.ceresoli@bootlin.com>,
linux-media@vger.kernel.org, linux-tegra@vger.kernel.org,
dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
Richard Leitner <richard.leitner@skidata.com>
Subject: [PATCH v2 18/21] staging: media: tegra-video: add hooks for planar YUV and H/V flip
Date: Mon, 28 Nov 2022 16:23:33 +0100 [thread overview]
Message-ID: <20221128152336.133953-19-luca.ceresoli@bootlin.com> (raw)
In-Reply-To: <20221128152336.133953-1-luca.ceresoli@bootlin.com>
Tegra20 supports planar YUV422 capture, which can be implemented by writing
U and V base address registers in addition to the "main" base buffer
address register.
It also supports H and V flip, which among others requires to write the
start address (i.e. the 1st offset to write, at the end of the buffer or
line) in more registers for Y and, for planar formats, U and V.
Add minimal hooks in VI to allow per-SoC optional support to those
features:
- variables in struct tegra_vi for the U and V buffer base offsets
- variables in struct tegra_vi for the Y, U and V buffer start offsets
- an optional per-soc VI operation to compute those values on queue setup
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
---
No changes in v2
---
drivers/staging/media/tegra-video/vi.c | 4 ++++
drivers/staging/media/tegra-video/vi.h | 14 ++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c
index 854ffb4b5617..ebb502a45e96 100644
--- a/drivers/staging/media/tegra-video/vi.c
+++ b/drivers/staging/media/tegra-video/vi.c
@@ -92,6 +92,7 @@ tegra_get_format_by_fourcc(struct tegra_vi *vi, u32 fourcc)
/*
* videobuf2 queue operations
*/
+
static int tegra_channel_queue_setup(struct vb2_queue *vq,
unsigned int *nbuffers,
unsigned int *nplanes,
@@ -107,6 +108,9 @@ static int tegra_channel_queue_setup(struct vb2_queue *vq,
sizes[0] = chan->format.sizeimage;
alloc_devs[0] = chan->vi->dev;
+ if (chan->vi->ops->channel_queue_setup)
+ chan->vi->ops->channel_queue_setup(chan);
+
return 0;
}
diff --git a/drivers/staging/media/tegra-video/vi.h b/drivers/staging/media/tegra-video/vi.h
index ba563cd17296..a23ee8800d33 100644
--- a/drivers/staging/media/tegra-video/vi.h
+++ b/drivers/staging/media/tegra-video/vi.h
@@ -47,6 +47,7 @@ struct tegra_vi_channel;
* @channel_host1x_syncpt_free: free all synchronization points
* @vi_fmt_align: modify `pix` to fit the hardware alignment
* requirements and fill image geometry
+ * @channel_queue_setup: additional operations at the end of vb2_ops::queue_setup
* @vi_start_streaming: starts media pipeline, subdevice streaming, sets up
* VI for capture and runs capture start and capture finish
* kthreads for capturing frames to buffer and returns them back.
@@ -58,6 +59,7 @@ struct tegra_vi_ops {
int (*channel_host1x_syncpt_init)(struct tegra_vi_channel *chan);
void (*channel_host1x_syncpt_free)(struct tegra_vi_channel *chan);
void (*vi_fmt_align)(struct v4l2_pix_format *pix, unsigned int bpp);
+ void (*channel_queue_setup)(struct tegra_vi_channel *chan);
int (*vi_start_streaming)(struct vb2_queue *vq, u32 count);
void (*vi_stop_streaming)(struct vb2_queue *vq);
};
@@ -148,6 +150,12 @@ struct tegra_vi {
* @queue: vb2 buffers queue
* @sequence: V4L2 buffers sequence number
*
+ * @addr_offset_u: U plane base address, relative to buffer base address (only for planar)
+ * @addr_offset_v: V plane base address, relative to buffer base address (only for planar)
+ * @start_offset: 1st Y byte to write, relative to buffer base address (for H/V flip)
+ * @start_offset_u: 1st U byte to write, relative to buffer base address (for H/V flip)
+ * @start_offset_v: 1st V byte to write, relative to buffer base address (for H/V flip)
+ *
* @capture: list of queued buffers for capture
* @start_lock: protects the capture queued list
* @done: list of capture done queued buffers
@@ -188,6 +196,12 @@ struct tegra_vi_channel {
struct vb2_queue queue;
u32 sequence;
+ unsigned int addr_offset_u;
+ unsigned int addr_offset_v;
+ unsigned int start_offset;
+ unsigned int start_offset_u;
+ unsigned int start_offset_v;
+
struct list_head capture;
/* protects the capture queued list */
spinlock_t start_lock;
--
2.34.1
next prev parent reply other threads:[~2022-11-28 15:28 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-28 15:23 [PATCH v2 00/21] Add Tegra20 parallel video input capture Luca Ceresoli
2022-11-28 15:23 ` [PATCH v2 01/21] dt-bindings: display: tegra: add Tegra20 VIP Luca Ceresoli
2022-12-01 23:19 ` Rob Herring
2022-12-02 8:11 ` Luca Ceresoli
2022-12-20 20:13 ` Dmitry Osipenko
2022-12-22 9:03 ` Luca Ceresoli
2022-11-28 15:23 ` [PATCH v2 02/21] dt-bindings: display: tegra: vi: add 'vip' property and example Luca Ceresoli
2022-12-01 23:16 ` Rob Herring
2022-12-02 8:11 ` Luca Ceresoli
2022-12-02 11:34 ` Krzysztof Kozlowski
2022-11-28 15:23 ` [PATCH v2 03/21] staging: media: tegra-video: fix .vidioc_enum_fmt_vid_cap to return all formats Luca Ceresoli
2022-11-28 15:23 ` [PATCH v2 04/21] staging: media: tegra-video: improve documentation of tegra_video_format fields Luca Ceresoli
2022-11-28 15:23 ` [PATCH v2 05/21] staging: media: tegra-video: document tegra_channel_get_remote_source_subdev Luca Ceresoli
2022-11-28 15:23 ` [PATCH v2 06/21] staging: media: tegra-video: fix typos in comment Luca Ceresoli
2022-11-28 15:23 ` [PATCH v2 07/21] staging: media: tegra-video: improve error messages Luca Ceresoli
2022-11-28 15:23 ` [PATCH v2 08/21] staging: media: tegra-video: slightly simplify cleanup on errors Luca Ceresoli
2022-11-28 15:23 ` [PATCH v2 09/21] staging: media: tegra-video: move private struct declaration to C file Luca Ceresoli
2022-11-28 15:23 ` [PATCH v2 10/21] staging: media: tegra-video: remove unneeded include Luca Ceresoli
2022-11-28 15:23 ` [PATCH v2 11/21] staging: media: tegra-video: Kconfig: allow TPG only on Tegra210 Luca Ceresoli
2022-11-28 15:23 ` [PATCH v2 12/21] staging: media: tegra-video: move tegra_channel_fmt_align to a per-soc op Luca Ceresoli
2022-11-28 15:23 ` [PATCH v2 13/21] staging: media: tegra-video: move default format to soc-specific data Luca Ceresoli
2022-11-28 15:23 ` [PATCH v2 14/21] staging: media: tegra-video: move MIPI calibration calls from VI to CSI Luca Ceresoli
2022-11-28 15:23 ` [PATCH v2 15/21] staging: media: tegra-video: add a per-soc enable/disable op Luca Ceresoli
2022-11-28 15:23 ` [PATCH v2 16/21] staging: media: tegra-video: move syncpt init/free to a per-soc op Luca Ceresoli
2022-11-28 15:23 ` [PATCH v2 17/21] staging: media: tegra-video: add syncpts for Tegra20 to struct tegra_vi Luca Ceresoli
2022-11-28 15:23 ` Luca Ceresoli [this message]
2022-11-28 15:23 ` [PATCH v2 19/21] staging: media: tegra-video: add H/V flip controls Luca Ceresoli
2022-11-28 15:23 ` [PATCH v2 20/21] staging: media: tegra-video: add support for VIP (parallel video input) Luca Ceresoli
2022-11-28 15:23 ` [PATCH v2 21/21] staging: media: tegra-video: add tegra20 variant Luca Ceresoli
2022-12-20 21:40 ` Dmitry Osipenko
2022-12-22 9:03 ` Luca Ceresoli
2022-12-23 12:15 ` Dmitry Osipenko
2022-12-23 12:27 ` Dmitry Osipenko
2022-12-23 12:35 ` Dmitry Osipenko
2022-12-28 10:46 ` Luca Ceresoli
2022-12-23 13:02 ` Dmitry Osipenko
2022-12-23 13:18 ` Dmitry Osipenko
2022-12-20 20:21 ` [PATCH v2 00/21] Add Tegra20 parallel video input capture Dmitry Osipenko
2022-12-22 9:03 ` Luca Ceresoli
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=20221128152336.133953-19-luca.ceresoli@bootlin.com \
--to=luca.ceresoli@bootlin.com \
--cc=airlied@gmail.com \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=digetx@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jonathanh@nvidia.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=linux-tegra@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=paul.kocialkowski@bootlin.com \
--cc=richard.leitner@skidata.com \
--cc=robh+dt@kernel.org \
--cc=skomatineni@nvidia.com \
--cc=thierry.reding@gmail.com \
--cc=thomas.petazzoni@bootlin.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;
as well as URLs for NNTP newsgroup(s).