From 92f79d8be16f2602c889ce43d68d352ab80cd189 Mon Sep 17 00:00:00 2001 From: Alex Danila Date: Wed, 19 Oct 2022 12:55:20 -0400 Subject: [PATCH] disp: msm: compile pineapple msm with spec fence Enabled compilation of msm driver with spec fence component. Change-Id: I6f9e1f4930639a5f5e043ecd5b9addf4d6f233b5 Signed-off-by: Alex Danila Signed-off-by: Nilaan Gunabalachandran --- config/gki_pineappledisp.conf | 1 + config/gki_pineappledispconf.h | 1 + msm/Android.mk | 10 +++++++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/config/gki_pineappledisp.conf b/config/gki_pineappledisp.conf index 823f48395f..b6412a1316 100644 --- a/config/gki_pineappledisp.conf +++ b/config/gki_pineappledisp.conf @@ -14,3 +14,4 @@ export CONFIG_DISPLAY_BUILD=m export CONFIG_HDCP_QSEECOM=n export CONFIG_DRM_SDE_VM=y export CONFIG_QTI_HW_FENCE=n +export CONFIG_QCOM_SPEC_SYNC=y diff --git a/config/gki_pineappledispconf.h b/config/gki_pineappledispconf.h index 34179725c5..108afde6c1 100644 --- a/config/gki_pineappledispconf.h +++ b/config/gki_pineappledispconf.h @@ -22,3 +22,4 @@ #define CONFIG_HDCP_QSEECOM 0 #define CONFIG_DRM_SDE_VM 1 #define CONFIG_QTI_HW_FENCE 0 +#define CONFIG_QCOM_SPEC_SYNC 1 diff --git a/msm/Android.mk b/msm/Android.mk index a8acfa3426..ba7180229d 100644 --- a/msm/Android.mk +++ b/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