diff options
author | Helen Koike <helen.koike@collabora.com> | 2020-06-17 20:08:01 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-07-04 12:41:36 +0200 |
commit | 906dceb48dfa1e7c99c32e6b25878d47023e916b (patch) | |
tree | c776c52cefceb57ccb820994af100125bdabee81 /drivers/staging | |
parent | 2f00f3a4916c546582060d114b4b96286ab3451e (diff) | |
download | linux-stable-906dceb48dfa1e7c99c32e6b25878d47023e916b.tar.gz linux-stable-906dceb48dfa1e7c99c32e6b25878d47023e916b.tar.bz2 linux-stable-906dceb48dfa1e7c99c32e6b25878d47023e916b.zip |
media: staging: rkisp1: rsz: fix resolution limitation on sink pad
Resizer sink pad is limited by what the ISP can generate.
The configurations describes what the resizer can produce.
This was tested on a Scarlet device with ChromiumOs, where the selfpath
receives 2592x1944 and produces 1600x1200 (which isn't possible without
this fix).
Fixes: 56e3b29f9f6b2 ("media: staging: rkisp1: add streaming paths")
Signed-off-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>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/media/rkisp1/rkisp1-resizer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/media/rkisp1/rkisp1-resizer.c b/drivers/staging/media/rkisp1/rkisp1-resizer.c index 8bc907ffa09b..31aea7dfc976 100644 --- a/drivers/staging/media/rkisp1/rkisp1-resizer.c +++ b/drivers/staging/media/rkisp1/rkisp1-resizer.c @@ -553,11 +553,11 @@ static void rkisp1_rsz_set_sink_fmt(struct rkisp1_resizer *rsz, src_fmt->code = sink_fmt->code; sink_fmt->width = clamp_t(u32, format->width, - rsz->config->min_rsz_width, - rsz->config->max_rsz_width); + RKISP1_ISP_MIN_WIDTH, + RKISP1_ISP_MAX_WIDTH); sink_fmt->height = clamp_t(u32, format->height, - rsz->config->min_rsz_height, - rsz->config->max_rsz_height); + RKISP1_ISP_MIN_HEIGHT, + RKISP1_ISP_MAX_HEIGHT); *format = *sink_fmt; |