evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "defconfig: msm: Define common hypervisor flag"

Browse source
This commit is contained in:
Linux Build Service Account 2018-07-28 04:00:26 -07:00 • committed by Gerrit - the friendly Code Review server
commit 7adc4e13a4
5 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/arm64/Kconfig
View file

@ -260,6 +260,15 @@ config PGTABLE_LEVELS
default 3 if ARM64_16K_PAGES && ARM64_VA_BITS_47 default 3 if ARM64_16K_PAGES && ARM64_VA_BITS_47
default 4 if !ARM64_64K_PAGES && ARM64_VA_BITS_48 default 4 if !ARM64_64K_PAGES && ARM64_VA_BITS_48
config MSM_GVM
bool "Enable virtualization Support for MSM kernel"
help
This enables support for MSM Kernel based virtual
machine for any platform.
This helps to enable virtual driver support.
This should work on 64bit machine.
If you don't know what to do here, say N.
config MSM_GVM_QUIN config MSM_GVM_QUIN
bool "Enable virtualization Support for MSM kernel required for QUIN platform" bool "Enable virtualization Support for MSM kernel required for QUIN platform"
help help

2
arch/arm64/configs/msm-auto-gvm-perf_defconfig
View file

@ -1,3 +1,4 @@
CONFIG_MSM_GVM=y
CONFIG_LOCALVERSION="-perf" CONFIG_LOCALVERSION="-perf"
# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
@ -267,7 +268,6 @@ CONFIG_MEDIA_CONTROLLER=y
CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_VIDEO_V4L2_SUBDEV_API=y
CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_DRM=y CONFIG_DRM=y
# CONFIG_DRM_MSM is not set
CONFIG_SOUND=y CONFIG_SOUND=y
CONFIG_SND=y CONFIG_SND=y
CONFIG_SND_SOC=y CONFIG_SND_SOC=y

2
arch/arm64/configs/msm-auto-gvm_defconfig
View file

@ -1,3 +1,4 @@
CONFIG_MSM_GVM=y
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
CONFIG_AUDIT=y CONFIG_AUDIT=y
CONFIG_NO_HZ=y CONFIG_NO_HZ=y
@ -259,7 +260,6 @@ CONFIG_MEDIA_CONTROLLER=y
CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_VIDEO_V4L2_SUBDEV_API=y
CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_DRM=y CONFIG_DRM=y
# CONFIG_DRM_MSM is not set
CONFIG_SOUND=y CONFIG_SOUND=y
CONFIG_SND=y CONFIG_SND=y
CONFIG_SND_SOC=y CONFIG_SND_SOC=y

2
drivers/gpu/drm/msm-hyp/Kconfig
View file

@ -6,7 +6,7 @@
config DRM_MSM_HYP config DRM_MSM_HYP
tristate "MSM DRM HYP" tristate "MSM DRM HYP"
depends on DRM depends on DRM
depends on MSM_GVM_QUIN depends on MSM_GVM
depends on OF depends on OF
default y default y
help help

1
drivers/gpu/drm/msm/Kconfig
View file

@ -4,6 +4,7 @@ config DRM_MSM
depends on DRM depends on DRM
depends on ARCH_QCOM || (ARM && COMPILE_TEST) depends on ARCH_QCOM || (ARM && COMPILE_TEST)
depends on OF depends on OF
depends on !MSM_GVM
select REGULATOR select REGULATOR
select DRM_KMS_HELPER select DRM_KMS_HELPER
select DRM_PANEL select DRM_PANEL