summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Diver <diverj@google.com>2024-01-19 12:28:26 +0000
committerJack Diver <diverj@google.com>2024-02-28 14:58:40 +0000
commit3d3cde1cabde47ebb37db73b5e99a238e29b6762 (patch)
treee75e700dfd3bbde3af9c5f027121ba8f11c8fc1b
parent57ef78bad803aab9d83325f80349f33727af9af8 (diff)
downloadgpu-3d3cde1cabde47ebb37db73b5e99a238e29b6762.tar.gz
mali_kbase: mali_pixel: Define PIXEL_GPU_SLC_ACPM_SIGNAL on Zuma
Bug: 313458962 Test: gfxbench Change-Id: Ifd1f9946b2a3c78c412986c57e499b9bd2ef4b3c Signed-off-by: Jack Diver <diverj@google.com>
-rw-r--r--mali_kbase/platform/pixel/Kbuild10
-rw-r--r--mali_pixel/Kbuild5
2 files changed, 12 insertions, 3 deletions
diff --git a/mali_kbase/platform/pixel/Kbuild b/mali_kbase/platform/pixel/Kbuild
index 6d6b0a8..c35c0be 100644
--- a/mali_kbase/platform/pixel/Kbuild
+++ b/mali_kbase/platform/pixel/Kbuild
@@ -45,8 +45,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 e275410..4f65a95 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 :=
@@ -51,6 +51,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