diff options
| author | Siddharth Kapoor <ksiddharth@google.com> | 2022-03-15 20:55:10 +0800 |
|---|---|---|
| committer | Siddharth Kapoor <ksiddharth@google.com> | 2022-03-23 23:13:16 +0800 |
| commit | 0b2458bd7089baefcf19906e32dffec3cf6af500 (patch) | |
| tree | 61beb8549e7bb3d2582268e2aa982d79b98e2548 /mali_kbase/Kbuild | |
| parent | 3d9f70261b023712c5113fb715f114ad8db9cfae (diff) | |
| parent | 88d7d984fed1c2a4358ce2bbc334e82d71e3a391 (diff) | |
| download | gpu-0b2458bd7089baefcf19906e32dffec3cf6af500.tar.gz | |
Merge r36p0 from upstream into android-gs-pixel-5.10-gs101
Bug: 220942030
Test: boot to Home, Camera, Video, Chrome
Signed-off-by: Siddharth Kapoor <ksiddharth@google.com>
Change-Id: I8cf3a6243b092a05299acf956f5293facd1ed3cc
Diffstat (limited to 'mali_kbase/Kbuild')
| -rw-r--r-- | mali_kbase/Kbuild | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mali_kbase/Kbuild b/mali_kbase/Kbuild index 2848a4b..6d7657a 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 ?= '"r35p0-01eac0"' +MALI_RELEASE_NAME ?= '"r36p0-01eac0"' # We are building for Pixel CONFIG_MALI_PLATFORM_NAME="pixel" @@ -172,6 +172,7 @@ mali_kbase-y := \ mali_kbase_hwcnt_gpu_narrow.o \ mali_kbase_hwcnt_types.o \ mali_kbase_hwcnt_virtualizer.o \ + mali_kbase_hwcnt_watchdog_if_timer.o \ mali_kbase_softjobs.o \ mali_kbase_hw.o \ mali_kbase_debug.o \ @@ -209,12 +210,12 @@ mali_kbase-$(CONFIG_SYNC_FILE) += \ ifeq ($(CONFIG_MALI_CSF_SUPPORT),y) mali_kbase-y += \ mali_kbase_hwcnt_backend_csf.o \ - mali_kbase_hwcnt_watchdog_if_timer.o \ mali_kbase_hwcnt_backend_csf_if_fw.o else mali_kbase-y += \ mali_kbase_jm.o \ mali_kbase_hwcnt_backend_jm.o \ + mali_kbase_hwcnt_backend_jm_watchdog.o \ mali_kbase_dummy_job_wa.o \ mali_kbase_debug_job_fault.o \ mali_kbase_event.o \ |