From 61598093bbdd283a7edc367d900f223070ead8d2 Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Fri, 10 May 2024 07:43:03 +0000 Subject: [PATCH] add ax88772C AX88772C_eeprom_tools --- kernel/drivers/gpu/arm/bifrost/Kbuild | 53 +++++++++++++++++++++-------------------------------- 1 files changed, 21 insertions(+), 32 deletions(-) diff --git a/kernel/drivers/gpu/arm/bifrost/Kbuild b/kernel/drivers/gpu/arm/bifrost/Kbuild index 83c331d..9cadda1 100644 --- a/kernel/drivers/gpu/arm/bifrost/Kbuild +++ b/kernel/drivers/gpu/arm/bifrost/Kbuild @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note # -# (C) COPYRIGHT 2012-2021 ARM Limited. All rights reserved. +# (C) COPYRIGHT 2012-2023 ARM Limited. All rights reserved. # # This program is free software and is provided to you under the terms of the # GNU General Public License version 2 as published by the Free Software @@ -48,6 +48,10 @@ $(error CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND must be set in Kernel configuration) endif +ifeq ($(CONFIG_FW_LOADER), n) + $(error CONFIG_FW_LOADER must be set in Kernel configuration) +endif + ifeq ($(CONFIG_MALI_PRFCNT_SET_SELECT_VIA_DEBUG_FS), y) ifneq ($(CONFIG_DEBUG_FS), y) $(error CONFIG_MALI_PRFCNT_SET_SELECT_VIA_DEBUG_FS depends on CONFIG_DEBUG_FS to be set in Kernel configuration) @@ -55,10 +59,8 @@ endif ifeq ($(CONFIG_MALI_BIFROST_FENCE_DEBUG), y) - ifneq ($(CONFIG_SYNC), y) - ifneq ($(CONFIG_SYNC_FILE), y) - $(error CONFIG_MALI_BIFROST_FENCE_DEBUG depends on CONFIG_SYNC || CONFIG_SYNC_FILE to be set in Kernel configuration) - endif + ifneq ($(CONFIG_SYNC_FILE), y) + $(error CONFIG_MALI_BIFROST_FENCE_DEBUG depends on CONFIG_SYNC_FILE to be set in Kernel configuration) endif endif @@ -67,7 +69,7 @@ # # Driver version string which is returned to userspace via an ioctl -MALI_RELEASE_NAME ?= '"g7p1-01bet0"' +MALI_RELEASE_NAME ?= '"g18p0-01eac0"' # Set up defaults if not defined by build system ifeq ($(CONFIG_MALI_BIFROST_DEBUG), y) MALI_UNIT_TEST = 1 @@ -77,8 +79,6 @@ MALI_CUSTOMER_RELEASE ?= 1 endif MALI_COVERAGE ?= 0 - -CONFIG_MALI_PLATFORM_NAME ?= "devicetree" # Kconfig passes in the name with quotes for in-tree builds - remove them. MALI_PLATFORM_DIR := $(shell echo $(CONFIG_MALI_PLATFORM_NAME)) @@ -90,6 +90,7 @@ MALI_JIT_PRESSURE_LIMIT_BASE ?= 1 MALI_USE_CSF ?= 0 endif + ifneq ($(CONFIG_MALI_KUTF), n) MALI_KERNEL_TEST_API ?= 1 @@ -103,7 +104,7 @@ # # Experimental features must default to disabled, e.g.: # MALI_EXPERIMENTAL_FEATURE ?= 0 -MALI_INCREMENTAL_RENDERING ?= 0 +MALI_INCREMENTAL_RENDERING_JM ?= 0 # # ccflags @@ -116,8 +117,7 @@ -DMALI_COVERAGE=$(MALI_COVERAGE) \ -DMALI_RELEASE_NAME=$(MALI_RELEASE_NAME) \ -DMALI_JIT_PRESSURE_LIMIT_BASE=$(MALI_JIT_PRESSURE_LIMIT_BASE) \ - -DMALI_INCREMENTAL_RENDERING=$(MALI_INCREMENTAL_RENDERING) \ - -DMALI_KBASE_BUILD \ + -DMALI_INCREMENTAL_RENDERING_JM=$(MALI_INCREMENTAL_RENDERING_JM) \ -DMALI_PLATFORM_DIR=$(MALI_PLATFORM_DIR) @@ -149,18 +149,15 @@ mali_kbase_cache_policy.o \ mali_kbase_ccswe.o \ mali_kbase_mem.o \ + mali_kbase_mem_migrate.o \ mali_kbase_mem_pool_group.o \ mali_kbase_native_mgm.o \ mali_kbase_ctx_sched.o \ mali_kbase_gpuprops.o \ mali_kbase_pm.o \ mali_kbase_config.o \ + mali_kbase_kinstr_prfcnt.o \ mali_kbase_vinstr.o \ - mali_kbase_hwcnt.o \ - mali_kbase_hwcnt_gpu.o \ - mali_kbase_hwcnt_legacy.o \ - mali_kbase_hwcnt_types.o \ - mali_kbase_hwcnt_virtualizer.o \ mali_kbase_softjobs.o \ mali_kbase_hw.o \ mali_kbase_debug.o \ @@ -170,6 +167,8 @@ mali_kbase_mem_profile_debugfs.o \ mali_kbase_disjoint_events.o \ mali_kbase_debug_mem_view.o \ + mali_kbase_debug_mem_zones.o \ + mali_kbase_debug_mem_allocs.o \ mali_kbase_smc.o \ mali_kbase_mem_pool.o \ mali_kbase_mem_pool_debugfs.o \ @@ -179,27 +178,21 @@ mali_kbase_regs_history_debugfs.o \ mali_kbase_dvfs_debugfs.o \ mali_power_gpu_frequency_trace.o \ - mali_kbase_trace_gpu_mem.o + mali_kbase_trace_gpu_mem.o \ + mali_kbase_pbha.o + +bifrost_kbase-$(CONFIG_DEBUG_FS) += mali_kbase_pbha_debugfs.o bifrost_kbase-$(CONFIG_MALI_CINSTR_GWT) += mali_kbase_gwt.o - -bifrost_kbase-$(CONFIG_SYNC) += \ - mali_kbase_sync_android.o \ - mali_kbase_sync_common.o bifrost_kbase-$(CONFIG_SYNC_FILE) += \ mali_kbase_fence_ops.o \ mali_kbase_sync_file.o \ mali_kbase_sync_common.o -ifeq ($(CONFIG_MALI_CSF_SUPPORT),y) - bifrost_kbase-y += \ - mali_kbase_hwcnt_backend_csf.o \ - mali_kbase_hwcnt_backend_csf_if_fw.o -else +ifneq ($(CONFIG_MALI_CSF_SUPPORT),y) bifrost_kbase-y += \ mali_kbase_jm.o \ - mali_kbase_hwcnt_backend_jm.o \ mali_kbase_dummy_job_wa.o \ mali_kbase_debug_job_fault.o \ mali_kbase_event.o \ @@ -208,11 +201,6 @@ mali_kbase_js.o \ mali_kbase_js_ctx_attr.o \ mali_kbase_kinstr_jm.o - - bifrost_kbase-$(CONFIG_MALI_BIFROST_DMA_FENCE) += \ - mali_kbase_fence_ops.o \ - mali_kbase_dma_fence.o \ - mali_kbase_fence.o bifrost_kbase-$(CONFIG_SYNC_FILE) += \ mali_kbase_fence_ops.o \ @@ -227,6 +215,7 @@ $(src)/backend/gpu/Kbuild \ $(src)/mmu/Kbuild \ $(src)/tl/Kbuild \ + $(src)/hwcnt/Kbuild \ $(src)/gpu/Kbuild \ $(src)/thirdparty/Kbuild \ $(src)/platform/$(MALI_PLATFORM_DIR)/Kbuild -- Gitblit v1.6.2