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: d65dd85281 ("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>
This commit is contained in:
Helen Koike 2020-02-06 23:07:10 +01:00 committed by Mauro Carvalho Chehab
parent c93015e0b7
commit f8fb5729a9

View File

@ -537,15 +537,6 @@ static void rkisp1_rsz_set_sink_fmt(struct rkisp1_resizer *rsz,
if (which == V4L2_SUBDEV_FORMAT_ACTIVE) if (which == V4L2_SUBDEV_FORMAT_ACTIVE)
rsz->fmt_type = mbus_info->fmt_type; 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 */ /* Propagete to source pad */
src_fmt->code = sink_fmt->code; src_fmt->code = sink_fmt->code;