Merge "drm: msm: move display mmrm enable config to platform config" into display-kernel.lnx.5.10

config/gki_waipiodisp.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

config/gki_waipiodispconf.h

@@ -13,6 +13,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

msm/Kbuild

@@ -7,8 +7,6 @@ ifeq ($(CONFIG_ARCH_WAIPIO), y)
 	LINUX_INC +=	-include $(DISPLAY_ROOT)/config/gki_waipiodispconf.h
 endif
 
-KBUILD_CPPFLAGS += -DCONFIG_MSM_MMRM=1
-
 LINUX_INC +=	-Iinclude/linux \
 		-Iinclude/linux/drm
 

msm/msm_drv.c

@@ -2164,7 +2164,9 @@ static void __exit msm_drm_unregister(void)
 module_init(msm_drm_register);
 module_exit(msm_drm_unregister);
 
+#if IS_ENABLED(CONFIG_MSM_MMRM)
 MODULE_SOFTDEP("pre: msm-mmrm");
+#endif
 MODULE_AUTHOR("Rob Clark <[email protected]");
 MODULE_DESCRIPTION("MSM DRM Driver");
 MODULE_LICENSE("GPL");