diff options
| author | Sidath Senanayake <sidaths@google.com> | 2020-08-17 19:53:10 +0100 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2020-08-17 19:53:10 +0100 |
| commit | 7192b78be523472142d87fe55cd264c809b1c646 (patch) | |
| tree | 7ed1eff37b6769c957a88ab6c5b0e366083a9510 /mali_kbase/Kbuild | |
| parent | 637800ab851f73d006df584d836d50a954dbe38e (diff) | |
| parent | bc3c01e61c8ce9783a8ab091053905effcae12de (diff) | |
| download | gpu-7192b78be523472142d87fe55cd264c809b1c646.tar.gz | |
Merge r25p0 from upstream into android-gs-pixel-5.4
This commit updates the Mali KMD to version r25p0 from
commit 'bc3c01e61c8ce9783a8ab091053905effcae12de'
Change-Id: I489b4d67a9fa7635e930b0b8a33e5dded9879cdb
Diffstat (limited to 'mali_kbase/Kbuild')
| -rw-r--r-- | mali_kbase/Kbuild | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/mali_kbase/Kbuild b/mali_kbase/Kbuild index ac9c824..4a8fe9a 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 ?= "r24p0-01rel0-pixel" +MALI_RELEASE_NAME ?= "r25p0-01eac0-pixel" # Paths required for build @@ -76,6 +76,7 @@ subdir-ccflags-y += $(DEFINES) -I$(KBASE_PATH) -I$(KBASE_PLATFORM_PATH) -I$(UM SRC := \ context/mali_kbase_context.c \ + debug/mali_kbase_debug_ktrace.c \ device/mali_kbase_device.c \ mali_kbase_cache_policy.c \ mali_kbase_mem.c \ @@ -84,7 +85,6 @@ SRC := \ mali_kbase_ctx_sched.c \ mali_kbase_jm.c \ mali_kbase_gpuprops.c \ - mali_kbase_js.c \ mali_kbase_pm.c \ mali_kbase_config.c \ mali_kbase_vinstr.c \ @@ -123,6 +123,7 @@ SRC := \ ifeq ($(MALI_USE_CSF),1) SRC += \ + debug/backend/mali_kbase_debug_ktrace_csf.c \ device/backend/mali_kbase_device_csf.c \ gpu/backend/mali_kbase_gpu_fault_csf.c \ tl/backend/mali_kbase_timeline_csf.c \ @@ -135,7 +136,9 @@ else mali_kbase_event.c \ mali_kbase_jd.c \ mali_kbase_jd_debugfs.c \ + mali_kbase_js.c \ mali_kbase_js_ctx_attr.c \ + debug/backend/mali_kbase_debug_ktrace_jm.c \ device/backend/mali_kbase_device_jm.c \ gpu/backend/mali_kbase_gpu_fault_jm.c \ tl/backend/mali_kbase_timeline_jm.c \ @@ -156,7 +159,8 @@ ifeq ($(MALI_CUSTOMER_RELEASE),0) endif -ccflags-y += -I$(KBASE_PATH) +ccflags-y += -I$(KBASE_PATH) -I$(KBASE_PATH)/debug \ + -I$(KBASE_PATH)/debug/backend # Tell the Linux build system from which .o file to create the kernel module obj-$(CONFIG_MALI_MIDGARD) += mali_kbase.o @@ -182,6 +186,12 @@ else # empty endif +ifeq ($(CONFIG_MALI_ARBITER_SUPPORT),y) + include $(src)/arbiter/Kbuild +else +# empty +endif + mali_kbase-$(CONFIG_MALI_DMA_FENCE) += \ mali_kbase_dma_fence.o \ mali_kbase_fence.o |