From 76ca21c9bad3c70f673d6b1deeb587713b605ac3 Mon Sep 17 00:00:00 2001 From: Narendra Muppalla Date: Wed, 30 Mar 2022 17:36:05 -0700 Subject: [PATCH 1/2] disp: msm: link mmrm module as a dependency This change links mmrm and msm-ext-disp module linked as an additional dependency for display drivers. Change-Id: I465a50af9464c16ef26e926f201a7dff1c9af6cf Signed-off-by: Narendra Muppalla --- msm/Android.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/msm/Android.mk b/msm/Android.mk index 8a9925c2e1..d67abafbad 100644 --- a/msm/Android.mk +++ b/msm/Android.mk @@ -22,9 +22,9 @@ KBUILD_OPTIONS += MODNAME=msm_drm KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM) KBUILD_OPTIONS += $(DISPLAY_SELECT) -KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS=$(PWD)/$(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers +KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers 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,msm-ext-disp-module-symvers)/Module.symvers endif ########################################################### @@ -36,8 +36,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) -LOCAL_REQUIRED_MODULES := mmrm-module-symvers -LOCAL_ADDITIONAL_DEPENDENCIES := $(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers +LOCAL_REQUIRED_MODULES += mmrm-module-symvers +LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers ifneq ($(TARGET_BOARD_PLATFORM), taro) LOCAL_REQUIRED_MODULES += msm-ext-disp-module-symvers LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,msm-ext-disp-module-symvers)/Module.symvers From 05e82e9f971e2d64ae43e824044c5b8bfc5d9035 Mon Sep 17 00:00:00 2001 From: Narendra Muppalla Date: Mon, 28 Feb 2022 17:11:48 -0800 Subject: [PATCH 2/2] disp: msm: add mmrm configs for Kalama This change adds display mmrm build configs for kalama target. Change-Id: Ic35f396733c5031ea4f62e0fa3b3b6ea662a198b Signed-off-by: Narendra Muppalla --- config/gki_kalamadisp.conf | 1 + config/gki_kalamadispconf.h | 1 + 2 files changed, 2 insertions(+) diff --git a/config/gki_kalamadisp.conf b/config/gki_kalamadisp.conf index c4327eba76..acc31a327a 100644 --- a/config/gki_kalamadisp.conf +++ b/config/gki_kalamadisp.conf @@ -9,5 +9,6 @@ export CONFIG_QCOM_MDSS_PLL=y export CONFIG_DRM_SDE_RSC=y export CONFIG_DRM_SDE_WB=y export CONFIG_DRM_MSM_REGISTER_LOGGING=y +export CONFIG_MSM_MMRM=y export CONFIG_DISPLAY_BUILD=m export CONFIG_DRM_SDE_VM=y diff --git a/config/gki_kalamadispconf.h b/config/gki_kalamadispconf.h index 17ec948b5c..c5979f8a67 100644 --- a/config/gki_kalamadispconf.h +++ b/config/gki_kalamadispconf.h @@ -14,6 +14,7 @@ #define CONFIG_DRM_SDE_WB 1 #define CONFIG_DRM_SDE_RSC 1 #define CONFIG_DRM_MSM_REGISTER_LOGGING 1 +#define CONFIG_MSM_MMRM 1 #define CONFIG_DRM_SDE_EVTLOG_DEBUG 1 #define CONFIG_QCOM_MDSS_PLL 1 #define CONFIG_GKI_DISPLAY 1