[PORT FROM R2] sh_css: fix improper bayerorder cropping

BZ: 27375

bayer order is matched to the isp's native bayer order by
cropping off a line or column or both dependant on the
bayer pattern chosen. This cropping was not done properly.

Change-Id: I6f267758943eb8948cabc373c1918e015271b5e9
Orig-Change-Id: Ieca6672f8db70084f5c59d596007960b3e33a35c
Reviewed-on: http://android.intel.com:8080/38973
Reviewed-by: Koski, Anttu <anttu.koski@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/drivers/media/video/atomisp/css/sh_css.c b/drivers/media/video/atomisp/css/sh_css.c
index b4de302..6f93402 100644 (file)
--- a/drivers/media/video/atomisp/css/sh_css.c
+++ b/drivers/media/video/atomisp/css/sh_css.c
@@ -693,13 +693,14 @@ program_input_formatter(struct sh_css_binary *binary)
        if (err != sh_css_success)
                return err;
 
+       err = input_start_column(cropped_width, &start_column);
+       if (err != sh_css_success)
+               return err;
+
        if (left_padding) {
                num_vectors = CEIL_DIV(cropped_width + left_padding,
                                       ISP_VEC_NELEMS);
        } else {
-               err = input_start_column(cropped_width, &start_column);
-               if (err != sh_css_success)
-                       return err;
                num_vectors = CEIL_DIV(cropped_width, ISP_VEC_NELEMS);
                num_vectors *= buffer_height;
                /* todo: in case of left padding,