| Message ID | 20200617180801.158331-1-helen.koike@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: staging: rkisp1: rsz: fix resolution limitation on sink pad | expand |
On Wed, Jun 17, 2020 at 8:08 PM Helen Koike <helen.koike@collabora.com> wrote: > > 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> > > --- > > 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 d049374413dcf..0d41f43b5339f 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; > > -- > 2.26.0 > Reviewed-by: Tomasz Figa <tfiga@chromium.org> Best regards, Tomasz
diff --git a/drivers/staging/media/rkisp1/rkisp1-resizer.c b/drivers/staging/media/rkisp1/rkisp1-resizer.c index d049374413dcf..0d41f43b5339f 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;
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> --- drivers/staging/media/rkisp1/rkisp1-resizer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)