From 6cda336fc9a914b00d16d7115f24e377f9e3de8c Mon Sep 17 00:00:00 2001 From: Shashank Babu Chinta Venkata Date: Mon, 23 Sep 2019 10:54:29 -0700 Subject: [PATCH] disp: msm: make msm_drm as module for GKI Make msm_drm as DLKM(Dynamically lodable kernel module) for GKI config. Change-Id: I1c11c2de9d24da7f26333f94a157c35581bc2459 Signed-off-by: Shashank Babu Chinta Venkata Signed-off-by: Chandan Uddaraju --- Makefile | 8 ++++++-- config/gki_lahainadisp.conf | 11 +++++++++++ config/gki_lahainadispconf.h | 18 ++++++++++++++++++ config/lahainadisp.conf | 3 +-- hdcp/Makefile | 3 --- msm/Makefile | 5 ++++- 6 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 config/gki_lahainadisp.conf create mode 100644 config/gki_lahainadispconf.h delete mode 100644 hdcp/Makefile diff --git a/Makefile b/Makefile index d2c21484295a..13f0321b2538 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,13 @@ LINUXINCLUDE += -include $(srctree)/techpack/display/config/konadispconf.h endif ifeq ($(CONFIG_ARCH_LAHAINA), y) -include $(srctree)/techpack/display/config/lahainadisp.conf + ifeq ($(CONFIG_QGKI), y) + include $(srctree)/techpack/display/config/lahainadisp.conf LINUXINCLUDE += -include $(srctree)/techpack/display/config/lahainadispconf.h + else + include $(srctree)/techpack/display/config/gki_lahainadisp.conf +LINUXINCLUDE += -include $(srctree)/techpack/display/config/gki_lahainadispconf.h + endif LINUXINCLUDE += \ -I$(srctree)/techpack/display/include/uapi/display \ -I$(srctree)/techpack/display/include @@ -36,4 +41,3 @@ endif obj-$(CONFIG_DRM_MSM) += msm/ obj-$(CONFIG_MSM_SDE_ROTATOR) += rotator/ -obj-$(CONFIG_HDCP_QSEECOM) += hdcp/ diff --git a/config/gki_lahainadisp.conf b/config/gki_lahainadisp.conf new file mode 100644 index 000000000000..55d89af4f6b8 --- /dev/null +++ b/config/gki_lahainadisp.conf @@ -0,0 +1,11 @@ +export CONFIG_DRM_MSM=y +export CONFIG_DRM_MSM_SDE=y +export CONFIG_SYNC_FILE=y +export CONFIG_DRM_MSM_DSI=y +export CONFIG_DRM_MSM_DP=y +export CONFIG_DSI_PARSER=y +export CONFIG_QCOM_MDSS_PLL=y +export CONFIG_DRM_SDE_WB=y +export CONFIG_DRM_MSM_REGISTER_LOGGING=y +export CONFIG_DRM_SDE_RSC=y +export CONFIG_DISPLAY_BUILD=m diff --git a/config/gki_lahainadispconf.h b/config/gki_lahainadispconf.h new file mode 100644 index 000000000000..50ddaab91895 --- /dev/null +++ b/config/gki_lahainadispconf.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2020, The Linux Foundation. All rights reserved. + */ + +#define CONFIG_DRM_MSM 1 +#define CONFIG_DRM_MSM_SDE 1 +#define CONFIG_SYNC_FILE 1 +#define CONFIG_DRM_MSM_DSI 1 +#define CONFIG_DRM_MSM_DP 1 +#define CONFIG_DSI_PARSER 1 +#define CONFIG_DRM_SDE_WB 1 +#define CONFIG_DRM_MSM_REGISTER_LOGGING 1 +#define CONFIG_DRM_SDE_EVTLOG_DEBUG 1 +#define CONFIG_QCOM_MDSS_PLL 1 +#define CONFIG_GKI_DISPLAY 1 +#define CONFIG_DRM_SDE_RSC 1 + diff --git a/config/lahainadisp.conf b/config/lahainadisp.conf index 9579afad03a0..69feb2be18af 100644 --- a/config/lahainadisp.conf +++ b/config/lahainadisp.conf @@ -1,4 +1,3 @@ -ifeq ($(CONFIG_QGKI),y) export CONFIG_DRM_MSM=y export CONFIG_DRM_MSM_SDE=y export CONFIG_DRM_MSM_DP=y @@ -9,4 +8,4 @@ export CONFIG_DRM_SDE_WB=y export CONFIG_DRM_MSM_REGISTER_LOGGING=y export CONFIG_QCOM_MDSS_PLL=y export CONFIG_DRM_SDE_RSC=y -endif +export CONFIG_DISPLAY_BUILD=y diff --git a/hdcp/Makefile b/hdcp/Makefile deleted file mode 100644 index a69c13e36900..000000000000 --- a/hdcp/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - -obj-$(CONFIG_HDCP_QSEECOM) += msm_hdcp.o \ diff --git a/msm/Makefile b/msm/Makefile index 1e52c29881fd..56a242934114 100644 --- a/msm/Makefile +++ b/msm/Makefile @@ -2,6 +2,7 @@ ccflags-y := -I$(srctree)/include/drm -I$(srctree)/techpack/display/msm -I$(srctree)/techpack/display/msm/dsi -I$(srctree)/techpack/display/msm/dp ccflags-y += -I$(srctree)/techpack/display/msm/sde ccflags-y += -I$(srctree)/techpack/display/rotator +ccflags-y += -I$(srctree)/techpack/display/hdcp ccflags-y += -I$(srctree)/drivers/clk/qcom/ msm_drm-$(CONFIG_DRM_MSM_DP) += dp/dp_altmode.o \ @@ -127,4 +128,6 @@ msm_drm-$(CONFIG_DRM_MSM) += \ msm_smmu.o \ msm_prop.o \ -obj-$(CONFIG_DRM_MSM) += msm_drm.o +msm_drm-$(CONFIG_HDCP_QSEECOM) += ../hdcp/msm_hdcp.o \ + +obj-$(CONFIG_DISPLAY_BUILD) += msm_drm.o