diff options
| author | Sidath Senanayake <sidaths@google.com> | 2021-07-21 21:44:43 +0100 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2021-07-21 21:45:39 +0100 |
| commit | 17749634b3f1e8e7c2fa4e04e65b778259e1ba86 (patch) | |
| tree | 486e85e32a45ac8cabe7a06dcbea12c504d0aa9f /mali_kbase/Makefile | |
| parent | 7bdbdbf497a4745d24b857e9bd066845682885a0 (diff) | |
| parent | 52c5bf56aa5f18f0e0158998b8ac23bfc4cccad6 (diff) | |
| download | gpu-17749634b3f1e8e7c2fa4e04e65b778259e1ba86.tar.gz | |
Merge r32p1-beta2 from upstream into android-gs-pixel-5.10
This commit updates the Mali KMD to version r32p1-beta2 from
commit 52c5bf56aa5f18f0e0158998b8ac23bfc4cccad6
Bug: 186092835
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: Ie68303c73624067234aeb8756ad0835115380968
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 dd35d54..1503dc8 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. # @@ -56,6 +56,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 @@ -74,6 +75,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 # @@ -188,7 +195,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 += \ |