diff options
| author | Jesse Hall <jessehall@google.com> | 2021-09-14 17:25:40 -0700 |
|---|---|---|
| committer | Jesse Hall <jessehall@google.com> | 2021-09-14 22:16:39 -0700 |
| commit | 7761aeec427fa9f29dae070c6dad1ce253b94d78 (patch) | |
| tree | 638a30665409c68f5ef99c1a3307edcc2db2e690 /mali_kbase/Makefile | |
| parent | 9c0c2ac738194c9cd2ced31d92a606826c252cd4 (diff) | |
| parent | da58ff5ae236f3ad7e3eae7812bdddc2b1d4c620 (diff) | |
| download | gpu-7761aeec427fa9f29dae070c6dad1ce253b94d78.tar.gz | |
Merge android12-gs-pixel-5.10-sc into android13-gs-pixel-5.10
Bug: 199213963
Signed-off-by: Jesse Hall <jessehall@google.com>
Change-Id: I777fd4796386b753796f2be9cbdb6dab73a2fa47
Diffstat (limited to 'mali_kbase/Makefile')
| -rw-r--r-- | mali_kbase/Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mali_kbase/Makefile b/mali_kbase/Makefile index c90b039..ee48774 100644 --- a/mali_kbase/Makefile +++ b/mali_kbase/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note # # (C) COPYRIGHT 2010-2021 ARM Limited. All rights reserved. # @@ -57,6 +57,7 @@ CONFIG_MALI_MIDGARD ?= m ifeq ($(CONFIG_MALI_MIDGARD),m) CONFIG_MALI_GATOR_SUPPORT ?= y CONFIG_MALI_ARBITRATION ?= n + CONFIG_MALI_PARTITION_MANAGER ?= n ifneq ($(CONFIG_MALI_NO_MALI),y) # Prevent misuse when CONFIG_MALI_NO_MALI=y @@ -75,6 +76,12 @@ ifeq ($(CONFIG_MALI_MIDGARD),m) CONFIG_MALI_DMA_BUF_LEGACY_COMPAT = n endif + ifeq ($(CONFIG_BSP_HAS_HYPERVISOR),y) + ifneq ($(CONFIG_MALI_ARBITRATION), n) + CONFIG_MALI_XEN ?= m + endif + endif + # # Expert/Debug/Test released configurations # @@ -189,7 +196,8 @@ CONFIGS := \ CONFIG_MALI_FENCE_DEBUG \ CONFIG_MALI_KUTF \ CONFIG_MALI_KUTF_IRQ_TEST \ - CONFIG_MALI_KUTF_CLK_RATE_TRACE + CONFIG_MALI_KUTF_CLK_RATE_TRACE \ + CONFIG_MALI_XEN # Pixel integration CONFIG options CONFIGS += \ |