From: Tomasz Stanislawski Date: Fri, 25 Nov 2011 08:56:18 +0000 (-0300) Subject: [media] v4l: s5p-tv: mixer: fix setup of VP scaling X-Git-Tag: firefly_0821_release~3680^2~2904^2~112 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=392d9e1d02edcbe9bc94bc292dd364339556f8ec;p=firefly-linux-kernel-4.4.55.git [media] v4l: s5p-tv: mixer: fix setup of VP scaling Adjusting of Video Processor's scaling factors was flawed. It bounded scaling to range 1/16 to 1/1. The correct range should be 1/4 to 4/1. This patch fixes this bug. Signed-off-by: Tomasz Stanislawski Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/s5p-tv/mixer_vp_layer.c b/drivers/media/video/s5p-tv/mixer_vp_layer.c index e41ec2ec45f8..3d13a636877b 100644 --- a/drivers/media/video/s5p-tv/mixer_vp_layer.c +++ b/drivers/media/video/s5p-tv/mixer_vp_layer.c @@ -172,10 +172,10 @@ static void mxr_vp_fix_geometry(struct mxr_layer *layer, y_center = src->y_offset + src->height / 2; /* ensure scaling is between 0.25x .. 16x */ - src->width = clamp(src->width, round_up(dst->width, 4), - dst->width * 16); - src->height = clamp(src->height, round_up(dst->height, 4), - dst->height * 16); + src->width = clamp(src->width, round_up(dst->width / 16, 4), + dst->width * 4); + src->height = clamp(src->height, round_up(dst->height / 16, 4), + dst->height * 4); /* hardware limits */ src->width = clamp(src->width, 32U, 2047U);