]> git.baikalelectronics.ru Git - kernel.git/commit
media: v4l2-mem2mem: always consider OUTPUT queue during poll
authorAlexandre Courbot <gnurou@gmail.com>
Thu, 27 Aug 2020 12:49:45 +0000 (14:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 15 Aug 2021 11:08:02 +0000 (13:08 +0200)
commit094fda6e88157ecc05083aea336501f0d8dc71bb
tree1360fa22b220ca46629f1e495632ebaeeca2a5b4
parent9f1da32586559a0564a8b28b126e5b8d572a385f
media: v4l2-mem2mem: always consider OUTPUT queue during poll

commit 566463afdbc43c7744c5a1b89250fc808df03833 upstream.

If poll() is called on a m2m device with the EPOLLOUT event after the
last buffer of the CAPTURE queue is dequeued, any buffer available on
OUTPUT queue will never be signaled because v4l2_m2m_poll_for_data()
starts by checking whether dst_q->last_buffer_dequeued is set and
returns EPOLLIN in this case, without looking at the state of the OUTPUT
queue.

Fix this by not early returning so we keep checking the state of the
OUTPUT queue afterwards.

Signed-off-by: Alexandre Courbot <gnurou@gmail.com>
Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Cc: Lecopzer Chen <lecopzer.chen@mediatek.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/v4l2-core/v4l2-mem2mem.c