diff options
| author | Sidath Senanayake <sidaths@google.com> | 2020-11-25 16:47:38 +0000 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2020-11-25 16:47:38 +0000 |
| commit | 86ef494fcee7e40a37d17b101883d8beea42acf2 (patch) | |
| tree | 8ae28a633b3f5b2b117edef6138ae82571155312 /mali_kbase/Kbuild | |
| parent | ef7db1a858a7c156d6310d11d04efbaf7e216bf6 (diff) | |
| parent | 72f2457ff7355ff0389efe5bc9cec3365362d8c4 (diff) | |
| download | gpu-86ef494fcee7e40a37d17b101883d8beea42acf2.tar.gz | |
Merge r27p0 from upstream into android-gs-pixel-mainline
This commit updates the Mali KMD to version r27p0 from
commit 72f2457ff7355ff0389efe5bc9cec3365362d8c4
Bug: 171747612
Change-Id: Ida619c400a9652ebbbc871e2c973d3c78fc5de62
Diffstat (limited to 'mali_kbase/Kbuild')
| -rw-r--r-- | mali_kbase/Kbuild | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/mali_kbase/Kbuild b/mali_kbase/Kbuild index 75d9531..d994426 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 ?= "r26p0-01eac0" +MALI_RELEASE_NAME ?= "r27p0-01eac0" # Append pixel to release name for debugging MALI_RELEASE_NAME := $(MALI_RELEASE_NAME)-pixel @@ -92,6 +92,7 @@ SRC := \ context/mali_kbase_context.c \ debug/mali_kbase_debug_ktrace.c \ device/mali_kbase_device.c \ + device/mali_kbase_device_hw.c \ mali_kbase_cache_policy.c \ mali_kbase_ccswe.c \ mali_kbase_mem.c \ @@ -130,18 +131,19 @@ SRC := \ mali_kbase_as_fault_debugfs.c \ mali_kbase_regs_history_debugfs.c \ mali_power_gpu_frequency_trace.c \ + mali_kbase_trace_gpu_mem.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 \ - mali_kbase_trace_gpu_mem.c + gpu/mali_kbase_gpu.c ifeq ($(MALI_USE_CSF),1) SRC += \ debug/backend/mali_kbase_debug_ktrace_csf.c \ device/backend/mali_kbase_device_csf.c \ + device/backend/mali_kbase_device_hw_csf.c \ gpu/backend/mali_kbase_gpu_fault_csf.c \ tl/backend/mali_kbase_timeline_csf.c \ mmu/backend/mali_kbase_mmu_csf.c \ @@ -158,6 +160,7 @@ else mali_kbase_kinstr_jm.c \ debug/backend/mali_kbase_debug_ktrace_jm.c \ device/backend/mali_kbase_device_jm.c \ + device/backend/mali_kbase_device_hw_jm.c \ gpu/backend/mali_kbase_gpu_fault_jm.c \ tl/backend/mali_kbase_timeline_jm.c \ mmu/backend/mali_kbase_mmu_jm.c \ @@ -210,16 +213,25 @@ else # empty endif -mali_kbase-$(CONFIG_MALI_DMA_FENCE) += \ - mali_kbase_dma_fence.o \ - mali_kbase_fence.o +ifeq ($(MALI_USE_CSF),0) + mali_kbase-$(CONFIG_MALI_DMA_FENCE) += \ + mali_kbase_fence_ops.o \ + mali_kbase_dma_fence.o \ + mali_kbase_fence.o + + mali_kbase-$(CONFIG_SYNC_FILE) += \ + mali_kbase_fence_ops.o \ + mali_kbase_fence.o +endif + mali_kbase-$(CONFIG_SYNC) += \ mali_kbase_sync_android.o \ mali_kbase_sync_common.o + mali_kbase-$(CONFIG_SYNC_FILE) += \ + mali_kbase_fence_ops.o \ mali_kbase_sync_file.o \ - mali_kbase_sync_common.o \ - mali_kbase_fence.o + mali_kbase_sync_common.o include $(src)/backend/gpu/Kbuild mali_kbase-y += $(BACKEND:.c=.o) |