Merge "msm: VPU: Allow polling for buffers before streaming" (aab2281f) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

drivers/media/platform/msm/vpu/vpu_v4l2.c

+5 −9

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -38,8 +38,7 @@ static int v4l2_vpu_close(struct file *file)
		return vpu_close_client(client);
		}

		static unsigned int __poll_vb2_queue(struct vpu_client *client, int port,
		struct file file, poll_table wait)
		static unsigned int __poll_vb2_queue(struct vpu_client *client, int port)
		{
		struct vpu_dev_session *session = client->session;
		struct vb2_queue *q = &session->vbqueue[port];
		@@ -47,10 +46,6 @@ static unsigned int __poll_vb2_queue(struct vpu_client *client, int port,
		unsigned int res = 0;
		unsigned long flags;

		/* error if client not performing buffer I/O or not streaming */
		if (client != session->io_client[port] \|\| !vb2_is_streaming(q))
		return POLLERR;

		spin_lock_irqsave(&q->done_lock, flags);
		if (!list_empty(&q->done_list))
		vb = list_first_entry(&q->done_list, struct vb2_buffer,
		@@ -94,13 +89,13 @@ static unsigned int v4l2_vpu_poll(struct file *file,
		/* poll input queue */
		if (req_events & (POLLOUT \| POLLWRNORM)) {
		poll_wait(file, &session->vbqueue[INPUT_PORT].done_wq, wait);
		mask \|= __poll_vb2_queue(client, INPUT_PORT, file, wait);
		mask \|= __poll_vb2_queue(client, INPUT_PORT);
		}

		/* poll output queue */
		if (req_events & (POLLIN \| POLLRDNORM)) {
		poll_wait(file, &session->vbqueue[OUTPUT_PORT].done_wq, wait);
		mask \|= __poll_vb2_queue(client, OUTPUT_PORT, file, wait);
		mask \|= __poll_vb2_queue(client, OUTPUT_PORT);
		}

		return mask;
		@@ -181,6 +176,7 @@ static long v4l2_vpu_private_ioctls(struct file file, void fh,
		break;

		default:
		pr_warn("Received unknown ioctl (%d)\n", cmd);
		return -ENOTTY;
		break;
		}