]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
media: ti-vpe: vpe: Make sure YUYV is set as default format
authorBenoit Parrot <bparrot@ti.com>
Mon, 7 Oct 2019 15:09:58 +0000 (12:09 -0300)
committerSeth Forshee <seth.forshee@canonical.com>
Mon, 6 Jan 2020 14:15:56 +0000 (08:15 -0600)
BugLink: https://bugs.launchpad.net/bugs/1858428
[ Upstream commit e20b248051ca0f90d84b4d9378e4780bc31f16c6 ]

v4l2-compliance fails with this message:

   fail: v4l2-test-formats.cpp(672): \
Video Capture Multiplanar: TRY_FMT(G_FMT) != G_FMT
   fail: v4l2-test-formats.cpp(672): \
Video Output Multiplanar: TRY_FMT(G_FMT) != G_FMT
...
   test VIDIOC_TRY_FMT: FAIL

The default pixel format was setup as pointing to a specific offset in
the vpe_formats table assuming it was pointing to the V4L2_PIX_FMT_YUYV
entry. This became false after the addition on the NV21 format (see
above commid-id)

So instead of hard-coding an offset which might change over time we need
to use a lookup helper instead so we know the default will always be what
we intended.

Signed-off-by: Benoit Parrot <bparrot@ti.com>
Fixes: 40cc823f7005 ("media: ti-vpe: Add support for NV21 format")
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
drivers/media/platform/ti-vpe/vpe.c

index e44299008a7b52d61ba7b68bbed548ec0a9d4cd8..2b731c8f54593f577a6bbaa44081dfe5e2871bd5 100644 (file)
@@ -2288,7 +2288,7 @@ static int vpe_open(struct file *file)
        v4l2_ctrl_handler_setup(hdl);
 
        s_q_data = &ctx->q_data[Q_DATA_SRC];
-       s_q_data->fmt = &vpe_formats[2];
+       s_q_data->fmt = __find_format(V4L2_PIX_FMT_YUYV);
        s_q_data->width = 1920;
        s_q_data->height = 1080;
        s_q_data->nplanes = 1;