From 473453a8d9b738c1d583be3472d82c372ec135fa 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 mm-drivers Enabled compilation of msm_drm with mm-drivers components. Change-Id: Id2f15b314748f9a1a9966625cea98fa4b3855e87 Signed-off-by: Alex Danila --- 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 9b17464642..21047c3081 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=n 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 62930274f2..8ab06c4f9a 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 0 #define CONFIG_QTI_HW_FENCE 0 +#define CONFIG_QCOM_SPEC_SYNC 1 diff --git a/msm/Android.mk b/msm/Android.mk index 57c6a27a26..9f42d10c07 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