All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Hans Verkuil <hverkuil@xs4all.nl>,
	linux-media@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org,
	"Kieran Bingham" <kieran.bingham@ideasonboard.com>,
	"Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>
Subject: [PATCH v14 30/33] rcar-vin: extend {start,stop}_streaming to work with media controller
Date: Sat, 14 Apr 2018 13:57:23 +0200	[thread overview]
Message-ID: <20180414115726.5075-31-niklas.soderlund+renesas@ragnatech.se> (raw)
In-Reply-To: <20180414115726.5075-1-niklas.soderlund+renesas@ragnatech.se>

The procedure to start or stop streaming using the non-MC single
subdevice and the MC graph and multiple subdevices are quite different.
Create a new function to abstract which method is used based on which
mode the driver is running in and add logic to start the MC graph.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>

---

* Changes since v12
- Rebase to latest media-tree/master changed a 'return ret' to a 'goto
  out' in rvin_start_streaming().
---
 drivers/media/platform/rcar-vin/rcar-dma.c | 135 +++++++++++++++++++++++++++--
 1 file changed, 127 insertions(+), 8 deletions(-)

diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/platform/rcar-vin/rcar-dma.c
index d70a689d9dd3713f..4a3a195e7f59047c 100644
--- a/drivers/media/platform/rcar-vin/rcar-dma.c
+++ b/drivers/media/platform/rcar-vin/rcar-dma.c
@@ -996,10 +996,126 @@ static void rvin_buffer_queue(struct vb2_buffer *vb)
 	spin_unlock_irqrestore(&vin->qlock, flags);
 }
 
+static int rvin_mc_validate_format(struct rvin_dev *vin, struct v4l2_subdev *sd,
+				   struct media_pad *pad)
+{
+	struct v4l2_subdev_format fmt = {
+		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
+	};
+
+	fmt.pad = pad->index;
+	if (v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt))
+		return -EPIPE;
+
+	switch (fmt.format.code) {
+	case MEDIA_BUS_FMT_YUYV8_1X16:
+	case MEDIA_BUS_FMT_UYVY8_2X8:
+	case MEDIA_BUS_FMT_UYVY10_2X10:
+	case MEDIA_BUS_FMT_RGB888_1X24:
+		vin->mbus_code = fmt.format.code;
+		break;
+	default:
+		return -EPIPE;
+	}
+
+	switch (fmt.format.field) {
+	case V4L2_FIELD_TOP:
+	case V4L2_FIELD_BOTTOM:
+	case V4L2_FIELD_NONE:
+	case V4L2_FIELD_INTERLACED_TB:
+	case V4L2_FIELD_INTERLACED_BT:
+	case V4L2_FIELD_INTERLACED:
+	case V4L2_FIELD_SEQ_TB:
+	case V4L2_FIELD_SEQ_BT:
+		/* Supported natively */
+		break;
+	case V4L2_FIELD_ALTERNATE:
+		switch (vin->format.field) {
+		case V4L2_FIELD_TOP:
+		case V4L2_FIELD_BOTTOM:
+		case V4L2_FIELD_NONE:
+			break;
+		case V4L2_FIELD_INTERLACED_TB:
+		case V4L2_FIELD_INTERLACED_BT:
+		case V4L2_FIELD_INTERLACED:
+		case V4L2_FIELD_SEQ_TB:
+		case V4L2_FIELD_SEQ_BT:
+			/* Use VIN hardware to combine the two fields */
+			fmt.format.height *= 2;
+			break;
+		default:
+			return -EPIPE;
+		}
+		break;
+	default:
+		return -EPIPE;
+	}
+
+	if (fmt.format.width != vin->format.width ||
+	    fmt.format.height != vin->format.height ||
+	    fmt.format.code != vin->mbus_code)
+		return -EPIPE;
+
+	return 0;
+}
+
+static int rvin_set_stream(struct rvin_dev *vin, int on)
+{
+	struct media_pipeline *pipe;
+	struct media_device *mdev;
+	struct v4l2_subdev *sd;
+	struct media_pad *pad;
+	int ret;
+
+	/* No media controller used, simply pass operation to subdevice. */
+	if (!vin->info->use_mc) {
+		ret = v4l2_subdev_call(vin->digital->subdev, video, s_stream,
+				       on);
+
+		return ret == -ENOIOCTLCMD ? 0 : ret;
+	}
+
+	pad = media_entity_remote_pad(&vin->pad);
+	if (!pad)
+		return -EPIPE;
+
+	sd = media_entity_to_v4l2_subdev(pad->entity);
+
+	if (!on) {
+		media_pipeline_stop(&vin->vdev.entity);
+		return v4l2_subdev_call(sd, video, s_stream, 0);
+	}
+
+	ret = rvin_mc_validate_format(vin, sd, pad);
+	if (ret)
+		return ret;
+
+	/*
+	 * The graph lock needs to be taken to protect concurrent
+	 * starts of multiple VIN instances as they might share
+	 * a common subdevice down the line and then should use
+	 * the same pipe.
+	 */
+	mdev = vin->vdev.entity.graph_obj.mdev;
+	mutex_lock(&mdev->graph_mutex);
+	pipe = sd->entity.pipe ? sd->entity.pipe : &vin->vdev.pipe;
+	ret = __media_pipeline_start(&vin->vdev.entity, pipe);
+	mutex_unlock(&mdev->graph_mutex);
+	if (ret)
+		return ret;
+
+	ret = v4l2_subdev_call(sd, video, s_stream, 1);
+	if (ret == -ENOIOCTLCMD)
+		ret = 0;
+	if (ret)
+		media_pipeline_stop(&vin->vdev.entity);
+
+	return ret;
+}
+
 static int rvin_start_streaming(struct vb2_queue *vq, unsigned int count)
 {
 	struct rvin_dev *vin = vb2_get_drv_priv(vq);
-	struct v4l2_subdev *sd;
 	unsigned long flags;
 	int ret;
 
@@ -1014,8 +1130,13 @@ static int rvin_start_streaming(struct vb2_queue *vq, unsigned int count)
 		return -ENOMEM;
 	}
 
-	sd = vin_to_source(vin);
-	v4l2_subdev_call(sd, video, s_stream, 1);
+	ret = rvin_set_stream(vin, 1);
+	if (ret) {
+		spin_lock_irqsave(&vin->qlock, flags);
+		return_all_buffers(vin, VB2_BUF_STATE_QUEUED);
+		spin_unlock_irqrestore(&vin->qlock, flags);
+		goto out;
+	}
 
 	spin_lock_irqsave(&vin->qlock, flags);
 
@@ -1024,11 +1145,11 @@ static int rvin_start_streaming(struct vb2_queue *vq, unsigned int count)
 	ret = rvin_capture_start(vin);
 	if (ret) {
 		return_all_buffers(vin, VB2_BUF_STATE_QUEUED);
-		v4l2_subdev_call(sd, video, s_stream, 0);
+		rvin_set_stream(vin, 0);
 	}
 
 	spin_unlock_irqrestore(&vin->qlock, flags);
-
+out:
 	if (ret)
 		dma_free_coherent(vin->dev, vin->format.sizeimage, vin->scratch,
 				  vin->scratch_phys);
@@ -1039,7 +1160,6 @@ static int rvin_start_streaming(struct vb2_queue *vq, unsigned int count)
 static void rvin_stop_streaming(struct vb2_queue *vq)
 {
 	struct rvin_dev *vin = vb2_get_drv_priv(vq);
-	struct v4l2_subdev *sd;
 	unsigned long flags;
 	int retries = 0;
 
@@ -1078,8 +1198,7 @@ static void rvin_stop_streaming(struct vb2_queue *vq)
 
 	spin_unlock_irqrestore(&vin->qlock, flags);
 
-	sd = vin_to_source(vin);
-	v4l2_subdev_call(sd, video, s_stream, 0);
+	rvin_set_stream(vin, 0);
 
 	/* disable interrupts */
 	rvin_disable_interrupts(vin);
-- 
2.16.2

  parent reply	other threads:[~2018-04-14 12:02 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-14 11:56 [PATCH v14 00/33] rcar-vin: Add Gen3 with media controller Niklas Söderlund
2018-04-14 11:56 ` [PATCH v14 01/33] dt-bindings: media: rcar_vin: Reverse SoC part number list Niklas Söderlund
2018-04-14 11:56 ` [PATCH v14 02/33] dt-bindings: media: rcar_vin: add device tree support for r8a774[35] Niklas Söderlund
2018-04-14 11:56 ` [PATCH v14 03/33] rcar-vin: add Gen3 devicetree bindings documentation Niklas Söderlund
2018-05-02 13:10   ` Geert Uytterhoeven
2018-04-14 11:56 ` [PATCH v14 04/33] rcar-vin: rename poorly named initialize and cleanup functions Niklas Söderlund
2018-04-14 11:56 ` [PATCH v14 05/33] rcar-vin: unregister video device on driver removal Niklas Söderlund
2018-04-14 11:56 ` [PATCH v14 06/33] rcar-vin: move subdevice handling to async callbacks Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 07/33] rcar-vin: move model information to own struct Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 08/33] rcar-vin: move max width and height information to chip information Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 09/33] rcar-vin: move functions regarding scaling Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 10/33] rcar-vin: all Gen2 boards can scale simplify logic Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 11/33] rcar-vin: set a default field to fallback on Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 12/33] rcar-vin: fix handling of single field frames (top, bottom and alternate fields) Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 13/33] rcar-vin: update bytesperline and sizeimage calculation Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 14/33] rcar-vin: align pixelformat check Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 15/33] rcar-vin: break out format alignment and checking Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 16/33] rcar-vin: simplify how formats are set and reset Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 17/33] rcar-vin: cache video standard Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 18/33] rcar-vin: move media bus configuration to struct rvin_dev Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 19/33] rcar-vin: enable Gen3 hardware configuration Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 20/33] rcar-vin: add function to manipulate Gen3 chsel value Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 21/33] rcar-vin: add flag to switch to media controller mode Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 22/33] rcar-vin: use different v4l2 operations in " Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 23/33] rcar-vin: force default colorspace for media centric mode Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 24/33] rcar-vin: prepare for media controller mode initialization Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 25/33] rcar-vin: add group allocator functions Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 26/33] rcar-vin: change name of video device Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 27/33] rcar-vin: add chsel information to rvin_info Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 28/33] rcar-vin: parse Gen3 OF and setup media graph Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 29/33] rcar-vin: add link notify for Gen3 Niklas Söderlund
2019-04-05 14:17   ` [PATCH v14,29/33] " Eugeniu Rosca
2019-04-05 14:34     ` Niklas Söderlund
2019-04-05 14:45       ` Eugeniu Rosca
2018-04-14 11:57 ` Niklas Söderlund [this message]
2018-04-14 11:57 ` [PATCH v14 31/33] rcar-vin: enable support for r8a7795 Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 32/33] rcar-vin: enable support for r8a7796 Niklas Söderlund
2018-04-14 11:57 ` [PATCH v14 33/33] rcar-vin: enable support for r8a77970 Niklas Söderlund

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=20180414115726.5075-31-niklas.soderlund+renesas@ragnatech.se \
    --to=niklas.soderlund+renesas@ragnatech.se \
    --cc=hverkuil@xs4all.nl \
    --cc=kieran.bingham@ideasonboard.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.