From: 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>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Dmitry Osipenko <digetx@gmail.com>
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>,
Richard Leitner <richard.leitner@skidata.com>
Subject: [PATCH 21/23] staging: media: tegra-video: add H/V flip controls
Date: Wed, 9 Nov 2022 15:18:50 +0100 [thread overview]
Message-ID: <20221109141852.729246-22-luca.ceresoli@bootlin.com> (raw)
In-Reply-To: <20221109141852.729246-1-luca.ceresoli@bootlin.com>
From: Luca Ceresoli <luca.ceresoli@bootlin.com>
Tegra20 can do horizontal and vertical image flip, but Tegra210 cannot
(either the hardware, or this driver).
In preparation to adding Tegra20 support, add a flag in struct tegra_vi_soc
so the generic vi.c code knows whether the flip controls should be added or
not.
Also provide a generic implementation that simply sets two flags in the
channel struct. The Tegra20 implementation will enable flipping at stream
start based on those flags.
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
---
drivers/staging/media/tegra-video/vi.c | 14 +++++++++++++-
drivers/staging/media/tegra-video/vi.h | 8 ++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c
index ebb502a45e96..0dbc3da6f98c 100644
--- a/drivers/staging/media/tegra-video/vi.c
+++ b/drivers/staging/media/tegra-video/vi.c
@@ -29,7 +29,7 @@
#include "vi.h"
#include "video.h"
-#define MAX_CID_CONTROLS 1
+#define MAX_CID_CONTROLS 3
/**
* struct tegra_vi_graph_entity - Entity in the video graph
@@ -893,6 +893,12 @@ static int vi_s_ctrl(struct v4l2_ctrl *ctrl)
case V4L2_CID_TEGRA_SYNCPT_TIMEOUT_RETRY:
chan->syncpt_timeout_retry = ctrl->val;
break;
+ case V4L2_CID_HFLIP:
+ chan->hflip = ctrl->val;
+ break;
+ case V4L2_CID_VFLIP:
+ chan->vflip = ctrl->val;
+ break;
default:
return -EINVAL;
}
@@ -964,6 +970,12 @@ static int tegra_channel_setup_ctrl_handler(struct tegra_vi_channel *chan)
v4l2_ctrl_handler_free(&chan->ctrl_handler);
return ret;
}
+
+ if (chan->vi->soc->has_h_v_flip) {
+ v4l2_ctrl_new_std(&chan->ctrl_handler, &vi_ctrl_ops, V4L2_CID_HFLIP, 0, 1, 1, 0);
+ v4l2_ctrl_new_std(&chan->ctrl_handler, &vi_ctrl_ops, V4L2_CID_VFLIP, 0, 1, 1, 0);
+ }
+
#endif
/* setup the controls */
diff --git a/drivers/staging/media/tegra-video/vi.h b/drivers/staging/media/tegra-video/vi.h
index a23ee8800d33..7cb038957f1b 100644
--- a/drivers/staging/media/tegra-video/vi.h
+++ b/drivers/staging/media/tegra-video/vi.h
@@ -74,6 +74,7 @@ struct tegra_vi_ops {
* @hw_revision: VI hw_revision
* @vi_max_channels: supported max streaming channels
* @vi_max_clk_hz: VI clock max frequency
+ * @has_h_v_flip: the chip can do H adn V flip, and the driver implements it
*/
struct tegra_vi_soc {
const struct tegra_video_format *video_formats;
@@ -83,6 +84,7 @@ struct tegra_vi_soc {
u32 hw_revision;
unsigned int vi_max_channels;
unsigned int vi_max_clk_hz;
+ bool has_h_v_flip:1;
};
/**
@@ -170,6 +172,9 @@ struct tegra_vi {
* @syncpt_timeout_retry: syncpt timeout retry count for the capture
* @pg_mode: test pattern generator mode (disabled/direct/patch)
* @notifier: V4L2 asynchronous subdevs notifier
+ *
+ * @hflip: Horizontal flip is enabled
+ * @vflip: Vertical flip is enabled
*/
struct tegra_vi_channel {
struct list_head list;
@@ -219,6 +224,9 @@ struct tegra_vi_channel {
enum tegra_vi_pg_mode pg_mode;
struct v4l2_async_notifier notifier;
+
+ bool hflip:1;
+ bool vflip:1;
};
/**
--
2.34.1
next prev parent reply other threads:[~2022-11-09 14:22 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-09 14:18 [PATCH 00/23] Add Tegra20 parallel video input capture luca.ceresoli
2022-11-09 14:18 ` [PATCH 01/23] dt-bindings: display: tegra: add bindings for Tegra20 VIP luca.ceresoli
2022-11-15 12:12 ` Krzysztof Kozlowski
2022-11-18 9:08 ` Luca Ceresoli
2022-11-18 13:11 ` Krzysztof Kozlowski
2022-11-09 14:18 ` [PATCH 02/23] dt-bindings: display: tegra: vi: add 'vip' property and example luca.ceresoli
2022-11-15 12:15 ` Krzysztof Kozlowski
2022-11-09 14:18 ` [PATCH 03/23] ARM: dts: tegra20: add label to nvidia,tegra20-vi node luca.ceresoli
2022-11-15 12:16 ` Krzysztof Kozlowski
2022-11-09 14:18 ` [PATCH 04/23] ARM: dts: tegra20-tamonten: add label to avdd_vdac regulator luca.ceresoli
2022-11-15 12:16 ` Krzysztof Kozlowski
2022-11-09 14:18 ` [PATCH 05/23] staging: media: tegra-video: fix .vidioc_enum_fmt_vid_cap to return all formats luca.ceresoli
2022-11-09 14:18 ` [PATCH 06/23] staging: media: tegra-video: improve documentation of tegra_video_format fields luca.ceresoli
2022-11-09 14:18 ` [PATCH 07/23] staging: media: tegra-video: document tegra_channel_get_remote_source_subdev luca.ceresoli
2022-11-09 14:18 ` [PATCH 08/23] staging: media: tegra-video: fix typos in comment luca.ceresoli
2022-11-09 14:18 ` [PATCH 09/23] staging: media: tegra-video: improve error messages luca.ceresoli
2022-11-09 14:18 ` [PATCH 10/23] staging: media: tegra-video: slightly simplify cleanup on errors luca.ceresoli
2022-11-09 14:18 ` [PATCH 11/23] staging: media: tegra-video: move private struct declaration to C file luca.ceresoli
2022-11-09 14:18 ` [PATCH 12/23] staging: media: tegra-video: remove unneeded include luca.ceresoli
2022-11-09 14:18 ` [PATCH 13/23] staging: media: tegra-video: Kconfig: allow TPG only on Tegra210 luca.ceresoli
2022-11-09 14:18 ` [PATCH 14/23] staging: media: tegra-video: move tegra_channel_fmt_align to a per-soc op luca.ceresoli
2022-11-09 14:18 ` [PATCH 15/23] staging: media: tegra-video: move default format to soc-specific data luca.ceresoli
2022-11-09 14:18 ` [PATCH 16/23] staging: media: tegra-video: move MIPI calibration calls from VI to CSI luca.ceresoli
2022-11-09 14:18 ` [PATCH 17/23] staging: media: tegra-video: add a per-soc enable/disable op luca.ceresoli
2022-11-09 14:18 ` [PATCH 18/23] staging: media: tegra-video: move syncpt init/free to a per-soc op luca.ceresoli
2022-11-09 14:18 ` [PATCH 19/23] staging: media: tegra-video: add syncpts for Tegra20 to struct tegra_vi luca.ceresoli
2022-11-09 14:18 ` [PATCH 20/23] staging: media: tegra-video: add hooks for planar YUV and H/V flip luca.ceresoli
2022-11-09 14:18 ` luca.ceresoli [this message]
2022-11-09 14:18 ` [PATCH 22/23] staging: media: tegra-video: add support for VIP (parallel video input) luca.ceresoli
2022-11-09 14:18 ` [PATCH 23/23] staging: media: tegra-video: add tegra20 variant luca.ceresoli
2022-11-09 16:25 ` Luca Ceresoli
2022-11-24 8:36 ` [PATCH 00/23] Add Tegra20 parallel video input capture Hans Verkuil
2022-11-24 14:56 ` 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=20221109141852.729246-22-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=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
all inboxes | Powered by JetHome®