diff options
| author | Sidath Senanayake <sidaths@google.com> | 2021-07-12 20:18:46 +0100 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2021-07-12 20:18:46 +0100 |
| commit | f573fd96c0d6b6dfb2a91605a211dd15cb3153d4 (patch) | |
| tree | ab706afb1df5131b258a6ff01ed25cdd7bd16825 /mali_kbase/Kbuild | |
| parent | d31cf595e359c7bde5c272f5b729c86277148e52 (diff) | |
| parent | fca8613cfcf585bf9113dca96a05daea9fd89794 (diff) | |
| download | gpu-f573fd96c0d6b6dfb2a91605a211dd15cb3153d4.tar.gz | |
Merge r31p0 from upstream into android-gs-pixel-5.10
This commit updates the Mali KMD to version r31p0 from
commit fca8613cfcf585bf9113dca96a05daea9fd89794
Bug: 185900681
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: I3c814b6145b10beee3d0fecedb74a6225a09a858
Diffstat (limited to 'mali_kbase/Kbuild')
| -rw-r--r-- | mali_kbase/Kbuild | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/mali_kbase/Kbuild b/mali_kbase/Kbuild index 7dd7ed6..a3a15d8 100644 --- a/mali_kbase/Kbuild +++ b/mali_kbase/Kbuild @@ -20,14 +20,14 @@ # Driver version string which is returned to userspace via an ioctl -MALI_RELEASE_NAME ?= "r30p0-01eac0" +MALI_RELEASE_NAME ?= '"r31p0-01eac0"' # Append pixel to release name for debugging -MALI_RELEASE_NAME := $(MALI_RELEASE_NAME)-pixel +MALI_RELEASE_NAME := $(subst "',-pixel"',$(MALI_RELEASE_NAME)) # Paths required for build -# make $(src) as absolute path if it isn't already, by prefixing $(srctree) +# make $(src) as absolute path if it is not already, by prefixing $(srctree) src:=$(if $(patsubst /%,,$(src)),$(srctree)/$(src),$(src)) KBASE_PATH = $(src) KBASE_PLATFORM_PATH = $(KBASE_PATH)/platform_dummy @@ -67,7 +67,7 @@ DEFINES = \ -DMALI_KERNEL_TEST_API=$(MALI_KERNEL_TEST_API) \ -DMALI_UNIT_TEST=$(MALI_UNIT_TEST) \ -DMALI_COVERAGE=$(MALI_COVERAGE) \ - -DMALI_RELEASE_NAME=\"$(MALI_RELEASE_NAME)\" \ + -DMALI_RELEASE_NAME=$(MALI_RELEASE_NAME) \ -DMALI_JIT_PRESSURE_LIMIT_BASE=$(MALI_JIT_PRESSURE_LIMIT_BASE) \ -DMALI_INCREMENTAL_RENDERING=$(MALI_INCREMENTAL_RENDERING) @@ -128,7 +128,6 @@ SRC := \ mali_kbase_mem_profile_debugfs.c \ mmu/mali_kbase_mmu.c \ mmu/mali_kbase_mmu_hw_direct.c \ - mmu/mali_kbase_mmu_mode_lpae.c \ mmu/mali_kbase_mmu_mode_aarch64.c \ mali_kbase_disjoint_events.c \ mali_kbase_debug_mem_view.c \ @@ -184,9 +183,6 @@ ifeq ($(CONFIG_MALI_CINSTR_GWT),y) SRC += mali_kbase_gwt.c endif -ifeq ($(MALI_UNIT_TEST),1) - SRC += tl/mali_kbase_timeline_test.c -endif ifeq ($(MALI_CUSTOMER_RELEASE),0) SRC += mali_kbase_regs_dump_debugfs.c |