diff options
| author | Jack Diver <diverj@google.com> | 2022-11-07 12:13:47 +0000 |
|---|---|---|
| committer | Jack Diver <diverj@google.com> | 2022-11-09 17:51:01 +0000 |
| commit | e19249ece66a726b13d0ed8734c4059f364ca2f5 (patch) | |
| tree | 0bdfdcc3c70a6378c8265b03e3fba6b8120ffa21 /mali_kbase/Kbuild | |
| parent | 34e635317dc2a91076ac341df3867ac3bdb31ef1 (diff) | |
| download | gpu-e19249ece66a726b13d0ed8734c4059f364ca2f5.tar.gz | |
Revert "Revert "Merge r38p1 from upstream into partner/android13-gs-pixel-5.10-tm-qpr2""
This reverts commit 34e635317dc2a91076ac341df3867ac3bdb31ef1.
Bug: 228779790
Change-Id: Ic9d131af5568d7f55f610f255fa1c02925b18482
(cherry picked from commit 1c916e3f7c4d999f68e40c60fee6fe39418fcecd)
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 \ |