Commit 4dad04fd authored by Hans Verkuil's avatar Hans Verkuil Committed by Tim Gardner

vb2: fix a regression in poll() behavior for output,streams

BugLink: http://bugs.launchpad.net/bugs/1553179

commit 4623e596 upstream.

In the 3.17 kernel the poll() behavior changed for output streams:
as long as not all buffers were queued up poll() would return that
userspace can write. This is fine for the write() call, but when
using stream I/O this changed the behavior since the expectation
was that it would wait for buffers to become available for dequeuing.

This patch only enables the check whether you can queue buffers
for file I/O only, and skips it for stream I/O.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
parent ae8c96ae
...@@ -822,10 +822,10 @@ unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait) ...@@ -822,10 +822,10 @@ unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait)
return res | POLLERR; return res | POLLERR;
/* /*
* For output streams you can write as long as there are fewer buffers * For output streams you can call write() as long as there are fewer
* queued than there are buffers available. * buffers queued than there are buffers available.
*/ */
if (q->is_output && q->queued_count < q->num_buffers) if (q->is_output && q->fileio && q->queued_count < q->num_buffers)
return res | POLLOUT | POLLWRNORM; return res | POLLOUT | POLLWRNORM;
if (list_empty(&q->done_list)) { if (list_empty(&q->done_list)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment