diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2015-10-28 05:50:37 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-12-18 18:48:19 +0300 |
| commit | df9ecb0cad14b952a2865f8b3af86b2bbadfab45 (patch) | |
| tree | a6a9501e8fc5a3a59e6e3fbf54e8e5c5559aaf23 /drivers/media/platform/exynos4-is/fimc-m2m.c | |
| parent | ecc2fe20e63a21b7db23065ff061b66fbc08e08b (diff) | |
| download | linux-df9ecb0cad14b952a2865f8b3af86b2bbadfab45.tar.xz | |
[media] vb2: drop v4l2_format argument from queue_setup
The queue_setup callback has a void pointer that is just for V4L2
and is the pointer to the v4l2_format struct that was passed to
VIDIOC_CREATE_BUFS. The idea was that drivers would use the information
from that struct to buffers suitable for the requested format.
After the vb2 split series this pointer is now a void pointer,
which is ugly, and the reality is that all existing drivers will
effectively just look at the sizeimage field of v4l2_format.
To make this more generic the queue_setup callback is changed:
the void pointer is dropped, instead if the *num_planes argument
is 0, then use the current format size, if it is non-zero, then
it contains the number of requested planes and the sizes array
contains the requested sizes. If either is unsupported, then return
-EINVAL, otherwise use the requested size(s).
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/exynos4-is/fimc-m2m.c')
| -rw-r--r-- | drivers/media/platform/exynos4-is/fimc-m2m.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/exynos4-is/fimc-m2m.c b/drivers/media/platform/exynos4-is/fimc-m2m.c index 4d1d64a46b21..4c04b5964624 100644 --- a/drivers/media/platform/exynos4-is/fimc-m2m.c +++ b/drivers/media/platform/exynos4-is/fimc-m2m.c @@ -176,7 +176,7 @@ static void fimc_job_abort(void *priv) fimc_m2m_shutdown(priv); } -static int fimc_queue_setup(struct vb2_queue *vq, const void *parg, +static int fimc_queue_setup(struct vb2_queue *vq, unsigned int *num_buffers, unsigned int *num_planes, unsigned int sizes[], void *allocators[]) { |