diff options
| author | Sidath Senanayake <sidaths@google.com> | 2020-09-22 19:26:46 +0100 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2020-09-22 19:31:32 +0100 |
| commit | f27a9b87191d243a17350c528037bae6ce6e6da4 (patch) | |
| tree | 2477b695cd33283cf31bdd9d357432d9a6290088 /mali_kbase/Kbuild | |
| parent | d5e0376a407d7729714f269101c6120f2589af69 (diff) | |
| parent | d4ca6eb7268ee2db9deabd1745b505c6e1c162f9 (diff) | |
| download | gpu-f27a9b87191d243a17350c528037bae6ce6e6da4.tar.gz | |
Merge r26p0 from upstream into android-gs-pixel-5.4
This commit updates the Mali KMD to version r26p0 from
commit d4ca6eb7268ee2db9deabd1745b505c6e1c162f9
Bug: 168298113
Change-Id: Ie8caf2df2ec573a1b458651fa5eb0806efb993f1
Diffstat (limited to 'mali_kbase/Kbuild')
| -rw-r--r-- | mali_kbase/Kbuild | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/mali_kbase/Kbuild b/mali_kbase/Kbuild index a9a9cbd..75d9531 100644 --- a/mali_kbase/Kbuild +++ b/mali_kbase/Kbuild @@ -21,7 +21,10 @@ # Driver version string which is returned to userspace via an ioctl -MALI_RELEASE_NAME ?= "r25p0-01eac0-pixel" +MALI_RELEASE_NAME ?= "r26p0-01eac0" + +# Append pixel to release name for debugging +MALI_RELEASE_NAME := $(MALI_RELEASE_NAME)-pixel # Paths required for build @@ -37,6 +40,7 @@ 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, @@ -44,7 +48,6 @@ CONFIG_MALI_PLATFORM_NAME ?= "devicetree" # # Experimental features must default to disabled, e.g.: # MALI_EXPERIMENTAL_FEATURE ?= 0 -MALI_JIT_PRESSURE_LIMIT ?= 0 MALI_INCREMENTAL_RENDERING ?= 0 # Set up our defines, which will be passed to gcc @@ -55,7 +58,7 @@ DEFINES = \ -DMALI_UNIT_TEST=$(MALI_UNIT_TEST) \ -DMALI_COVERAGE=$(MALI_COVERAGE) \ -DMALI_RELEASE_NAME=\"$(MALI_RELEASE_NAME)\" \ - -DMALI_JIT_PRESSURE_LIMIT=$(MALI_JIT_PRESSURE_LIMIT) \ + -DMALI_JIT_PRESSURE_LIMIT_BASE=$(MALI_JIT_PRESSURE_LIMIT_BASE) \ -DMALI_INCREMENTAL_RENDERING=$(MALI_INCREMENTAL_RENDERING) # Pixel integration defines @@ -90,6 +93,7 @@ SRC := \ debug/mali_kbase_debug_ktrace.c \ device/mali_kbase_device.c \ mali_kbase_cache_policy.c \ + mali_kbase_ccswe.c \ mali_kbase_mem.c \ mali_kbase_mem_pool_group.c \ mali_kbase_native_mgm.c \ @@ -100,7 +104,7 @@ SRC := \ mali_kbase_config.c \ mali_kbase_vinstr.c \ mali_kbase_hwcnt.c \ - mali_kbase_hwcnt_backend_gpu.c \ + mali_kbase_hwcnt_backend_jm.c \ mali_kbase_hwcnt_gpu.c \ mali_kbase_hwcnt_legacy.c \ mali_kbase_hwcnt_types.c \ @@ -125,12 +129,14 @@ SRC := \ mali_kbase_strings.c \ mali_kbase_as_fault_debugfs.c \ mali_kbase_regs_history_debugfs.c \ + mali_power_gpu_frequency_trace.c \ thirdparty/mali_kbase_mmap.c \ tl/mali_kbase_timeline.c \ tl/mali_kbase_timeline_io.c \ tl/mali_kbase_tlstream.c \ tl/mali_kbase_tracepoints.c \ - gpu/mali_kbase_gpu.c + gpu/mali_kbase_gpu.c \ + mali_kbase_trace_gpu_mem.c ifeq ($(MALI_USE_CSF),1) SRC += \ @@ -149,6 +155,7 @@ else mali_kbase_jd_debugfs.c \ mali_kbase_js.c \ mali_kbase_js_ctx_attr.c \ + mali_kbase_kinstr_jm.c \ debug/backend/mali_kbase_debug_ktrace_jm.c \ device/backend/mali_kbase_device_jm.c \ gpu/backend/mali_kbase_gpu_fault_jm.c \ |