Merge "defconfig: sdm855: enable compilation of SDE display driver" (2b9a5e88) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/configs/sdm855-perf_defconfig

+6 −5

Original line number	Diff line number	Diff line
		@@ -293,7 +293,6 @@ CONFIG_THERMAL=y
		CONFIG_QCOM_SPMI_TEMP_ALARM=y
		CONFIG_THERMAL_TSENS=y
		CONFIG_MFD_SPMI_PMIC=y
		CONFIG_REGULATOR=y
		CONFIG_REGULATOR_FIXED_VOLTAGE=y
		CONFIG_REGULATOR_QPNP_LCDB=y
		CONFIG_REGULATOR_RPMH=y
		@@ -307,8 +306,12 @@ CONFIG_VIDEO_FIXED_MINOR_RANGES=y
		CONFIG_V4L_PLATFORM_DRIVERS=y
		CONFIG_MSM_VIDC_V4L2=y
		CONFIG_MSM_VIDC_GOVERNORS=y
		CONFIG_MSM_SDE_ROTATOR=y
		CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y
		CONFIG_MSM_NPU=y
		CONFIG_FB=y
		CONFIG_DRM=y
		CONFIG_DRM_MSM_REGISTER_LOGGING=y
		CONFIG_DRM_SDE_RSC=y
		CONFIG_FB_ARMCLCD=y
		CONFIG_LOGO=y
		# CONFIG_LOGO_LINUX_MONO is not set
		@@ -360,7 +363,6 @@ CONFIG_RTC_CLASS=y
		CONFIG_RTC_DRV_QPNP=y
		CONFIG_DMADEVICES=y
		CONFIG_QCOM_GPI_DMA=y
		CONFIG_SYNC_FILE=y
		CONFIG_UIO=y
		CONFIG_STAGING=y
		CONFIG_ASHMEM=y
		@@ -374,6 +376,7 @@ CONFIG_RMNET_IPA3=y
		CONFIG_RNDIS_IPA=y
		CONFIG_IPA_UT=y
		CONFIG_MSM_11AD=m
		CONFIG_QCOM_MDSS_PLL=y
		CONFIG_SPMI_PMIC_CLKDIV=y
		CONFIG_MSM_CLK_AOP_QMP=y
		CONFIG_MSM_GCC_SDM855=y
		@@ -402,7 +405,6 @@ CONFIG_QCOM_LLCC=y
		CONFIG_QCOM_SDM855_LLCC=y
		CONFIG_QCOM_QMI_HELPERS=y
		CONFIG_QCOM_SMEM=y
		CONFIG_QCOM_SCM=y
		CONFIG_QCOM_MEMORY_DUMP_V2=y
		CONFIG_QCOM_WATCHDOG_V2=y
		CONFIG_QCOM_SMP2P=y
		@@ -451,7 +453,6 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
		CONFIG_FUSE_FS=y
		CONFIG_MSDOS_FS=y
		CONFIG_VFAT_FS=y
		CONFIG_TMPFS=y
		CONFIG_TMPFS_POSIX_ACL=y
		CONFIG_ECRYPT_FS=y
		CONFIG_ECRYPT_FS_MESSAGING=y

+8 −5

Original line number	Diff line number	Diff line
		@@ -302,7 +302,6 @@ CONFIG_THERMAL=y
		CONFIG_QCOM_SPMI_TEMP_ALARM=y
		CONFIG_THERMAL_TSENS=y
		CONFIG_MFD_SPMI_PMIC=y
		CONFIG_REGULATOR=y
		CONFIG_REGULATOR_FIXED_VOLTAGE=y
		CONFIG_REGULATOR_QPNP_LCDB=y
		CONFIG_REGULATOR_RPMH=y
		@@ -316,9 +315,15 @@ CONFIG_VIDEO_FIXED_MINOR_RANGES=y
		CONFIG_V4L_PLATFORM_DRIVERS=y
		CONFIG_MSM_VIDC_V4L2=y
		CONFIG_MSM_VIDC_GOVERNORS=y
		CONFIG_MSM_SDE_ROTATOR=y
		CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y
		CONFIG_MSM_NPU=y
		CONFIG_FB=y
		CONFIG_DRM=y
		CONFIG_DRM_MSM_REGISTER_LOGGING=y
		CONFIG_DRM_SDE_RSC=y
		CONFIG_FB_VIRTUAL=y
		CONFIG_BACKLIGHT_LCD_SUPPORT=y
		CONFIG_BACKLIGHT_CLASS_DEVICE=y
		CONFIG_LOGO=y
		# CONFIG_LOGO_LINUX_MONO is not set
		# CONFIG_LOGO_LINUX_VGA16 is not set
		@@ -372,7 +377,6 @@ CONFIG_RTC_DRV_QPNP=y
		CONFIG_DMADEVICES=y
		CONFIG_QCOM_GPI_DMA=y
		CONFIG_QCOM_GPI_DMA_DEBUG=y
		CONFIG_SYNC_FILE=y
		CONFIG_UIO=y
		CONFIG_STAGING=y
		CONFIG_ASHMEM=y
		@@ -386,6 +390,7 @@ CONFIG_RMNET_IPA3=y
		CONFIG_RNDIS_IPA=y
		CONFIG_IPA_UT=y
		CONFIG_MSM_11AD=m
		CONFIG_QCOM_MDSS_PLL=y
		CONFIG_SPMI_PMIC_CLKDIV=y
		CONFIG_MSM_CLK_AOP_QMP=y
		CONFIG_MSM_GCC_SDM855=y
		@@ -414,7 +419,6 @@ CONFIG_QCOM_LLCC=y
		CONFIG_QCOM_SDM855_LLCC=y
		CONFIG_QCOM_QMI_HELPERS=y
		CONFIG_QCOM_SMEM=y
		CONFIG_QCOM_SCM=y
		CONFIG_QCOM_MEMORY_DUMP_V2=y
		CONFIG_QCOM_WATCHDOG_V2=y
		CONFIG_QCOM_SMP2P=y
		@@ -469,7 +473,6 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
		CONFIG_FUSE_FS=y
		CONFIG_MSDOS_FS=y
		CONFIG_VFAT_FS=y
		CONFIG_TMPFS=y
		CONFIG_TMPFS_POSIX_ACL=y
		CONFIG_EFIVAR_FS=y
		CONFIG_ECRYPT_FS=y