fimg5x: Ifdef M2M1SHOT2 acceleration

Older SoCs like 7880 only have M2M1SHOT v1.

Change-Id: I5ba2f70862f62e2d21edcac6cfee7b4034bf47da

diff --git a/BoardConfigCFlags.mk b/BoardConfigCFlags.mk
index bb489b3fedcd510804da1e37fbb458d93df08bf4..c7b18da1e0b7fe52bc75956be1608881c134a5df 100644 (file)
--- a/BoardConfigCFlags.mk
+++ b/BoardConfigCFlags.mk
@@ -1,6 +1,6 @@
 ifeq ($(BOARD_USES_FIMGAPI_V5X), true)
     LOCAL_CFLAGS += -DFIMGAPI_V5X
-ifeq ($(filter 3.18, $(TARGET_LINUX_KERNEL_VERSION)), 3.18)
+ifeq ($(BOARD_USES_FIMG2D_M2M1SHOT2), true)
     LOCAL_CFLAGS += -DFIMG2D_USE_M2M1SHOT2
 endif
 endif

diff --git a/libfimg5x/FimgExynos5.cpp b/libfimg5x/FimgExynos5.cpp
index 2d5a865460d5a83c4149e7bbb87ef60e6c74d9c8..5256e23896c833c7413d668b0055f007f9ba4705 100644 (file)
--- a/libfimg5x/FimgExynos5.cpp
+++ b/libfimg5x/FimgExynos5.cpp
@@ -21,7 +21,10 @@
 #define LOG_TAG "FimgExynos5"
 #include <utils/Log.h>
 
+#ifdef FIMG2D_USE_M2M1SHOT2
 #include <linux/m2m1shot2.h>
+#endif
+
 #include "FimgExynos5.h"
 
 extern pthread_mutex_t s_g2d_lock;