diff options
| author | Jack Diver <diverj@google.com> | 2022-09-20 09:24:27 +0000 |
|---|---|---|
| committer | Kevin DuBois <kevindubois@google.com> | 2022-10-31 21:25:24 +0000 |
| commit | 6dcd9736cbf84712dd7073dab4aea256e30517c2 (patch) | |
| tree | 0bdfdcc3c70a6378c8265b03e3fba6b8120ffa21 /mali_kbase/Kbuild | |
| parent | 400a7da825b089478056a1b2755b97156108080a (diff) | |
| parent | c30533582604fe0365bc3ce4e9e8e19dec3109da (diff) | |
| download | gpu-6dcd9736cbf84712dd7073dab4aea256e30517c2.tar.gz | |
Merge r38p1 from upstream into partner/android13-gs-pixel-5.10-tm-qpr2
Bug: 228779790
Bug: 240184939
Bug: 240185324
Test: Boot to home
Test: SST run
Test: Camera, portrait, video record
Test: VK CTS dEQP-VK.protected_memory.stack#*
Test: CtsDisplayTestCases
Test: CtsOpenGLTestCases
Test: CtsSkQPTestCases
Test: CtsNativeHardwareTestCases
Test: CtsUiRenderingTestCases
Test: CtsGpuToolsHostTestCases
Test: CtsGpuProfilingDataTestCases
Test: CtsVrTestCases
Test: CtsCameraTestCases
Test: CtsDeqpTestCases
Signed-off-by: Jack Diver <diverj@google.com>
Change-Id: I555b0c61cd08c973aaf7f75dc92d0c7573fa7c91
Diffstat (limited to 'mali_kbase/Kbuild')
| -rw-r--r-- | mali_kbase/Kbuild | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mali_kbase/Kbuild b/mali_kbase/Kbuild index ca02444..81b6e93 100644 --- a/mali_kbase/Kbuild +++ b/mali_kbase/Kbuild @@ -71,7 +71,7 @@ endif # # Driver version string which is returned to userspace via an ioctl -MALI_RELEASE_NAME ?= '"r36p0-01eac0"' +MALI_RELEASE_NAME ?= '"r38p1-01eac0"' # We are building for Pixel CONFIG_MALI_PLATFORM_NAME="pixel" @@ -116,7 +116,7 @@ endif # # Experimental features must default to disabled, e.g.: # MALI_EXPERIMENTAL_FEATURE ?= 0 -MALI_INCREMENTAL_RENDERING ?= 0 +MALI_INCREMENTAL_RENDERING_JM ?= 0 # # ccflags @@ -129,7 +129,7 @@ ccflags-y += \ -DMALI_COVERAGE=$(MALI_COVERAGE) \ -DMALI_RELEASE_NAME=$(MALI_RELEASE_NAME) \ -DMALI_JIT_PRESSURE_LIMIT_BASE=$(MALI_JIT_PRESSURE_LIMIT_BASE) \ - -DMALI_INCREMENTAL_RENDERING=$(MALI_INCREMENTAL_RENDERING) \ + -DMALI_INCREMENTAL_RENDERING_JM=$(MALI_INCREMENTAL_RENDERING_JM) \ -DMALI_PLATFORM_DIR=$(MALI_PLATFORM_DIR) ifeq ($(KBUILD_EXTMOD),) @@ -187,6 +187,7 @@ mali_kbase-y := \ mali_kbase_mem_profile_debugfs.o \ mali_kbase_disjoint_events.o \ mali_kbase_debug_mem_view.o \ + mali_kbase_debug_mem_zones.o \ mali_kbase_smc.o \ mali_kbase_mem_pool.o \ mali_kbase_mem_pool_debugfs.o \ |