All of lore.kernel.org
 help / color / mirror / Atom feed
From: Philipp Zabel <p.zabel@pengutronix.de>
To: linux-media@vger.kernel.org
Cc: Mauro Carvalho Chehab <m.chehab@samsung.com>,
	Kamil Debski <k.debski@samsung.com>,
	kernel@pengutronix.de, Philipp Zabel <p.zabel@pengutronix.de>
Subject: [PATCH 05/15] [media] coda: dequeue buffers if start_streaming fails
Date: Tue,  5 Aug 2014 19:00:10 +0200	[thread overview]
Message-ID: <1407258020-12078-6-git-send-email-p.zabel@pengutronix.de> (raw)
In-Reply-To: <1407258020-12078-1-git-send-email-p.zabel@pengutronix.de>

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 drivers/media/platform/coda/coda-common.c | 34 +++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 86fc527..1e93889 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -1005,6 +1005,7 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
 	struct coda_ctx *ctx = vb2_get_drv_priv(q);
 	struct v4l2_device *v4l2_dev = &ctx->dev->v4l2_dev;
 	struct coda_q_data *q_data_src, *q_data_dst;
+	struct vb2_buffer *buf;
 	u32 dst_fourcc;
 	int ret = 0;
 
@@ -1016,17 +1017,23 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
 			coda_fill_bitstream(ctx);
 			mutex_unlock(&ctx->bitstream_mutex);
 
-			if (coda_get_bitstream_payload(ctx) < 512)
-				return -EINVAL;
+			if (coda_get_bitstream_payload(ctx) < 512) {
+				ret = -EINVAL;
+				goto err;
+			}
 		} else {
-			if (count < 1)
-				return -EINVAL;
+			if (count < 1) {
+				ret = -EINVAL;
+				goto err;
+			}
 		}
 
 		ctx->streamon_out = 1;
 	} else {
-		if (count < 1)
-			return -EINVAL;
+		if (count < 1) {
+			ret = -EINVAL;
+			goto err;
+		}
 
 		ctx->streamon_cap = 1;
 	}
@@ -1047,7 +1054,8 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
 				     q_data_dst->fourcc);
 	if (!ctx->codec) {
 		v4l2_err(v4l2_dev, "couldn't tell instance type.\n");
-		return -EINVAL;
+		ret = -EINVAL;
+		goto err;
 	}
 
 	ret = ctx->ops->start_streaming(ctx);
@@ -1055,11 +1063,21 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
 		if (ret == -EAGAIN)
 			return 0;
 		else if (ret < 0)
-			return ret;
+			goto err;
 	}
 
 	ctx->initialized = 1;
 	return ret;
+
+err:
+	if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
+		while ((buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx)))
+			v4l2_m2m_buf_done(buf, VB2_BUF_STATE_DEQUEUED);
+	} else {
+		while ((buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx)))
+			v4l2_m2m_buf_done(buf, VB2_BUF_STATE_DEQUEUED);
+	}
+	return ret;
 }
 
 static void coda_stop_streaming(struct vb2_queue *q)
-- 
2.0.1


  parent reply	other threads:[~2014-08-05 17:00 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-05 17:00 [PATCH RESEND 00/15] CODA patches for v3.17 Philipp Zabel
2014-08-05 17:00 ` [PATCH 01/15] [media] coda: include header for memcpy Philipp Zabel
2014-08-05 17:00 ` [PATCH 02/15] [media] coda: move BIT specific functions into separate file Philipp Zabel
2014-08-05 17:00 ` [PATCH 03/15] [media] coda: remove unnecessary peek at next destination buffer from coda_finish_decode Philipp Zabel
2014-08-05 17:00 ` [PATCH 04/15] [media] coda: request BIT processor interrupt by name Philipp Zabel
2014-08-05 17:00 ` Philipp Zabel [this message]
2014-08-05 17:00 ` [PATCH 06/15] [media] coda: dequeue buffers on streamoff Philipp Zabel
2014-08-05 17:00 ` [PATCH 07/15] [media] coda: skip calling coda_find_codec in encoder try_fmt_vid_out Philipp Zabel
2014-08-05 17:00 ` [PATCH 08/15] [media] coda: allow running coda without iram on mx6dl Philipp Zabel
2014-08-05 17:00 ` [PATCH 09/15] [media] coda: increase max vertical frame size to 1088 Philipp Zabel
2014-08-05 17:00 ` [PATCH 10/15] [media] coda: add an intermediate debug level Philipp Zabel
2014-08-05 17:00 ` [PATCH 11/15] [media] coda: improve allocation error messages Philipp Zabel
2014-08-05 17:00 ` [PATCH 12/15] [media] coda: fix timestamp list handling Philipp Zabel
2014-08-05 17:00 ` [PATCH 13/15] [media] coda: fix coda_s_fmt_vid_out Philipp Zabel
2014-08-05 17:00 ` [PATCH 14/15] [media] coda: set capture frame size with output S_FMT Philipp Zabel
2014-08-05 17:00 ` [PATCH 15/15] [media] coda: disable old cropping ioctls Philipp Zabel
2014-08-06 10:10 ` [PATCH RESEND 00/15] CODA patches for v3.17 Kamil Debski
2014-08-06 11:07   ` Philipp Zabel

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=1407258020-12078-6-git-send-email-p.zabel@pengutronix.de \
    --to=p.zabel@pengutronix.de \
    --cc=k.debski@samsung.com \
    --cc=kernel@pengutronix.de \
    --cc=linux-media@vger.kernel.org \
    --cc=m.chehab@samsung.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 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.