This series adds support for video capture from external camera sensor to
Tegra video driver.
Jetson TX1 has camera expansion connector and supports custom camera module
designed as per TX1 design specification.
This series also enables camera capture support for Jetson Nano which has
Raspberry PI camera header.
This series is tested with IMX274 and IMX219 camera sensors.
This series include,
Tegra video driver updates
- TPG Vs Non-TPG based on Kconfig
- Support for external sensor video capture based on device graph from DT
- Support for selection ioctl operations
- Tegra MIPI CSI pads calibration
- CSI T-CLK and T-HS settle time computation based on clock rates
- dt-binding doc update
Host1x driver updates
- Keep MIPI clock enabled till calibration is done
Delta between patch versions:
[v8]: Includes below fix
- Remove cancel_calibration() added during v4 and use
finish_calibrate for pass/fail paths after start_calibrate.
- Fix to keep MIPI clock enabled and mutex locked till end of
calibration along with 75usec wait time after calibration start
to make sure it finishes its finite sequence codes before waiting
for pads LP-11 state.
[v8]: Includes below minor changes
- Fixed missing of_node_put and updated error message to be
more informative in tegra_csi_channels_alloc() and
tegra_vi_channels_alloc()
Patch-0006 has compilation dependency on
https://patchwork.kernel.org/patch/11659521/
[v7]: Includes minor feedback from v6
- Patch-0009 has minor update
Note:
Patch-0006 has compilation dependency on
https://patchwork.kernel.org/patch/11659521/
[v6]: Includes below changes based on v5 feedback
- Patches are based on latest linux-next.
- separated stream enable and disable implementations into
separate functions for tegra_channel_set_stream() and
tegra_csi_s_stream().
- changed dev_err to dev_warn on MIPI calibration failure after
sensor streaming as its not critical error.
Note:
Patch-0006 has compilation dependency on
https://patchwork.kernel.org/patch/11659521/
[v5]: Includes below minor change based on v4 feedback
Patch-0012: renames APIs to use calibration instead of calibrate.
Note:
Patch-0010 has compilation dependency on
https://patchwork.kernel.org/patch/11659521/
[v4]: Includes below fix based on v3 feedback
- Patches are based on latest linux-next.
- With split of tegra_mipi_calibrate() and tegra_mipi_wait(), mipi
clock is not left enabled till calibration done. This series adds
a patch to fix this by keeping clock enabled till calibration is
done.
Note:
Patch-0010 has compilation dependency on
https://patchwork.kernel.org/patch/11659521/
[v3]: Includes v2 feedback
- Uses separate helper function for retrieving remote csi subdevice
and source subdevice.
- Added check for presence of subdevice ops set/get_selection
- dropped vb2_queue_release from driver and using
vb2_video_unregister_device instead of video_unregister_device.
- video device register should happen in the last after all video
device related setup is done in the driver. This is being addressed
in below RFC patch. Once proper implementation of this is available
will update Tegra video driver to use split APIs and do all setup
prior to device register. Added this as TODO in the driver.
https://www.spinics.net/lists/linux-media/msg172761.html
Note:
Patch-0012 has compilation dependency on
https://patchwork.kernel.org/patch/11659521/
[v2]: Includes below changes based on v1 feedback
- dt-binding document and the driver update for device graph to use
separate ports for sink endpoint and source endpoint for csi.
- Use data-lanes endpoint property for csi.
- Update tegra_mipi_request() to take device node pointer argument
rather than adding extra API.
- Remove checking for clk pointer before clk_disable.
Sowjanya Komatineni (10):
media: tegra-video: Fix channel format alignment
media: tegra-video: Enable TPG based on kernel config
media: tegra-video: Update format lookup to offset based
dt-bindings: tegra: Update VI and CSI bindings with port info
media: tegra-video: Separate CSI stream enable and disable
implementations
media: tegra-video: Add support for external sensor capture
media: tegra-video: Add support for selection ioctl ops
gpu: host1x: mipi: Keep MIPI clock enabled and mutex locked till
calibration done
media: tegra-video: Add CSI MIPI pads calibration
media: tegra-video: Compute settle times based on the clock rate
.../display/tegra/nvidia,tegra20-host1x.txt | 92 ++-
drivers/gpu/drm/tegra/dsi.c | 4 +-
drivers/gpu/host1x/mipi.c | 22 +-
drivers/staging/media/tegra-video/Kconfig | 7 +
drivers/staging/media/tegra-video/TODO | 6 -
drivers/staging/media/tegra-video/csi.c | 314 +++++++-
drivers/staging/media/tegra-video/csi.h | 8 +
drivers/staging/media/tegra-video/tegra210.c | 25 +-
drivers/staging/media/tegra-video/vi.c | 840 +++++++++++++++++++--
drivers/staging/media/tegra-video/vi.h | 25 +-
drivers/staging/media/tegra-video/video.c | 23 +-
include/linux/host1x.h | 4 +-
12 files changed, 1250 insertions(+), 120 deletions(-)
--
2.7.4
This patch adds selection v4l2 ioctl operations to allow configuring
a selection rectangle in the sensor through the Tegra video device
node.
Some sensor drivers supporting crop uses try_crop rectangle from
v4l2_subdev_pad_config during try format for computing binning.
So with selection ops support, this patch also updates try format
to use try crop rectangle either from subdev frame size enumeration
or from subdev crop boundary.
Signed-off-by: Sowjanya Komatineni <[email protected]>
---
drivers/staging/media/tegra-video/vi.c | 106 +++++++++++++++++++++++++++++++++
1 file changed, 106 insertions(+)
diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c
index deb1252..29a172f 100644
--- a/drivers/staging/media/tegra-video/vi.c
+++ b/drivers/staging/media/tegra-video/vi.c
@@ -474,6 +474,13 @@ static int __tegra_channel_try_format(struct tegra_vi_channel *chan,
struct v4l2_subdev *subdev;
struct v4l2_subdev_format fmt;
struct v4l2_subdev_pad_config *pad_cfg;
+ struct v4l2_subdev_frame_size_enum fse = {
+ .which = V4L2_SUBDEV_FORMAT_TRY,
+ };
+ struct v4l2_subdev_selection sdsel = {
+ .which = V4L2_SUBDEV_FORMAT_ACTIVE,
+ .target = V4L2_SEL_TGT_CROP_BOUNDS,
+ };
int ret;
subdev = tegra_channel_get_remote_source_subdev(chan);
@@ -499,6 +506,24 @@ static int __tegra_channel_try_format(struct tegra_vi_channel *chan,
fmt.which = V4L2_SUBDEV_FORMAT_TRY;
fmt.pad = 0;
v4l2_fill_mbus_format(&fmt.format, pix, fmtinfo->code);
+
+ /*
+ * Attempt to obtain the format size from subdev.
+ * If not available, try to get crop boundary from subdev.
+ */
+ fse.code = fmtinfo->code;
+ ret = v4l2_subdev_call(subdev, pad, enum_frame_size, pad_cfg, &fse);
+ if (ret) {
+ ret = v4l2_subdev_call(subdev, pad, get_selection, NULL, &sdsel);
+ if (ret)
+ return -EINVAL;
+ pad_cfg->try_crop.width = sdsel.r.width;
+ pad_cfg->try_crop.height = sdsel.r.height;
+ } else {
+ pad_cfg->try_crop.width = fse.max_width;
+ pad_cfg->try_crop.height = fse.max_height;
+ }
+
ret = v4l2_subdev_call(subdev, pad, set_fmt, pad_cfg, &fmt);
if (ret < 0)
return ret;
@@ -588,6 +613,85 @@ static int tegra_channel_set_subdev_active_fmt(struct tegra_vi_channel *chan)
return 0;
}
+static int tegra_channel_g_selection(struct file *file, void *priv,
+ struct v4l2_selection *sel)
+{
+ struct tegra_vi_channel *chan = video_drvdata(file);
+ struct v4l2_subdev *subdev;
+ struct v4l2_subdev_format fmt = {
+ .which = V4L2_SUBDEV_FORMAT_ACTIVE,
+ };
+ struct v4l2_subdev_selection sdsel = {
+ .which = V4L2_SUBDEV_FORMAT_ACTIVE,
+ .target = sel->target,
+ };
+ int ret;
+
+ subdev = tegra_channel_get_remote_source_subdev(chan);
+ if (!v4l2_subdev_has_op(subdev, pad, get_selection))
+ return -ENOTTY;
+
+ if (sel->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+ return -EINVAL;
+ /*
+ * Try the get selection operation and fallback to get format if not
+ * implemented.
+ */
+ ret = v4l2_subdev_call(subdev, pad, get_selection, NULL, &sdsel);
+ if (!ret)
+ sel->r = sdsel.r;
+ if (ret != -ENOIOCTLCMD)
+ return ret;
+
+ ret = v4l2_subdev_call(subdev, pad, get_fmt, NULL, &fmt);
+ if (ret < 0)
+ return ret;
+
+ sel->r.left = 0;
+ sel->r.top = 0;
+ sel->r.width = fmt.format.width;
+ sel->r.height = fmt.format.height;
+
+ return 0;
+}
+
+static int tegra_channel_s_selection(struct file *file, void *fh,
+ struct v4l2_selection *sel)
+{
+ struct tegra_vi_channel *chan = video_drvdata(file);
+ struct v4l2_subdev *subdev;
+ int ret;
+ struct v4l2_subdev_selection sdsel = {
+ .which = V4L2_SUBDEV_FORMAT_ACTIVE,
+ .target = sel->target,
+ .flags = sel->flags,
+ .r = sel->r,
+ };
+
+ subdev = tegra_channel_get_remote_source_subdev(chan);
+ if (!v4l2_subdev_has_op(subdev, pad, set_selection))
+ return -ENOTTY;
+
+ if (sel->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+ return -EINVAL;
+
+ if (vb2_is_busy(&chan->queue))
+ return -EBUSY;
+
+ ret = v4l2_subdev_call(subdev, pad, set_selection, NULL, &sdsel);
+ if (!ret) {
+ sel->r = sdsel.r;
+ /*
+ * Subdev active format resolution may have changed during
+ * set selection operation. So, update channel format to
+ * the sub-device active format.
+ */
+ return tegra_channel_set_subdev_active_fmt(chan);
+ }
+
+ return ret;
+}
+
static int tegra_channel_enum_input(struct file *file, void *fh,
struct v4l2_input *inp)
{
@@ -645,6 +749,8 @@ static const struct v4l2_ioctl_ops tegra_channel_ioctl_ops = {
.vidioc_streamoff = vb2_ioctl_streamoff,
.vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
+ .vidioc_g_selection = tegra_channel_g_selection,
+ .vidioc_s_selection = tegra_channel_s_selection,
};
/*
--
2.7.4