From baa5e756f3010fa077030a9fe3a524733db85fa5 Mon Sep 17 00:00:00 2001 From: Jack Diver Date: Wed, 13 Mar 2024 16:33:34 +0000 Subject: [DO NOT MERGE ANYWHERE] Revert "mali_kbase: mali_pixel: Define PIXEL_GPU_SLC_ACPM_SIGNAL..." Revert submission 2753879-gpu-slcv2-gs201 Reason for revert: Prebuild did not land before cutoff Reverted changes: /q/submissionid:2753879-gpu-slcv2-gs201 Bug: 329447972 Change-Id: I120f7ae7d8accac0cb0d81a10457c630c0f2056a --- mali_kbase/platform/pixel/Kbuild | 10 ++-------- 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 17692af..b80c87b 100644 --- a/mali_kbase/platform/pixel/Kbuild +++ b/mali_kbase/platform/pixel/Kbuild @@ -42,14 +42,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 f19e708..4967b34 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,9 +49,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 -- cgit v1.2.3