summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Brown <oliver.brown@freescale.com>2014-02-19 17:32:48 -0600
committerOliver Brown <oliver.brown@freescale.com>2014-02-19 22:36:49 -0600
commit88ee62beb623406da9039f4ff7dfea7c6e390b6a (patch)
treeaf8e5addf0795acab478585590a891daea5a4a01
parent68591db5ff0b500d876ac5b768a9fe88916628e3 (diff)
ENGR00290659 IPUv3: Fix a flashing vert. line when downsizing 1080i to 300x400.
When split mode deinterlacing is the ipu_calc_stripes_sizes() was failing due to an unnecessary test. Added logic to use the maximal_stripe_width only if the flag parameter has the bit 0 clear for not equal stripe sizes. Signed-off-by: Oliver Brown <oliver.brown@freescale.com>
-rw-r--r--drivers/mxc/ipu3/ipu_calc_stripes_sizes.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c b/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c
index ea5470707f35..27abb06be12b 100644
--- a/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c
+++ b/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2009-2014 Freescale Semiconductor, Inc. All Rights Reserved.
*/
/*
@@ -295,7 +295,8 @@ int ipu_calc_stripes_sizes(const unsigned int input_frame_width,
|| ((((u64)output_frame_width) << 32) <
(2 * ((((u64)output_f) << 32) + (input_f * rr_opt))))
|| (maximal_stripe_width < output_f)
- || (output_frame_width <= maximal_stripe_width)
+ || ((output_frame_width <= maximal_stripe_width)
+ && (equal_stripes == 0))
|| ((2 * maximal_stripe_width) < output_frame_width))
return 1;