From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
To: Linux Media Mailing List <linux-media@vger.kernel.org>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Hans Verkuil <hans.verkuil@cisco.com>,
Pawel Osciak <pawel@osciak.com>,
Nicolas Dufresne <nicolas.dufresne@collabora.com>
Subject: [PATCH v2] [media] BZ#84401: Revert "[media] v4l: vb2: Don't return POLLERR during transient buffer underruns"
Date: Thu, 18 Sep 2014 07:06:19 -0300 [thread overview]
Message-ID: <20140918070619.32d4e4b1@recife.lan> (raw)
In-Reply-To: <1410826255-2025-1-git-send-email-m.chehab@samsung.com>
This reverts commit 9241650d62f79a3da01f1d5e8ebd195083330b75.
The commit 9241650d62f7 was meant to solve a race issue that
affects Gstreamer version 0.10, when streaming for a long time.
It does that by returning POLERR if VB2 is not streaming.
However, it broke VBI userspace support on alevt and mtt (and maybe
other VBI apps), as they rely on the old behavior.
Due to that, we need to roll back and restore the previous behavior.
For more details, see:
https://bugzilla.kernel.org/show_bug.cgi?id=84401
So, let's rollback the change for now, and work on some other
fix for it.
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Pawel Osciak <pawel@osciak.com>
Cc: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
--
v2: Just changed the description.
This is a regression that broke a core feature with most (all) VBI
apps. We should hurry sending a fix for it.
So, let's just revert the patch while we're discussing/testing a
solution that would solve Laurent's usecase scenario without breaking
VBI.
PS.: this patch should, of course, be c/c to 3.16 too, but I think we'll
need to do a manual backport, as the check for q->error is likely newer
than 3.16.
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index 7e6aff673a5a..da2d0adcc992 100644
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -2583,10 +2583,10 @@ unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait)
}
/*
- * There is nothing to wait for if no buffer has been queued and the
- * queue isn't streaming, or if the error flag is set.
+ * There is nothing to wait for if no buffer has been queued
+ * or if the error flag is set.
*/
- if ((list_empty(&q->queued_list) && !vb2_is_streaming(q)) || q->error)
+ if (list_empty(&q->queued_list) || q->error)
return res | POLLERR;
/*
next prev parent reply other threads:[~2014-09-18 10:06 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-16 0:10 [PATCH] [media] BZ#84401: Revert "[media] v4l: vb2: Don't return POLLERR during transient buffer underruns" Mauro Carvalho Chehab
2014-09-16 9:09 ` Laurent Pinchart
2014-09-16 10:01 ` Mauro Carvalho Chehab
2014-09-16 10:15 ` Laurent Pinchart
2014-09-16 10:58 ` Mauro Carvalho Chehab
2014-09-16 11:42 ` Laurent Pinchart
2014-09-16 13:41 ` Mauro Carvalho Chehab
2014-09-16 13:56 ` Hans Verkuil
2014-09-18 10:06 ` Mauro Carvalho Chehab [this message]
2014-09-18 10:10 ` [PATCH v2] " Hans Verkuil
2014-09-18 10:50 ` Mauro Carvalho Chehab
2014-09-18 12:07 ` Hans Verkuil
2014-09-18 12:15 ` Mauro Carvalho Chehab
2014-09-18 12:21 ` Hans Verkuil
2014-09-18 12:49 ` Mauro Carvalho Chehab
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=20140918070619.32d4e4b1@recife.lan \
--to=mchehab@osg.samsung.com \
--cc=hans.verkuil@cisco.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=nicolas.dufresne@collabora.com \
--cc=pawel@osciak.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;
as well as URLs for NNTP newsgroup(s).