ENGR00158456-2 ipuv3 dev: return error for split mode with rotation

Currently we do not support split mode with rotation.

Signed-off-by: Jason Chen <b02280@freescale.com>

diff --git a/drivers/mxc/ipu3/ipu_device.c b/drivers/mxc/ipu3/ipu_device.c
index 5f908be66df30a5d13829832e5eb5d6fe56750bf..ecca60a3e44375548df02cb87a72752519f231a0 100644 (file)
--- a/drivers/mxc/ipu3/ipu_device.c
+++ b/drivers/mxc/ipu3/ipu_device.c
@@ -520,6 +520,9 @@ static void dump_check_err(struct device *dev, int err)
        case IPU_CHECK_ERR_SPLIT_OUTPUTH_OVER:
                dev_err(dev, "split mode output height overflow\n");
                break;
+       case IPU_CHECK_ERR_SPLIT_WITH_ROT:
+               dev_err(dev, "split mode with rotation\n");
+               break;
        default:
                break;
        }
@@ -605,15 +608,14 @@ static int update_split_setting(struct ipu_task_entry *t)
        struct stripe_param down_stripe;
        u32 iw, ih, ow, oh;
 
+       if (t->output.rotate >= IPU_ROTATE_90_RIGHT)
+               return IPU_CHECK_ERR_SPLIT_WITH_ROT;
+
        iw = t->input.crop.w;
        ih = t->input.crop.h;
-       if (t->output.rotate >= IPU_ROTATE_90_RIGHT) {
-               ow = t->output.crop.h;
-               oh = t->output.crop.w;
-       } else {
-               ow = t->output.crop.w;
-               oh = t->output.crop.h;
-       }
+
+       ow = t->output.crop.w;
+       oh = t->output.crop.h;
 
        if (t->set.split_mode & RL_SPLIT) {
                ipu_calc_stripes_sizes(iw,