[PORT FROM R2] atomisp: CSS/FW release from Synergy baseline of 07Mar2012

BZ: 27375

This release of CSS/FW addresses the following issues:
  - Enable MACC in preview
  - New 3A statistics for R2

Change-Id: I6109898ccefc6bfb0e2d0bf44d2958e412afadf2
Orig-Change-Id: Id0e3db83b9173af0f396104456d528cbb8f6250e
Signed-off-by: Lokesh Gupta <lokesh.gupta@intel.com>
Reviewed-on: http://android.intel.com:8080/38974
Reviewed-by: Sutic, Aleksandar <aleksandar.sutic@intel.com>
Reviewed-by: Kruger, Jozef <jozef.kruger@intel.com>
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 6f93402..ee667c0 100644 (file)
--- a/drivers/media/video/atomisp/css/sh_css.c
+++ b/drivers/media/video/atomisp/css/sh_css.c
@@ -1798,7 +1798,7 @@ sh_css_free(void *ptr)
 void
 sh_css_flush(struct sh_css_acc_fw *fw)
 {
-       if (fw && my_css.flush)
+       if ((fw != NULL) && (my_css.flush != NULL))
                my_css.flush(fw);
 }
 

diff --git a/drivers/media/video/atomisp/css/sh_css_internal.h b/drivers/media/video/atomisp/css/sh_css_internal.h
index cedbc2f..b0954c9 100644 (file)
--- a/drivers/media/video/atomisp/css/sh_css_internal.h
+++ b/drivers/media/video/atomisp/css/sh_css_internal.h
@@ -311,7 +311,8 @@ sh_css_malloc(size_t size);
 void
 sh_css_free(void *ptr);
 
-void
+/* For Acceleration API: Flush FW (shared buffer pointer) arguments */
+extern void
 sh_css_flush(struct sh_css_acc_fw *fw);
 
 /* Check two frames for equality (format, resolution, bits per element) */