Merge "disp: msm: compile pineapple msm with mm-drivers"

config/gki_pineappledisp.conf

@@ -14,3 +14,4 @@ export CONFIG_DISPLAY_BUILD=m
 export CONFIG_HDCP_QSEECOM=n
 export CONFIG_DRM_SDE_VM=n
 export CONFIG_QTI_HW_FENCE=n
+export CONFIG_QCOM_SPEC_SYNC=y

config/gki_pineappledispconf.h

@@ -22,3 +22,4 @@
 #define CONFIG_HDCP_QSEECOM 0
 #define CONFIG_DRM_SDE_VM 0
 #define CONFIG_QTI_HW_FENCE 0
+#define CONFIG_QCOM_SPEC_SYNC 1

msm/Android.mk

@@ -29,9 +29,11 @@ ifneq ($(TARGET_BOARD_PLATFORM), taro)
 	KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,msm-ext-disp-module-symvers)/Module.symvers
 	KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,sec-module-symvers)/Module.symvers
 	KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,hw-fence-module-symvers)/Module.symvers
-	KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,sync-fence-module-symvers)/Module.symvers
 endif
 endif
+ifneq ($(TARGET_BOARD_PLATFORM), taro)
+	KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,sync-fence-module-symvers)/Module.symvers
+endif
 endif
 
 ###########################################################
@@ -51,13 +53,15 @@ ifneq ($(TARGET_BOARD_PLATFORM), taro)
 	LOCAL_REQUIRED_MODULES    += msm-ext-disp-module-symvers
 	LOCAL_REQUIRED_MODULES    += sec-module-symvers
 	LOCAL_REQUIRED_MODULES    += hw-fence-module-symvers
-	LOCAL_REQUIRED_MODULES    += sync-fence-module-symvers
 	LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,msm-ext-disp-module-symvers)/Module.symvers
 	LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,sec-module-symvers)/Module.symvers
 	LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,hw-fence-module-symvers)/Module.symvers
-	LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,sync-fence-module-symvers)/Module.symvers
 endif
 endif
+ifneq ($(TARGET_BOARD_PLATFORM), taro)
+	LOCAL_REQUIRED_MODULES    += sync-fence-module-symvers
+	LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,sync-fence-module-symvers)/Module.symvers
+endif
 endif
 
 include $(DLKM_DIR)/Build_external_kernelmodule.mk