diff options
author | Sidath Senanayake <sidaths@google.com> | 2021-07-12 20:20:07 +0100 |
---|---|---|
committer | Sidath Senanayake <sidaths@google.com> | 2021-07-12 20:20:07 +0100 |
commit | b2f3e45b252b412e220522adb6cf720ed2f1a4ae (patch) | |
tree | 3b49dd6030f597037dc22282845f0c9a0a63daa5 /mali_kbase/Makefile | |
parent | f573fd96c0d6b6dfb2a91605a211dd15cb3153d4 (diff) | |
parent | 2bfaaa5f53c45ab7b4f6daba20e92ef6d16ab53b (diff) | |
download | gpu-b2f3e45b252b412e220522adb6cf720ed2f1a4ae.tar.gz |
Merge r32p1-beta from upstream into android-gs-pixel-5.10
This commit updates the Mali KMD to version r32p1-beta from
commit 2bfaaa5f53c45ab7b4f6daba20e92ef6d16ab53b
Bug: 190388367
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: Ia2fa310b12eb95b0f3013c69ca821909d3fbf125
Diffstat (limited to 'mali_kbase/Makefile')
-rw-r--r-- | mali_kbase/Makefile | 231 |
1 files changed, 195 insertions, 36 deletions
diff --git a/mali_kbase/Makefile b/mali_kbase/Makefile index c78d023..dd35d54 100644 --- a/mali_kbase/Makefile +++ b/mali_kbase/Makefile @@ -18,58 +18,217 @@ # # -# Handle Android Common Kernel source naming KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build KDIR ?= $(KERNEL_SRC) # Ensure build intermediates are in OUT_DIR instead of alongside the source M ?= $(shell pwd) -# out-of-tree -ifeq ($(KBUILD_EXTMOD),) -export CONFIG_MALI_MIDGARD?=m +ifeq ($(KDIR),) + $(error Must specify KDIR to point to the kernel to target)) +endif -ifneq ($(CONFIG_MALI_MIDGARD),n) -export CONFIG_MALI_CSF_SUPPORT?=n -export CONFIG_MALI_KUTF?=n -export CONFIG_MALI_REAL_HW?=y -# Handle default y/m in Kconfig -export CONFIG_MALI_GATOR_SUPPORT?=y -export CONFIG_MALI_DEVFREQ?=n -ifneq ($(CONFIG_PM_DEVFREQ),n) -export CONFIG_MALI_DEVFREQ?=y -endif +# +# Pixel integration configuration values +# -DEFINES += -DCONFIG_MALI_MIDGARD=$(CONFIG_MALI_MIDGARD) \ - -DCONFIG_MALI_CSF_SUPPORT=$(CONFIG_MALI_CSF_SUPPORT) \ - -DCONFIG_MALI_KUTF=$(CONFIG_MALI_KUTF) \ - -DCONFIG_MALI_REAL_HW=$(CONFIG_MALI_REAL_HW) \ - -DCONFIG_MALI_GATOR_SUPPORT=$(CONFIG_MALI_GATOR_SUPPORT) \ - -DCONFIG_MALI_DEVFREQ=$(CONFIG_MALI_DEVFREQ) +# Core kbase configuration options +CONFIG_MALI_EXPERT=y +CONFIG_MALI_MIDGARD_DVFS=y -export DEFINES +# Pixel integration specific configuration options +CONFIG_MALI_PLATFORM_NAME="pixel" +CONFIG_MALI_PIXEL_GPU_QOS=y +CONFIG_MALI_PIXEL_GPU_BTS=y +CONFIG_MALI_PIXEL_GPU_THERMAL=y +CONFIG_MALI_PIXEL_GPU_SECURE_RENDERING=y -# Pixel integration exports -export CONFIG_MALI_EXPERT=y -export CONFIG_MALI_MIDGARD_DVFS=y -export CONFIG_MALI_PLATFORM_NAME="pixel" -export CONFIG_MALI_PIXEL_GPU_QOS=y -export CONFIG_MALI_PIXEL_GPU_BTS=y -export CONFIG_MALI_PIXEL_GPU_THERMAL=y -export CONFIG_MALI_PIXEL_GPU_SECURE_RENDERING=y +# +# Default configuration values +# +# Dependency resolution is done through statements as Kconfig +# is not supported for out-of-tree builds. +# + +CONFIG_MALI_MIDGARD ?= m +ifeq ($(CONFIG_MALI_MIDGARD),m) + CONFIG_MALI_GATOR_SUPPORT ?= y + CONFIG_MALI_ARBITRATION ?= n + + ifneq ($(CONFIG_MALI_NO_MALI),y) + # Prevent misuse when CONFIG_MALI_NO_MALI=y + CONFIG_MALI_REAL_HW ?= y + endif + + ifeq ($(CONFIG_MALI_MIDGARD_DVFS),y) + # Prevent misuse when CONFIG_MALI_MIDGARD_DVFS=y + CONFIG_MALI_DEVFREQ ?= n + else + CONFIG_MALI_DEVFREQ ?= y + endif + + ifeq ($(CONFIG_MALI_DMA_BUF_MAP_ON_DEMAND), y) + # Prevent misuse when CONFIG_MALI_DMA_BUF_MAP_ON_DEMAND=y + CONFIG_MALI_DMA_BUF_LEGACY_COMPAT = n + endif + + # + # Expert/Debug/Test released configurations + # + ifeq ($(CONFIG_MALI_EXPERT), y) + ifeq ($(CONFIG_MALI_NO_MALI), y) + CONFIG_MALI_REAL_HW = n + else + # Prevent misuse when CONFIG_MALI_NO_MALI=n + CONFIG_MALI_REAL_HW = y + CONFIG_MALI_ERROR_INJECT = n + endif + + ifeq ($(CONFIG_MALI_HW_ERRATA_1485982_NOT_AFFECTED), y) + # Prevent misuse when CONFIG_MALI_HW_ERRATA_1485982_NOT_AFFECTED=y + CONFIG_MALI_HW_ERRATA_1485982_USE_CLOCK_ALTERNATIVE = n + endif + + ifeq ($(CONFIG_MALI_DEBUG), y) + CONFIG_MALI_MIDGARD_ENABLE_TRACE ?= y + CONFIG_MALI_SYSTEM_TRACE ?= y + + ifeq ($(CONFIG_SYNC), y) + CONFIG_MALI_FENCE_DEBUG ?= y + else + ifeq ($(CONFIG_SYNC_FILE), y) + CONFIG_MALI_FENCE_DEBUG ?= y + else + CONFIG_MALI_FENCE_DEBUG = n + endif + endif + else + # Prevent misuse when CONFIG_MALI_DEBUG=n + CONFIG_MALI_MIDGARD_ENABLE_TRACE = n + CONFIG_MALI_SYSTEM_TRACE = n + CONFIG_MALI_FENCE_DEBUG = n + endif + else + # Prevent misuse when CONFIG_MALI_EXPERT=n + CONFIG_MALI_CORESTACK = n + CONFIG_MALI_2MB_ALLOC = n + CONFIG_MALI_PWRSOFT_765 = n + CONFIG_MALI_MEMORY_FULLY_BACKED = n + CONFIG_MALI_JOB_DUMP = n + CONFIG_MALI_NO_MALI = n + CONFIG_MALI_REAL_HW = y + CONFIG_MALI_ERROR_INJECT = n + CONFIG_MALI_HW_ERRATA_1485982_NOT_AFFECTED = n + CONFIG_MALI_HW_ERRATA_1485982_USE_CLOCK_ALTERNATIVE = n + CONFIG_MALI_PRFCNT_SET_SELECT_VIA_DEBUG_FS = n + CONFIG_MALI_DEBUG = n + CONFIG_MALI_MIDGARD_ENABLE_TRACE = n + CONFIG_MALI_SYSTEM_TRACE = n + CONFIG_MALI_FENCE_DEBUG = n + endif + + ifeq ($(CONFIG_MALI_DEBUG), y) + CONFIG_MALI_KUTF ?= y + ifeq ($(CONFIG_MALI_KUTF), y) + CONFIG_MALI_KUTF_IRQ_TEST ?= y + CONFIG_MALI_KUTF_CLK_RATE_TRACE ?= y + else + # Prevent misuse when CONFIG_MALI_KUTF=n + CONFIG_MALI_KUTF_IRQ_TEST = n + CONFIG_MALI_KUTF_CLK_RATE_TRACE = n + endif + else + # Prevent misuse when CONFIG_MALI_DEBUG=n + CONFIG_MALI_KUTF = n + CONFIG_MALI_KUTF_IRQ_TEST = n + CONFIG_MALI_KUTF_CLK_RATE_TRACE = n + endif +else + # Prevent misuse when CONFIG_MALI_MIDGARD=n + CONFIG_MALI_ARBITRATION = n + CONFIG_MALI_KUTF = n + CONFIG_MALI_KUTF_IRQ_TEST = n + CONFIG_MALI_KUTF_CLK_RATE_TRACE = n endif -endif -KBASE_PATH_RELATIVE = $(M) +# All Mali CONFIG should be listed here +CONFIGS := \ + CONFIG_MALI_MIDGARD \ + CONFIG_MALI_CSF_SUPPORT \ + CONFIG_MALI_GATOR_SUPPORT \ + CONFIG_MALI_DMA_FENCE \ + CONFIG_MALI_ARBITER_SUPPORT \ + CONFIG_MALI_ARBITRATION \ + CONFIG_MALI_PARTITION_MANAGER \ + CONFIG_MALI_REAL_HW \ + CONFIG_MALI_GEM5_BUILD \ + CONFIG_MALI_DEVFREQ \ + CONFIG_MALI_MIDGARD_DVFS \ + CONFIG_MALI_DMA_BUF_MAP_ON_DEMAND \ + CONFIG_MALI_DMA_BUF_LEGACY_COMPAT \ + CONFIG_MALI_EXPERT \ + CONFIG_MALI_CORESTACK \ + CONFIG_MALI_2MB_ALLOC \ + CONFIG_MALI_PWRSOFT_765 \ + CONFIG_MALI_MEMORY_FULLY_BACKED \ + CONFIG_MALI_JOB_DUMP \ + CONFIG_MALI_NO_MALI \ + CONFIG_MALI_ERROR_INJECT \ + CONFIG_MALI_HW_ERRATA_1485982_NOT_AFFECTED \ + CONFIG_MALI_HW_ERRATA_1485982_USE_CLOCK_ALTERNATIVE \ + CONFIG_MALI_PRFCNT_SET_PRIMARY \ + CONFIG_MALI_PRFCNT_SET_SECONDARY \ + CONFIG_MALI_PRFCNT_SET_TERTIARY \ + CONFIG_MALI_PRFCNT_SET_SELECT_VIA_DEBUG_FS \ + CONFIG_MALI_DEBUG \ + CONFIG_MALI_MIDGARD_ENABLE_TRACE \ + CONFIG_MALI_SYSTEM_TRACE \ + CONFIG_MALI_FENCE_DEBUG \ + CONFIG_MALI_KUTF \ + CONFIG_MALI_KUTF_IRQ_TEST \ + CONFIG_MALI_KUTF_CLK_RATE_TRACE + +# Pixel integration CONFIG options +CONFIGS += \ + CONFIG_MALI_PIXEL_GPU_QOS \ + CONFIG_MALI_PIXEL_GPU_BTS \ + CONFIG_MALI_PIXEL_GPU_THERMAL \ + CONFIG_MALI_PIXEL_GPU_SECURE_RENDERING + + +# +# MAKE_ARGS to pass the custom CONFIGs on out-of-tree build +# +# Generate the list of CONFIGs and values. +# $(value config) is the name of the CONFIG option. +# $(value $(value config)) is its value (y, m). +# When the CONFIG is not set to y or m, it defaults to n. +MAKE_ARGS := $(foreach config,$(CONFIGS), \ + $(if $(filter y m,$(value $(value config))), \ + $(value config)=$(value $(value config)), \ + $(value config)=n)) + +# +# EXTRA_CFLAGS to define the custom CONFIGs on out-of-tree build +# +# Generate the list of CONFIGs defines with values from CONFIGS. +# $(value config) is the name of the CONFIG option. +# When set to y or m, the CONFIG gets defined to 1. +EXTRA_CFLAGS := $(foreach config,$(CONFIGS), \ + $(if $(filter y m,$(value $(value config))), \ + -D$(value config)=1)) + +# +# KBUILD_EXTRA_SYMBOLS to prevent warnings about unknown functions +# -# we get the symbols from modules using KBUILD_EXTRA_SYMBOLS to prevent warnings about unknown functions -modules: - $(MAKE) -C $(KDIR) M=$(M) W=1 EXTRA_CFLAGS="-I$(M) -I$(M)/../common/include -I$(M)/../../../../tests/include $(SCONS_CFLAGS)" $(SCONS_CONFIGS) KBUILD_EXTRA_SYMBOLS="$(EXTRA_SYMBOLS)" modules $(@) +all: + $(MAKE) -C $(KDIR) M=$(M) W=1 $(MAKE_ARGS) EXTRA_CFLAGS="$(EXTRA_CFLAGS)" KBUILD_EXTRA_SYMBOLS="$(EXTRA_SYMBOLS)" modules modules_install: - $(MAKE) -C $(KDIR) M=$(M) modules_install + $(MAKE) -C $(KDIR) M=$(M) W=1 $(MAKE_ARGS) modules_install clean: - $(MAKE) -C $(KDIR) M=$(M) clean + $(MAKE) -C $(KDIR) M=$(M) W=1 $(MAKE_ARGS) clean |