diff options
| author | Jack Diver <diverj@google.com> | 2024-03-05 04:30:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-03-05 04:30:22 +0000 |
| commit | f0e8151d40baded811a3fc4756b989087a46ec5b (patch) | |
| tree | da2b58807e3afbc55dcfd028e963adc069f87089 | |
| parent | 3ffb1cf703efa9a5c7f0f839d4dcb5c1cf3a5e5c (diff) | |
| parent | 0e82736f4877d92e69edd133538ea1ed9ebf76f3 (diff) | |
| download | gpu-f0e8151d40baded811a3fc4756b989087a46ec5b.tar.gz | |
mali_kbase: mali_pixel: Define PIXEL_GPU_SLC_ACPM_SIGNAL on Zuma am: 0e82736f48
Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2753878
Change-Id: I67fd68352a3cf2992993dec6820d439989d9f7ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | mali_kbase/platform/pixel/Kbuild | 10 | ||||
| -rw-r--r-- | mali_pixel/Kbuild | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/mali_kbase/platform/pixel/Kbuild b/mali_kbase/platform/pixel/Kbuild index b80c87b..17692af 100644 --- a/mali_kbase/platform/pixel/Kbuild +++ b/mali_kbase/platform/pixel/Kbuild @@ -42,8 +42,14 @@ mali_kbase-y += \ platform/$(MALI_PLATFORM_DIR)/pixel_gpu_sscd.o endif -mali_kbase-$(CONFIG_MALI_PIXEL_GPU_SLC) += \ - platform/$(MALI_PLATFORM_DIR)/pixel_gpu_slc.o +ifeq ($(CONFIG_MALI_PIXEL_GPU_SLC),y) + mali_kbase-y += \ + platform/$(MALI_PLATFORM_DIR)/pixel_gpu_slc.o + + ifeq ($(CONFIG_SOC_ZUMA),y) + ccflags-y += -DPIXEL_GPU_SLC_ACPM_SIGNAL + endif +endif mali_kbase-$(CONFIG_MALI_CSF_SUPPORT) += \ platform/$(MALI_PLATFORM_DIR)/pixel_gpu_debug.o diff --git a/mali_pixel/Kbuild b/mali_pixel/Kbuild index 4967b34..f19e708 100644 --- a/mali_pixel/Kbuild +++ b/mali_pixel/Kbuild @@ -25,7 +25,7 @@ CONFIG_MALI_MEMORY_GROUP_MANAGER ?= m CONFIG_MALI_PRIORITY_CONTROL_MANAGER ?= m CONFIG_MALI_PROTECTED_MEMORY_ALLOCATOR ?= m CONFIG_MALI_PIXEL_STATS ?= m -CONFIG_MALI_PIXEL_GPU_SLC=y +CONFIG_MALI_PIXEL_GPU_SLC ?= y mali_pixel-objs := @@ -49,6 +49,9 @@ ifeq ($(CONFIG_MALI_PROTECTED_MEMORY_ALLOCATOR),m) endif ifeq ($(CONFIG_MALI_PIXEL_GPU_SLC),y) DEFINES += -DCONFIG_MALI_PIXEL_GPU_SLC + ifeq ($(CONFIG_SOC_ZUMA),y) + DEFINES += -DPIXEL_GPU_SLC_ACPM_SIGNAL + endif endif # Use our defines when compiling, and include mali platform module headers |