Skip to content

Commit 15d421f

Browse files
committed
MALI: bifrost: Fix hibernation
Fix following panic after hibernation resume on rk3588: [ 8.170297][ T2089] Restarting tasks ... done. [ 8.183038][ T2089] PM: hibernation: hibernation exit ... [ 10.056856][ T391] rockchip-pm-domain fd8d8000.power-management:power-controller: failed to get ack on domain 'gpu', target_idle = 0, target_ack = 0, val=0x9ff1 [ 10.056912][ T391] Kernel panic - not syncing: panic_on_set_idle set ... [ 10.058770][ T391] CPU: 7 PID: 391 Comm: mali-gpuq-kthre Tainted: G O 6.1.99 khadas#5 [ 10.059554][ T391] Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT) [ 10.060169][ T391] Call trace: [ 10.060462][ T391] dump_backtrace+0xf4/0x114 [ 10.060887][ T391] show_stack+0x18/0x24 [ 10.061262][ T391] dump_stack_lvl+0x6c/0x90 [ 10.061678][ T391] dump_stack+0x18/0x38 [ 10.062053][ T391] panic+0x14c/0x340 [ 10.062402][ T391] rockchip_pmu_set_idle_request+0x274/0x278 [ 10.062931][ T391] rockchip_pd_power+0x1a8/0x350 [ 10.063371][ T391] rockchip_pd_power_on+0x24/0x30 [ 10.063811][ T391] genpd_power_on+0x1d4/0x2ec [ 10.064229][ T391] genpd_runtime_resume+0xb0/0x384 [ 10.064689][ T391] __rpm_callback+0x7c/0x3c8 [ 10.065096][ T391] rpm_resume+0x404/0x5cc [ 10.065477][ T391] __pm_runtime_resume+0x4c/0x90 [ 10.065916][ T391] rk_pm_callback_power_on+0x16c/0x278 [ 10.066407][ T391] kbase_pm_clock_on+0x110/0x3a8 [ 10.066852][ T391] kbase_pm_do_poweron+0x20/0x68 [ 10.067293][ T391] kbase_pm_update_active+0x90/0x1c8 [ 10.067762][ T391] kbase_hwaccess_pm_gpu_active+0x10/0x1c [ 10.068264][ T391] kbase_pm_context_active_handle_suspend_locked+0x8c/0x1a0 [ 10.068906][ T391] scheduler_pm_active_handle_suspend+0x6c/0x100 [ 10.069473][ T391] scheduler_wakeup+0x4c/0x1ac [ 10.069898][ T391] kbase_csf_scheduler_queue_start+0x330/0x710 [ 10.070451][ T391] kbase_csf_process_queue_kick+0x58/0x1b0 [ 10.070969][ T391] kbase_csf_scheduler_kthread+0x9d4/0x13ec [ 10.071499][ T391] kthread+0xec/0x1b8 [ 10.071860][ T391] ret_from_fork+0x10/0x20 Signed-off-by: Tao Huang <[email protected]> Change-Id: I416e38313c633c22e4c6675ddf68ce348b4f63e9
1 parent 263734a commit 15d421f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpu/arm/bifrost/mali_kbase_core_linux.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5948,8 +5948,8 @@ static int kbase_device_runtime_idle(struct device *dev)
59485948
/* The power management operations for the platform driver.
59495949
*/
59505950
static const struct dev_pm_ops kbase_pm_ops = {
5951-
.suspend = kbase_device_suspend,
5952-
.resume = kbase_device_resume,
5951+
SYSTEM_SLEEP_PM_OPS(kbase_device_suspend,
5952+
kbase_device_resume)
59535953
#ifdef KBASE_PM_RUNTIME
59545954
.runtime_suspend = kbase_device_runtime_suspend,
59555955
.runtime_resume = kbase_device_runtime_resume,

0 commit comments

Comments
 (0)