From c6b0d1fbe9d3894eab8bfa2a8588ea3fdaaf8c0d Mon Sep 17 00:00:00 2001 From: Andhavarapu Karthik Date: Mon, 25 Oct 2021 16:05:46 +0530 Subject: [PATCH 1/2] disp: msm: sde: Move TVM related code under SDE VM config This change moves TVM related code under SDE VM config. Change-Id: I8357d6a984fd97f18f24eee33464299e8ea66b12 Signed-off-by: Andhavarapu Karthik --- msm/sde/sde_kms.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/msm/sde/sde_kms.c b/msm/sde/sde_kms.c index d1f7359b6f..e43a42dbf3 100644 --- a/msm/sde/sde_kms.c +++ b/msm/sde/sde_kms.c @@ -58,7 +58,9 @@ #include #include "soc/qcom/secure_buffer.h" #include +#ifdef CONFIG_DRM_SDE_VM #include +#endif #define CREATE_TRACE_POINTS #include "sde_trace.h" @@ -4823,6 +4825,7 @@ parse_fail: return rc; } +#ifdef CONFIG_DRM_SDE_VM int sde_kms_get_io_resources(struct sde_kms *sde_kms, struct msm_io_res *io_res) { struct platform_device *pdev = to_platform_device(sde_kms->dev->dev); @@ -4854,6 +4857,7 @@ int sde_kms_get_io_resources(struct sde_kms *sde_kms, struct msm_io_res *io_res) return rc; } +#endif static int sde_kms_hw_init(struct msm_kms *kms) { From 6e05f12db7712f4209f1b8288f12a10ad922ecb8 Mon Sep 17 00:00:00 2001 From: Karthik Andhavarapu Date: Thu, 12 Aug 2021 13:01:12 +0530 Subject: [PATCH 2/2] disp: msm: add display config support for neo Add display config support for compilation on neo target. Change-Id: Ia2b9b8b76f833e233a8bf801485c6dd2104e1700 Signed-off-by: Karthik Andhavarapu --- config/gki_neodisp.conf | 11 +++++++++++ config/gki_neodispconf.h | 14 ++++++++++++++ msm/Kbuild | 5 +++++ 3 files changed, 30 insertions(+) create mode 100644 config/gki_neodisp.conf create mode 100644 config/gki_neodispconf.h diff --git a/config/gki_neodisp.conf b/config/gki_neodisp.conf new file mode 100644 index 0000000000..e37085cf05 --- /dev/null +++ b/config/gki_neodisp.conf @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (c) 2021, The Linux Foundation. All rights reserved. + +export CONFIG_DRM_MSM=y +export CONFIG_DRM_MSM_SDE=y +export CONFIG_SYNC_FILE=y +export CONFIG_DRM_MSM_DSI=y +export CONFIG_DSI_PARSER=y +export CONFIG_QCOM_MDSS_PLL=y +export CONFIG_DRM_MSM_REGISTER_LOGGING=y +export CONFIG_DISPLAY_BUILD=m diff --git a/config/gki_neodispconf.h b/config/gki_neodispconf.h new file mode 100644 index 0000000000..c8bf59de14 --- /dev/null +++ b/config/gki_neodispconf.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2021, 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_DSI_PARSER 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 diff --git a/msm/Kbuild b/msm/Kbuild index 0dab5b227f..8fca1d173e 100644 --- a/msm/Kbuild +++ b/msm/Kbuild @@ -12,6 +12,11 @@ else endif endif +ifeq ($(CONFIG_ARCH_NEO), y) + include $(DISPLAY_ROOT)/config/gki_neodisp.conf + LINUX_INC += -include $(DISPLAY_ROOT)/config/gki_neodispconf.h +endif + LINUX_INC += -Iinclude/linux \ -Iinclude/linux/drm