From: Atsushi Akatsuka <atsushi.akatsuka.vb@xxxxxxxxxxx>
This commit sets AMD bit of VI6_UDSn_CTRL register,
and modifies scaling formula to fit AMD bit.
Signed-off-by: Atsushi Akatsuka <atsushi.akatsuka.vb@xxxxxxxxxxx>
Signed-off-by: Hiroki Negishi <hiroki.negishi.zr@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@xxxxxxxxx>
---
This patch is based on the master branch of linuxtv.org/media_tree.git.
drivers/media/platform/vsp1/vsp1_uds.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/vsp1/vsp1_uds.c b/drivers/media/platform/vsp1/vsp1_uds.c
index ccc8243..e7a046d 100644
--- a/drivers/media/platform/vsp1/vsp1_uds.c
+++ b/drivers/media/platform/vsp1/vsp1_uds.c
@@ -64,10 +64,10 @@ static unsigned int uds_output_size(unsigned int input, unsigned int ratio)
mp = ratio / 4096;
mp = mp < 4 ? 1 : (mp < 8 ? 2 : 4);
- return (input - 1) / mp * mp * 4096 / ratio + 1;
+ return input / mp * mp * 4096 / ratio;
} else {
/* Up-scaling */
- return (input - 1) * 4096 / ratio + 1;
+ return input * 4096 / ratio;
}
}
@@ -145,7 +145,8 @@ static int uds_s_stream(struct v4l2_subdev *subdev, int enable)
vsp1_uds_write(uds, VI6_UDS_CTRL,
(uds->scale_alpha ? VI6_UDS_CTRL_AON : 0) |
- (multitap ? VI6_UDS_CTRL_BC : 0));
+ (multitap ? VI6_UDS_CTRL_BC : 0) |
+ VI6_UDS_CTRL_AMD);
vsp1_uds_write(uds, VI6_UDS_PASS_BWIDTH,
(uds_passband_width(hscale)
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
