disp: msm: enable hw-fence driver import for pineapple

Enable hw-fence driver for Display in pineapple.
This change only allows Display to import the
hw-fence driver api's, but does not enable the
feature by default. Enablement of the feature in
the driver is done through the device tree property.

Change-Id: I4fe97e0cc76f780d1326a69c4162dc4908e89724
Signed-off-by: Ingrid Gallardo <[email protected]>

config/gki_pineappledisp.conf

@@ -13,6 +13,6 @@ export CONFIG_MSM_MMRM=y
 export CONFIG_DISPLAY_BUILD=m
 export CONFIG_HDCP_QSEECOM=n
 export CONFIG_DRM_SDE_VM=y
-export CONFIG_QTI_HW_FENCE=n
+export CONFIG_QTI_HW_FENCE=y
 export CONFIG_QCOM_SPEC_SYNC=y
 export CONFIG_QCOM_WCD939X_I2C=y

config/gki_pineappledispconf.h

@@ -21,6 +21,6 @@
 #define CONFIG_MSM_EXT_DISPLAY 1
 #define CONFIG_HDCP_QSEECOM 0
 #define CONFIG_DRM_SDE_VM 1
-#define CONFIG_QTI_HW_FENCE 0
+#define CONFIG_QTI_HW_FENCE 1
 #define CONFIG_QCOM_SPEC_SYNC 1
 #define CONFIG_QCOM_WCD939X_I2C 1

msm/Android.mk

@@ -27,12 +27,12 @@ KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM
 ifneq ($(TARGET_BOARD_PLATFORM), pineapple)
 ifneq ($(TARGET_BOARD_PLATFORM), taro)
 	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
 endif
 endif
 ifneq ($(TARGET_BOARD_PLATFORM), taro)
 	KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,sync-fence-module-symvers)/Module.symvers
 	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,hw-fence-module-symvers)/Module.symvers
 endif
 endif
 
@@ -51,16 +51,16 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,mmrm-module-s
 ifneq ($(TARGET_BOARD_PLATFORM), pineapple)
 ifneq ($(TARGET_BOARD_PLATFORM), taro)
 	LOCAL_REQUIRED_MODULES    += sec-module-symvers
-	LOCAL_REQUIRED_MODULES    += hw-fence-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
 endif
 endif
 ifneq ($(TARGET_BOARD_PLATFORM), taro)
 	LOCAL_REQUIRED_MODULES    += sync-fence-module-symvers
 	LOCAL_REQUIRED_MODULES    += msm-ext-disp-module-symvers
+	LOCAL_REQUIRED_MODULES    += hw-fence-module-symvers
 	LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,sync-fence-module-symvers)/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,hw-fence-module-symvers)/Module.symvers
 endif
 endif