Merge "disp: config: enable HDCP config for kalama"

config/gki_kalamadisp.conf

@@ -11,4 +11,5 @@ 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_HDCP_QSEECOM=y
 export CONFIG_DRM_SDE_VM=y

config/gki_kalamadispconf.h

@@ -19,4 +19,5 @@
 #define CONFIG_QCOM_MDSS_PLL 1
 #define CONFIG_GKI_DISPLAY 1
 #define CONFIG_MSM_EXT_DISPLAY 1
+#define CONFIG_HDCP_QSEECOM 1
 #define CONFIG_DRM_SDE_VM 1

msm/Android.mk

@@ -25,6 +25,7 @@ KBUILD_OPTIONS += $(DISPLAY_SELECT)
 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,sec-module-symvers)/Module.symvers
 endif
 
 ###########################################################
@@ -40,7 +41,9 @@ 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_REQUIRED_MODULES    += sec-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
 endif
 
 include $(DLKM_DIR)/Build_external_kernelmodule.mk