| From 25ba1f41487905b52379288e4b9f6a96745580ad Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 18 Jun 2020 13:35:15 +0200 |
| Subject: media: staging: rkisp1: rsz: supported formats are the isp's src |
| formats, not sink formats |
| |
| From: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> |
| |
| [ Upstream commit 7b8ce1f2763b9351a4cb04b802835470e76770a5 ] |
| |
| The rkisp1_resizer's enum callback 'rkisp1_rsz_enum_mbus_code' |
| calls the enum callback of the 'rkisp1_isp' on it's video sink pad. |
| This is a bug, the resizer should support the same formats |
| supported by the 'rkisp1_isp' on the source pad (not the sink pad). |
| |
| Fixes: 56e3b29f9f6b "media: staging: rkisp1: add streaming paths" |
| Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> |
| Acked-by: Helen Koike <helen.koike@collabora.com> |
| Reviewed-by: Tomasz Figa <tfiga@chromium.org> |
| Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/staging/media/rkisp1/rkisp1-resizer.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/staging/media/rkisp1/rkisp1-resizer.c b/drivers/staging/media/rkisp1/rkisp1-resizer.c |
| index 87799fbf0363e..8b1c0cc5ea3f1 100644 |
| --- a/drivers/staging/media/rkisp1/rkisp1-resizer.c |
| +++ b/drivers/staging/media/rkisp1/rkisp1-resizer.c |
| @@ -427,8 +427,8 @@ static int rkisp1_rsz_enum_mbus_code(struct v4l2_subdev *sd, |
| u32 pad = code->pad; |
| int ret; |
| |
| - /* supported mbus codes are the same in isp sink pad */ |
| - code->pad = RKISP1_ISP_PAD_SINK_VIDEO; |
| + /* supported mbus codes are the same in isp video src pad */ |
| + code->pad = RKISP1_ISP_PAD_SOURCE_VIDEO; |
| ret = v4l2_subdev_call(&rsz->rkisp1->isp.sd, pad, enum_mbus_code, |
| &dummy_cfg, code); |
| |
| -- |
| 2.25.1 |
| |