| From 1403ed4240043636687d3c57eef1557366b49eba Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 17 Jun 2020 20:08:01 +0200 |
| Subject: media: staging: rkisp1: rsz: fix resolution limitation on sink pad |
| |
| From: Helen Koike <helen.koike@collabora.com> |
| |
| [ Upstream commit 906dceb48dfa1e7c99c32e6b25878d47023e916b ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/staging/media/rkisp1/rkisp1-resizer.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/staging/media/rkisp1/rkisp1-resizer.c b/drivers/staging/media/rkisp1/rkisp1-resizer.c |
| index 8b1c0cc5ea3f1..26d785d985257 100644 |
| --- a/drivers/staging/media/rkisp1/rkisp1-resizer.c |
| +++ b/drivers/staging/media/rkisp1/rkisp1-resizer.c |
| @@ -543,11 +543,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; |
| |
| -- |
| 2.25.1 |
| |