| From db8436d3e2415183bfb5ce4fab15ebd5f7b696e3 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 7 Oct 2021 00:26:21 +0200 |
| Subject: media: ipu3-imgu: imgu_fmt: Handle properly try |
| |
| From: Ricardo Ribalda <ribalda@chromium.org> |
| |
| [ Upstream commit 553481e38045f349bb9aa596d03bebd020020c9c ] |
| |
| For a try_fmt call, the node noes not need to be enabled. |
| |
| Fixes v4l2-compliance |
| |
| fail: v4l2-test-formats.cpp(717): Video Output Multiplanar is valid, but |
| no TRY_FMT was implemented |
| test VIDIOC_TRY_FMT: FAIL |
| |
| Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> |
| Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/staging/media/ipu3/ipu3-v4l2.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c |
| index 908ae74aa970d..dd214fcd80cf8 100644 |
| --- a/drivers/staging/media/ipu3/ipu3-v4l2.c |
| +++ b/drivers/staging/media/ipu3/ipu3-v4l2.c |
| @@ -695,7 +695,7 @@ static int imgu_fmt(struct imgu_device *imgu, unsigned int pipe, int node, |
| |
| /* CSS expects some format on OUT queue */ |
| if (i != IPU3_CSS_QUEUE_OUT && |
| - !imgu_pipe->nodes[inode].enabled) { |
| + !imgu_pipe->nodes[inode].enabled && !try) { |
| fmts[i] = NULL; |
| continue; |
| } |
| -- |
| 2.33.0 |
| |
