From 63bd7f3d523343b9d3d7b71acbbccec4ab52770a Mon Sep 17 00:00:00 2001 From: Zhen Chen Date: Wed, 20 Aug 2025 09:59:26 +0800 Subject: [PATCH] Mali: valhall: Remove dependencies on KBASE_PM_RUNTIME KBASE_PM_RUNTIME was originally defined by ARM. However, in the modification to upgrade driver to g29p0-00eac0 (r54), ARM removed KBASE_PM_RUNTIME, and the source code that depended on KBASE_PM_RUNTIME was modified to be enabled by default. This modification corresponds to commit fb91362a2368 ("MALI: valhall: upgrade DDK to g29p0-00eac0, from g28p0-00eac0"). Some code previously added by finley.xiao@rock-chips.com also depends on KBASE_PM_RUNTIME. After picking the above commit, the definition of KBASE_PM_RUNTIME was removed, making the code added by Finley unable to be enabled. This may lead to anomalies such as "failed to get ack on domain 'gpu'...", as referenced in https://redmine.rock-chips.com/issues/568204. This modification fixes the issue above. Signed-off-by: Zhen Chen Change-Id: Ibf57f363f4f779eceb0e7891271e41cae1a560ea --- drivers/gpu/arm/valhall/mali_kbase_core_linux.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/arm/valhall/mali_kbase_core_linux.c b/drivers/gpu/arm/valhall/mali_kbase_core_linux.c index b7913d22ebbc..5e2342c30037 100644 --- a/drivers/gpu/arm/valhall/mali_kbase_core_linux.c +++ b/drivers/gpu/arm/valhall/mali_kbase_core_linux.c @@ -4535,12 +4535,10 @@ static int kbase_device_suspend(struct device *dev) kbase_platform_rk_enable_regulator(kbdev); #endif -#ifdef KBASE_PM_RUNTIME if (kbdev->is_runtime_resumed) { if (kbdev->pm.backend.callback_power_runtime_off) kbdev->pm.backend.callback_power_runtime_off(kbdev); } -#endif /* KBASE_PM_RUNTIME */ return 0; } @@ -4561,12 +4559,10 @@ static int kbase_device_resume(struct device *dev) if (!kbdev) return -ENODEV; -#ifdef KBASE_PM_RUNTIME if (kbdev->is_runtime_resumed) { if (kbdev->pm.backend.callback_power_runtime_on) kbdev->pm.backend.callback_power_runtime_on(kbdev); } -#endif /* KBASE_PM_RUNTIME */ kbase_pm_resume(kbdev);