Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1660088

[PATCH v8 30/34] media: imx: csi: add frame size/interval enumeration

From Steve Longerbeam <slongerbeam@gmail.com>
Newsgroups linux.kernel
Subject [PATCH v8 30/34] media: imx: csi: add frame size/interval enumeration
Date 2017-06-07 20:40 +0200
Message-ID <tPO28-1PO-73@gated-at.bofh.it> (permalink)
References <tPO26-1PO-7@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

From: Russell King <rmk+kernel@armlinux.org.uk>

Add frame size and frame interval enumeration to CSI.

CSI can downscale the image independently horizontally and vertically by a
factor of two, which enumerates to four different frame sizes at the
output pads. The input pad supports a range of frame sizes.

CSI can also drop frames, resulting in frame rate reduction, so
enumerate the resulting possible output frame rates.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com>
---
 drivers/staging/media/imx/imx-media-csi.c | 70 +++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c
index 655a095..c59224f 100644
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -1138,6 +1138,74 @@ static int csi_enum_mbus_code(struct v4l2_subdev *sd,
 	return ret;
 }
 
+static int csi_enum_frame_size(struct v4l2_subdev *sd,
+			       struct v4l2_subdev_pad_config *cfg,
+			       struct v4l2_subdev_frame_size_enum *fse)
+{
+	struct csi_priv *priv = v4l2_get_subdevdata(sd);
+	struct v4l2_rect *crop;
+	int ret = 0;
+
+	if (fse->pad >= CSI_NUM_PADS ||
+	    fse->index > (fse->pad == CSI_SINK_PAD ? 0 : 3))
+		return -EINVAL;
+
+	mutex_lock(&priv->lock);
+
+	if (fse->pad == CSI_SINK_PAD) {
+		fse->min_width = MIN_W;
+		fse->max_width = MAX_W;
+		fse->min_height = MIN_H;
+		fse->max_height = MAX_H;
+	} else {
+		crop = __csi_get_crop(priv, cfg, fse->which);
+
+		fse->min_width = fse->max_width = fse->index & 1 ?
+			crop->width / 2 : crop->width;
+		fse->min_height = fse->max_height = fse->index & 2 ?
+			crop->height / 2 : crop->height;
+	}
+
+	mutex_unlock(&priv->lock);
+	return ret;
+}
+
+static int csi_enum_frame_interval(struct v4l2_subdev *sd,
+				   struct v4l2_subdev_pad_config *cfg,
+				   struct v4l2_subdev_frame_interval_enum *fie)
+{
+	struct csi_priv *priv = v4l2_get_subdevdata(sd);
+	struct v4l2_fract *input_fi;
+	struct v4l2_rect *crop;
+	int ret = 0;
+
+	if (fie->pad >= CSI_NUM_PADS ||
+	    fie->index >= (fie->pad != CSI_SRC_PAD_IDMAC ?
+			   1 : ARRAY_SIZE(csi_skip)))
+		return -EINVAL;
+
+	mutex_lock(&priv->lock);
+
+	input_fi = &priv->frame_interval[CSI_SINK_PAD];
+	crop = __csi_get_crop(priv, cfg, fie->which);
+
+	if ((fie->width != crop->width && fie->width != crop->width / 2) ||
+	    (fie->height != crop->height && fie->height != crop->height / 2)) {
+		ret = -EINVAL;
+		goto out;
+	}
+
+	fie->interval = *input_fi;
+
+	if (fie->pad == CSI_SRC_PAD_IDMAC)
+		csi_apply_skip_interval(&csi_skip[fie->index],
+					&fie->interval);
+
+out:
+	mutex_unlock(&priv->lock);
+	return ret;
+}
+
 static int csi_get_fmt(struct v4l2_subdev *sd,
 		       struct v4l2_subdev_pad_config *cfg,
 		       struct v4l2_subdev_format *sdformat)
@@ -1605,6 +1673,8 @@ static const struct v4l2_subdev_video_ops csi_video_ops = {
 
 static const struct v4l2_subdev_pad_ops csi_pad_ops = {
 	.enum_mbus_code = csi_enum_mbus_code,
+	.enum_frame_size = csi_enum_frame_size,
+	.enum_frame_interval = csi_enum_frame_interval,
 	.get_fmt = csi_get_fmt,
 	.set_fmt = csi_set_fmt,
 	.get_selection = csi_get_selection,
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v8 00/34] i.MX Media Driver Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 28/34] media: imx: csi: add frame skipping support Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 11/34] ARM: dts: imx6-sabreauto: create i2cmux for i2c3 Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 26/34] media: imx: csi: add support for bayer formats Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 31/34] media: imx: capture: add frame sizes/interval enumeration Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 25/34] media: imx: Add MIPI CSI-2 Receiver subdev driver Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 32/34] media: imx: set and propagate default field, colorimetry Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 33/34] media: imx: Drop warning upon multiple S_STREAM disable calls Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 30/34] media: imx: csi: add frame size/interval enumeration Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 16/34] platform: add video-multiplexer subdevice driver Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:40 +0200
  [PATCH v8 09/34] ARM: dts: imx6-sabrelite: add OV5642 and OV5640 camera sensors Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 18/34] media: Add userspace header file for i.MX Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 07/34] ARM: dts: imx6qdl: add capture-subsystem device Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 15/34] add mux and video interface bridge entity functions Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 23/34] media: imx: Add VDIC subdev driver Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 04/34] ARM: dts: imx6qdl: add multiplexer controls Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 21/34] media: imx: Add Capture Device Interface Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 13/34] ARM: dts: imx6-sabreauto: add pinctrl for gpt input capture Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 06/34] ARM: dts: imx6qdl: Add video multiplexers, mipi_csi, and their connections Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 12/34] ARM: dts: imx6-sabreauto: add reset-gpios property for max7310_b Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 03/34] [media] dt/bindings: Add bindings for OV5640 Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  [PATCH v8 01/34] dt-bindings: Add bindings for video-multiplexer device Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 20:50 +0200
  Re: [PATCH v8 00/34] i.MX Media Driver Hans Verkuil <hverkuil@xs4all.nl> - 2017-06-07 21:10 +0200
    Re: [PATCH v8 00/34] i.MX Media Driver Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-07 21:10 +0200
    Re: [PATCH v8 00/34] i.MX Media Driver Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-10 01:20 +0200
    Re: [PATCH v8 00/34] i.MX Media Driver Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-10 01:20 +0200
      Re: [PATCH v8 00/34] i.MX Media Driver Hans Verkuil <hverkuil@xs4all.nl> - 2017-06-10 01:30 +0200
        Re: [PATCH v8 00/34] i.MX Media Driver Pavel Machek <pavel@ucw.cz> - 2017-06-10 09:40 +0200
        Re: [PATCH v8 00/34] i.MX Media Driver Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> - 2017-06-11 22:10 +0200
          Re: [PATCH v8 00/34] i.MX Media Driver Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-12 20:20 +0200
  Re: [PATCH v8 19/34] media: Add i.MX media core driver Philipp Zabel <p.zabel@pengutronix.de> - 2017-06-09 15:20 +0200
    Re: [PATCH v8 19/34] media: Add i.MX media core driver Steve Longerbeam <slongerbeam@gmail.com> - 2017-06-10 01:10 +0200
  Re: [PATCH v8 17/34] [media] add Omnivision OV5640 sensor driver Sakari Ailus <sakari.ailus@iki.fi> - 2017-06-11 00:00 +0200

csiph-web