mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 02:21:52 +09:00
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 fb91362a23 ("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 <chenzhen@rock-chips.com>
Change-Id: Ibf57f363f4f779eceb0e7891271e41cae1a560ea
This commit is contained in:
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user