summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorHelen Koike <helen.koike@collabora.com>2020-02-07 01:07:10 +0300
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-02-24 19:40:17 +0300
commitf8fb5729a99c14424f8ab19cf9d8a15ad2f30445 (patch)
treee0842a9d42f9607bf74d281d4e4462f8d974252a /drivers
parentc93015e0b76777f769e521775f61d68d553b9f1a (diff)
downloadlinux-f8fb5729a99c14424f8ab19cf9d8a15ad2f30445.tar.xz
media: staging: rkisp1: rsz: don't ignore set format in bayer mainpath
Fix issue when, in case of raw bayer format in mainpath, VIDIOC_SUBDEV_S_FMT ioctl didn't have any effect, is wasn't updating the format of the pad. There is no crop for mainpath bayer raw data. Remove leftover check in set_format, since check is already done in crop rkisp1_rsz_set_sink_crop() function. Fixes: d65dd85281fb ("media: staging: rkisp1: add Rockchip ISP1 base driver") Signed-off-by: Helen Koike <helen.koike@collabora.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/media/rkisp1/rkisp1-resizer.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/staging/media/rkisp1/rkisp1-resizer.c b/drivers/staging/media/rkisp1/rkisp1-resizer.c
index 8cdc29c1a178..d986953d268b 100644
--- a/drivers/staging/media/rkisp1/rkisp1-resizer.c
+++ b/drivers/staging/media/rkisp1/rkisp1-resizer.c
@@ -537,15 +537,6 @@ static void rkisp1_rsz_set_sink_fmt(struct rkisp1_resizer *rsz,
if (which == V4L2_SUBDEV_FORMAT_ACTIVE)
rsz->fmt_type = mbus_info->fmt_type;
- if (rsz->id == RKISP1_MAINPATH &&
- mbus_info->fmt_type == RKISP1_FMT_BAYER) {
- sink_crop->left = 0;
- sink_crop->top = 0;
- sink_crop->width = sink_fmt->width;
- sink_crop->height = sink_fmt->height;
- return;
- }
-
/* Propagete to source pad */
src_fmt->code = sink_fmt->code;