diff options
| author | Sidath Senanayake <sidaths@google.com> | 2021-04-20 15:26:53 +0100 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2021-04-20 15:26:53 +0100 |
| commit | c83c70ba70ef485dfa4337da1a651cc86124598b (patch) | |
| tree | 4cdfc1dd12e5076d7d33499accba3ba24ef49e30 /mali_kbase/Kbuild | |
| parent | ceb3ef011c8ef7ff646f48a10188ebcb53c14cde (diff) | |
| parent | 8037b534570814775d79aeddd06b76e5ee941f59 (diff) | |
| download | gpu-c83c70ba70ef485dfa4337da1a651cc86124598b.tar.gz | |
Merge r30p0 from upstream into android-gs-pixel-5.10
This commit updates the Mali KMD to version r30p0 from
commit 8037b534570814775d79aeddd06b76e5ee941f59
Bug: 180379272
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: I703f1da43913fab5cb5ac704630418b72655dc41
Diffstat (limited to 'mali_kbase/Kbuild')
| -rw-r--r-- | mali_kbase/Kbuild | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/mali_kbase/Kbuild b/mali_kbase/Kbuild index 49ef1fb..7dd7ed6 100644 --- a/mali_kbase/Kbuild +++ b/mali_kbase/Kbuild @@ -1,10 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0 # -# (C) COPYRIGHT 2012-2020 ARM Limited. All rights reserved. +# (C) COPYRIGHT 2012-2021 ARM Limited. All rights reserved. # # This program is free software and is provided to you under the terms of the # GNU General Public License version 2 as published by the Free Software # Foundation, and any use by you of this program is subject to the terms -# of such GNU licence. +# of such GNU license. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,13 +16,11 @@ # along with this program; if not, you can access it online at # http://www.gnu.org/licenses/gpl-2.0.html. # -# SPDX-License-Identifier: GPL-2.0 -# # # Driver version string which is returned to userspace via an ioctl -MALI_RELEASE_NAME ?= "r29p0-01eac0" +MALI_RELEASE_NAME ?= "r30p0-01eac0" # Append pixel to release name for debugging MALI_RELEASE_NAME := $(MALI_RELEASE_NAME)-pixel @@ -36,11 +35,8 @@ UMP_PATH = $(src)/../../../base # Set up defaults if not defined by build system MALI_CUSTOMER_RELEASE ?= 1 -MALI_USE_CSF ?= 0 MALI_UNIT_TEST ?= 0 -MALI_KERNEL_TEST_API ?= 0 MALI_COVERAGE ?= 0 -MALI_JIT_PRESSURE_LIMIT_BASE ?= 1 CONFIG_MALI_PLATFORM_NAME ?= "devicetree" # Experimental features (corresponding -D definition should be appended to # DEFINES below, e.g. for MALI_EXPERIMENTAL_FEATURE, @@ -50,6 +46,20 @@ CONFIG_MALI_PLATFORM_NAME ?= "devicetree" # MALI_EXPERIMENTAL_FEATURE ?= 0 MALI_INCREMENTAL_RENDERING ?= 0 +ifeq ($(CONFIG_MALI_CSF_SUPPORT),y) +MALI_JIT_PRESSURE_LIMIT_BASE = 0 +MALI_USE_CSF = 1 +else +MALI_JIT_PRESSURE_LIMIT_BASE ?= 1 +MALI_USE_CSF ?= 0 +endif + +ifneq ($(CONFIG_MALI_KUTF), n) +MALI_KERNEL_TEST_API ?= 1 +else +MALI_KERNEL_TEST_API ?= 0 +endif + # Set up our defines, which will be passed to gcc DEFINES = \ -DMALI_CUSTOMER_RELEASE=$(MALI_CUSTOMER_RELEASE) \ @@ -63,11 +73,11 @@ DEFINES = \ # Pixel integration defines DEFINES += \ - -DCONFIG_MALI_MIDGARD_DVFS=y \ - -DCONFIG_MALI_PIXEL_GPU_QOS=y \ - -DCONFIG_MALI_PIXEL_GPU_BTS=y \ - -DCONFIG_MALI_PIXEL_GPU_THERMAL=y \ - -DCONFIG_MALI_PIXEL_GPU_SECURE_RENDERING=y + -DCONFIG_MALI_MIDGARD_DVFS=$(CONFIG_MALI_MIDGARD_DVFS) \ + -DCONFIG_MALI_PIXEL_GPU_QOS=$(CONFIG_MALI_PIXEL_GPU_QOS) \ + -DCONFIG_MALI_PIXEL_GPU_BTS=$(CONFIG_MALI_PIXEL_GPU_BTS) \ + -DCONFIG_MALI_PIXEL_GPU_THERMAL=$(CONFIG_MALI_PIXEL_GPU_THERMAL) \ + -DCONFIG_MALI_PIXEL_GPU_SECURE_RENDERING=$(CONFIG_MALI_PIXEL_GPU_SECURE_RENDERING) ifeq ($(KBUILD_EXTMOD),) # in-tree |