From d28f68dedec0219c60df79f457e3c89d8b6703c4 Mon Sep 17 00:00:00 2001 From: Rahul Sharma Date: Fri, 22 Apr 2022 02:27:25 +0530 Subject: [PATCH] disp: msm: add augen3 configuration Add augen3 configuration for SA8155/SA8195/SA6155 family. Change-Id: I206f0a636ef9f33b4c46cb0159ae2659a3dced59 Signed-off-by: Rahul Sharma --- config/augen3disp.conf | 18 ++++++++++++++++++ config/augen3dispconf.h | 22 ++++++++++++++++++++++ include/uapi/display/media/mmm_color_fmt.h | 2 ++ msm/Android.mk | 4 ++++ msm/Kbuild | 9 +++++++-- 5 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 config/augen3disp.conf create mode 100644 config/augen3dispconf.h diff --git a/config/augen3disp.conf b/config/augen3disp.conf new file mode 100644 index 0000000000..a936c0503d --- /dev/null +++ b/config/augen3disp.conf @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: GPL-2.0-only + +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=n +export CONFIG_DRM_MSM_DP_MST=n +export CONFIG_QCOM_MDSS_PLL=y +export CONFIG_DRM_SDE_RSC=n +export CONFIG_DRM_SDE_WB=n +export CONFIG_DRM_MSM_REGISTER_LOGGING=n +export CONFIG_SDE_RECOVERY_MANAGER=n +export CONFIG_DRM_SDE_SHD=n +export CONFIG_DRM_SDE_SHP=n +export CONFIG_DRM_SDE_ROI_MISR=n +export CONFIG_DRM_MSM_LEASE=n +export CONFIG_DISPLAY_BUILD=m diff --git a/config/augen3dispconf.h b/config/augen3dispconf.h new file mode 100644 index 0000000000..dea5c76c51 --- /dev/null +++ b/config/augen3dispconf.h @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. 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 0 +#define CONFIG_DRM_MSM_DP_MST 0 +#define CONFIG_DRM_SDE_WB 0 +#define CONFIG_DRM_SDE_RSC 0 +#define CONFIG_DRM_MSM_REGISTER_LOGGING 0 +#define CONFIG_DRM_SDE_EVTLOG_DEBUG 1 +#define CONFIG_QCOM_MDSS_PLL 1 +#define CONFIG_GKI_DISPLAY 1 +#define CONFIG_MSM_EXT_DISPLAY 1 +#define CONFIG_DRM_SDE_ROI_MISR 0 +#define CONFIG_DRM_SDE_SHD 0 +#define CONFIG_DRM_SDE_SHP 0 +#define CONFIG_DRM_MSM_LEASE 0 diff --git a/include/uapi/display/media/mmm_color_fmt.h b/include/uapi/display/media/mmm_color_fmt.h index ff1335a139..917b2d373e 100644 --- a/include/uapi/display/media/mmm_color_fmt.h +++ b/include/uapi/display/media/mmm_color_fmt.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __MMM_COLOR_FMT_INFO_H__ #define __MMM_COLOR_FMT_INFO_H__ @@ -887,6 +888,7 @@ static inline unsigned int MMM_COLOR_FMT_Y_STRIDE(unsigned int color_fmt, case MMM_COLOR_FMT_P010_512: alignment = 512; stride = MMM_COLOR_FMT_ALIGN(width * 2, alignment); + break; default: break; } diff --git a/msm/Android.mk b/msm/Android.mk index 56e86a354f..ec91f145e5 100644 --- a/msm/Android.mk +++ b/msm/Android.mk @@ -22,11 +22,13 @@ KBUILD_OPTIONS += MODNAME=msm_drm KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM) KBUILD_OPTIONS += $(DISPLAY_SELECT) +ifneq ($(TARGET_BOARD_AUTO),true) 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 +endif ########################################################### include $(CLEAR_VARS) @@ -37,6 +39,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) +ifneq ($(TARGET_BOARD_AUTO),true) LOCAL_REQUIRED_MODULES += mmrm-module-symvers LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers ifneq ($(TARGET_BOARD_PLATFORM), taro) @@ -45,6 +48,7 @@ ifneq ($(TARGET_BOARD_PLATFORM), taro) 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 +endif include $(DLKM_DIR)/Build_external_kernelmodule.mk ########################################################### diff --git a/msm/Kbuild b/msm/Kbuild index ca736f4c24..be1dd287ae 100644 --- a/msm/Kbuild +++ b/msm/Kbuild @@ -22,7 +22,7 @@ ifeq ($(CONFIG_ARCH_PARROT), y) LINUX_INC += -include $(DISPLAY_ROOT)/config/gki_parrotdispconf.h endif -#ifeq ($(CONFIG_ARCH_KALAMA), y) +ifeq ($(CONFIG_ARCH_KALAMA), y) ifeq ($(CONFIG_ARCH_QTI_VM), y) include $(DISPLAY_ROOT)/config/gki_kalamadisptui.conf LINUX_INC += -include $(DISPLAY_ROOT)/config/gki_kalamadisptuiconf.h @@ -30,7 +30,12 @@ else include $(DISPLAY_ROOT)/config/gki_kalamadisp.conf LINUX_INC += -include $(DISPLAY_ROOT)/config/gki_kalamadispconf.h endif -#endif +endif + +ifeq (y, $(findstring y, $(CONFIG_ARCH_SA8155) $(CONFIG_ARCH_SA6155) $(CONFIG_ARCH_SA8195))) + include $(DISPLAY_ROOT)/config/augen3disp.conf + LINUX_INC += -include $(DISPLAY_ROOT)/config/augen3dispconf.h +endif LINUX_INC += -Iinclude/linux \ -Iinclude/linux/drm