diff options
| author | Sidath Senanayake <sidaths@google.com> | 2021-02-05 01:51:51 +0000 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2021-02-10 12:02:48 +0000 |
| commit | e6fbaabd258bfe4cc3d75fa0bbeef0c6c5138740 (patch) | |
| tree | 4531266fcab676cde143e57a056f24b94e218466 /mali_kbase/Kbuild | |
| parent | 56b86e48fffad349cccb1c3831a9cd58562abed6 (diff) | |
| parent | 9748305a584b9f1f7705303ce6e33a5e8b923e60 (diff) | |
| download | gpu-e6fbaabd258bfe4cc3d75fa0bbeef0c6c5138740.tar.gz | |
Merge r29p0 from upstream into android-gs-pixel-mainline
This commit updates the Mali KMD to version r29p0 from
commit 9748305a584b9f1f7705303ce6e33a5e8b923e60
Bug: 178778804
Change-Id: Ie20425d4ea5c1529e299ca9a0454a56afb0fba95
Diffstat (limited to 'mali_kbase/Kbuild')
| -rw-r--r-- | mali_kbase/Kbuild | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mali_kbase/Kbuild b/mali_kbase/Kbuild index d994426..49ef1fb 100644 --- a/mali_kbase/Kbuild +++ b/mali_kbase/Kbuild @@ -21,7 +21,7 @@ # Driver version string which is returned to userspace via an ioctl -MALI_RELEASE_NAME ?= "r27p0-01eac0" +MALI_RELEASE_NAME ?= "r29p0-01eac0" # Append pixel to release name for debugging MALI_RELEASE_NAME := $(MALI_RELEASE_NAME)-pixel @@ -105,7 +105,6 @@ SRC := \ mali_kbase_config.c \ mali_kbase_vinstr.c \ mali_kbase_hwcnt.c \ - mali_kbase_hwcnt_backend_jm.c \ mali_kbase_hwcnt_gpu.c \ mali_kbase_hwcnt_legacy.c \ mali_kbase_hwcnt_types.c \ @@ -130,6 +129,7 @@ SRC := \ mali_kbase_strings.c \ mali_kbase_as_fault_debugfs.c \ mali_kbase_regs_history_debugfs.c \ + mali_kbase_dvfs_debugfs.c \ mali_power_gpu_frequency_trace.c \ mali_kbase_trace_gpu_mem.c \ thirdparty/mali_kbase_mmap.c \ @@ -141,6 +141,8 @@ SRC := \ ifeq ($(MALI_USE_CSF),1) SRC += \ + mali_kbase_hwcnt_backend_csf.c \ + mali_kbase_hwcnt_backend_csf_if_fw.c \ debug/backend/mali_kbase_debug_ktrace_csf.c \ device/backend/mali_kbase_device_csf.c \ device/backend/mali_kbase_device_hw_csf.c \ @@ -150,6 +152,7 @@ ifeq ($(MALI_USE_CSF),1) context/backend/mali_kbase_context_csf.c else SRC += \ + mali_kbase_hwcnt_backend_jm.c \ mali_kbase_dummy_job_wa.c \ mali_kbase_debug_job_fault.c \ mali_kbase_event.c \ |