diff options
| author | Jack Diver <diverj@google.com> | 2024-03-13 17:34:51 +0000 |
|---|---|---|
| committer | Jack Diver <diverj@google.com> | 2024-03-13 18:06:05 +0000 |
| commit | 3941bc44c82e983049f128b3604042512bde3caf (patch) | |
| tree | d0fabd7bbb6f925734e7e987320b09798f147c0b | |
| parent | b7e4f9f910feb4592d9bc7ee772671255e734ef6 (diff) | |
| download | gpu-3941bc44c82e983049f128b3604042512bde3caf.tar.gz | |
[DO NOT MERGE ANYWHERE] Revert "mali_kbase: mali_pixel: Define PIXEL_GPU_SLC_ACPM_SIGNAL..."
Revert submission 2720133-gpu-slcv2
Reason for revert: Prebuild did not land before cutoff
Reverted changes: /q/submissionid:2720133-gpu-slcv2
Bug: 329447972
Change-Id: Id61b0df61f55a62db3e3fa0126be32cf4cf975eb
| -rw-r--r-- | mali_kbase/platform/pixel/Kbuild | 10 | ||||
| -rw-r--r-- | mali_pixel/Kbuild | 5 |
2 files changed, 3 insertions, 12 deletions
diff --git a/mali_kbase/platform/pixel/Kbuild b/mali_kbase/platform/pixel/Kbuild index c35c0be..6d6b0a8 100644 --- a/mali_kbase/platform/pixel/Kbuild +++ b/mali_kbase/platform/pixel/Kbuild @@ -45,14 +45,8 @@ mali_kbase-y += \ platform/$(MALI_PLATFORM_DIR)/pixel_gpu_sscd.o endif -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_PIXEL_GPU_SLC) += \ + platform/$(MALI_PLATFORM_DIR)/pixel_gpu_slc.o 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 4f65a95..e275410 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,9 +51,6 @@ 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 |