From 513da3827cb6b8337948651546f6a96e848e6bc8 Mon Sep 17 00:00:00 2001 From: Zhen Chen Date: Tue, 15 Apr 2025 18:04:28 +0800 Subject: [PATCH] arm64: configs: rockchip: Migrate configs for Bifrost and Valhall GPUs to SoC-level config files This is in coordination with the modification of commit "MALI: rockchip: Add separate src directory for Valhall driver from DDK g28p0-00eac0". The configs related to Bifrost and Valhall GPUs are designed to be configured in the SoC-level config files. Therefore, for some SoCs, the kernel compilation command line needs to be adjusted. Change-Id: Ida29d2f6dba9b9ea7f39e8b5f7995214b346d1dc Signed-off-by: Zhen Chen --- arch/arm64/configs/rk3326.config | 5 ++++- arch/arm64/configs/rk356x.config | 5 ++++- arch/arm64/configs/rk356x_eink.config | 4 ++++ arch/arm64/configs/rockchip_defconfig | 5 ----- arch/arm64/configs/rockchip_gki.config | 5 ----- arch/arm64/configs/rockchip_gki.fragment | 6 ------ 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/arch/arm64/configs/rk3326.config b/arch/arm64/configs/rk3326.config index 800fb0234c19..2d918029a755 100644 --- a/arch/arm64/configs/rk3326.config +++ b/arch/arm64/configs/rk3326.config @@ -1 +1,4 @@ -# CONFIG_MALI_CSF_SUPPORT is not set +CONFIG_MALI_BIFROST=y +CONFIG_MALI_PLATFORM_NAME="rk" +CONFIG_MALI_BIFROST_EXPERT=y +CONFIG_MALI_BIFROST_DEBUG=y diff --git a/arch/arm64/configs/rk356x.config b/arch/arm64/configs/rk356x.config index 800fb0234c19..2d918029a755 100644 --- a/arch/arm64/configs/rk356x.config +++ b/arch/arm64/configs/rk356x.config @@ -1 +1,4 @@ -# CONFIG_MALI_CSF_SUPPORT is not set +CONFIG_MALI_BIFROST=y +CONFIG_MALI_PLATFORM_NAME="rk" +CONFIG_MALI_BIFROST_EXPERT=y +CONFIG_MALI_BIFROST_DEBUG=y diff --git a/arch/arm64/configs/rk356x_eink.config b/arch/arm64/configs/rk356x_eink.config index fcc1e295a0d6..73c416544de4 100644 --- a/arch/arm64/configs/rk356x_eink.config +++ b/arch/arm64/configs/rk356x_eink.config @@ -1,3 +1,7 @@ CONFIG_ROCKCHIP_EBC_DEV=y CONFIG_ROCKCHIP_LITE_ULTRA_SUSPEND=y CONFIG_SND_SOC_AW882XX=y +CONFIG_MALI_BIFROST=y +CONFIG_MALI_PLATFORM_NAME="rk" +CONFIG_MALI_BIFROST_EXPERT=y +CONFIG_MALI_BIFROST_DEBUG=y diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig index 6f88a769967f..1b033ce916e1 100644 --- a/arch/arm64/configs/rockchip_defconfig +++ b/arch/arm64/configs/rockchip_defconfig @@ -686,11 +686,6 @@ CONFIG_MALI_PLATFORM_THIRDPARTY=y CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="rk" CONFIG_MALI_DEBUG=y CONFIG_MALI_PWRSOFT_765=y -CONFIG_MALI_BIFROST=y -CONFIG_MALI_PLATFORM_NAME="rk" -CONFIG_MALI_CSF_SUPPORT=y -CONFIG_MALI_BIFROST_EXPERT=y -CONFIG_MALI_BIFROST_DEBUG=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_PWM=y CONFIG_ROCKCHIP_MULTI_RGA=y diff --git a/arch/arm64/configs/rockchip_gki.config b/arch/arm64/configs/rockchip_gki.config index 840d30ee95de..e46528aee6ef 100644 --- a/arch/arm64/configs/rockchip_gki.config +++ b/arch/arm64/configs/rockchip_gki.config @@ -160,11 +160,6 @@ CONFIG_LS_CM3217=m CONFIG_LS_CM3218=m CONFIG_LS_STK3410=m CONFIG_LS_UCS14620=m -CONFIG_MALI_BIFROST=m -CONFIG_MALI_BIFROST_DEBUG=y -CONFIG_MALI_BIFROST_EXPERT=y -CONFIG_MALI_CSF_SUPPORT=y -CONFIG_MALI_PLATFORM_NAME="rk" CONFIG_MALI_PWRSOFT_765=y CONFIG_MFD_RK618=m CONFIG_MFD_RK630_I2C=m diff --git a/arch/arm64/configs/rockchip_gki.fragment b/arch/arm64/configs/rockchip_gki.fragment index c31a4e8280f5..2709f9879393 100644 --- a/arch/arm64/configs/rockchip_gki.fragment +++ b/arch/arm64/configs/rockchip_gki.fragment @@ -153,12 +153,6 @@ CONFIG_LS_CM3217=m CONFIG_LS_CM3218=m CONFIG_LS_STK3410=m CONFIG_LS_UCS14620=m -CONFIG_MALI_BIFROST=m -CONFIG_MALI_BIFROST_DEBUG=y -CONFIG_MALI_BIFROST_EXPERT=y -CONFIG_MALI_CSF_SUPPORT=y -CONFIG_MALI_PLATFORM_NAME="rk" -CONFIG_MALI_PWRSOFT_765=y CONFIG_MFD_RK618=m CONFIG_MFD_RK628=m CONFIG_MFD_RK630_I2C=m