From 8556e654d68ebde9009bed6303e5f0c3394bf293 Mon Sep 17 00:00:00 2001 From: Zhen Chen Date: Tue, 8 Feb 2022 14:26:23 +0800 Subject: [PATCH] MALI: bifrost: fix panic "stack is corrupted in: kbase_get_real_power_locked" The panic was triggered by running "cat /sys/kernel/debug/mali0/ipa_current_power". It is fixed by enlarging KBASE_IPA_BLOCK_TYPE_NUM according to the fact that we set 4 clks for GPU in rk3588 dts. Change-Id: I3a87f6f2d25cf296d95d033d3d98c51666ea482d Signed-off-by: Zhen Chen --- drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h index 1d81ab6ae53f..f722f5fadff9 100644 --- a/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h +++ b/drivers/gpu/arm/bifrost/ipa/mali_kbase_ipa.h @@ -29,14 +29,19 @@ struct devfreq; /** * enum kbase_ipa_block_type - Type of block for which power estimation is done. * + * @KBASE_IPA_BLOCK_TYPE_USING_CLK_MALI: + * Blocks using clk_mali in dts. * @KBASE_IPA_BLOCK_TYPE_TOP_LEVEL: Top-level block, that covers CSHW, * MEMSYS, Tiler. * @KBASE_IPA_BLOCK_TYPE_SHADER_CORES: All Shader cores. + * @KBASE_IPA_BLOCK_TYPE_FOR_CLK_GPU: Dummy for clk_gpu in dts. * @KBASE_IPA_BLOCK_TYPE_NUM: Number of blocks. */ enum kbase_ipa_block_type { + KBASE_IPA_BLOCK_TYPE_USING_CLK_MALI, KBASE_IPA_BLOCK_TYPE_TOP_LEVEL, KBASE_IPA_BLOCK_TYPE_SHADER_CORES, + KBASE_IPA_BLOCK_TYPE_FOR_CLK_GPU, KBASE_IPA_BLOCK_TYPE_NUM };