summaryrefslogtreecommitdiff
path: root/drivers/mxc
diff options
context:
space:
mode:
authorLiu Ying <b17645@freescale.com>2010-01-04 17:15:19 -0500
committerAlejandro Gonzalez <alex.gonzalez@digi.com>2010-05-24 11:50:02 +0200
commite11c28524c6b043bd3506b79ef614ab9c28c5944 (patch)
treeecaad0f20f2f97733fd0c2f6e8e9cf099762e93a /drivers/mxc
parentae9d33ef557c67f27e15513b0f1ffc9de6de3610 (diff)
ENGR00119720 IPUv3:Fix wrong UV offset set in CPMEM when idmac crops
The UV offset is set wrongly when idmac does cropping. This patch changes to get the UV offset from user in this case now. Signed-off-by: Liu Ying <b17645@freescale.com> Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'drivers/mxc')
-rw-r--r--drivers/mxc/ipu3/ipu_param_mem.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mxc/ipu3/ipu_param_mem.h b/drivers/mxc/ipu3/ipu_param_mem.h
index 9a56fd818d7b..28358fd2f3b6 100644
--- a/drivers/mxc/ipu3/ipu_param_mem.h
+++ b/drivers/mxc/ipu3/ipu_param_mem.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2009 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2005-2010 Freescale Semiconductor, Inc. All Rights Reserved.
*/
/*
@@ -278,11 +278,11 @@ static inline void _ipu_ch_param_init(int ch,
if (uv_stride)
ipu_ch_param_set_field(&params, 1, 128, 14, uv_stride - 1);
- if (u > u_offset)
+ /* Get the uv offset from user when need cropping */
+ if (u || v) {
u_offset = u;
-
- if (v > v_offset)
v_offset = v;
+ }
ipu_ch_param_set_field(&params, 0, 46, 22, u_offset / 8);
ipu_ch_param_set_field(&params, 0, 68, 22, v_offset / 8);