niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

accel/ivpu: Remove suspend_reschedule_counter

Browse source 
Don't retry runtime suspend. It is now expected to succeed on the first
try. After autosuspend_delay passed, FW should already be idle and
ready for warm suspend.

Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Reviewed-by: Wachowski, Karol <karol.wachowski@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240611120433.1012423-4-jacek.lawrynowicz@linux.intel.com
This commit is contained in:
Jacek Lawrynowicz 2024-06-11 14:04:20 +02:00
parent b7ed87ffc7
commit 7d4b4c7443
2 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/accel/ivpu/ivpu_pm.c
View file

@ -237,33 +237,28 @@ int ivpu_pm_runtime_suspend_cb(struct device *dev)
{ {
struct drm_device *drm = dev_get_drvdata(dev); struct drm_device *drm = dev_get_drvdata(dev);
struct ivpu_device *vdev = to_ivpu_device(drm); struct ivpu_device *vdev = to_ivpu_device(drm);
bool hw_is_idle = true; int ret, ret_d0i3;
int ret; bool is_idle;
drm_WARN_ON(&vdev->drm, !xa_empty(&vdev->submitted_jobs_xa)); drm_WARN_ON(&vdev->drm, !xa_empty(&vdev->submitted_jobs_xa));
drm_WARN_ON(&vdev->drm, work_pending(&vdev->pm->recovery_work)); drm_WARN_ON(&vdev->drm, work_pending(&vdev->pm->recovery_work));
ivpu_dbg(vdev, PM, "Runtime suspend..\n"); ivpu_dbg(vdev, PM, "Runtime suspend..\n");
if (!ivpu_hw_is_idle(vdev) && vdev->pm->suspend_reschedule_counter) { is_idle = ivpu_hw_is_idle(vdev);
ivpu_dbg(vdev, PM, "Failed to enter idle, rescheduling suspend, retries left %d\n", if (!is_idle)
vdev->pm->suspend_reschedule_counter); ivpu_err(vdev, "NPU is not idle before autosuspend\n");
pm_schedule_suspend(dev, vdev->timeout.reschedule_suspend);
vdev->pm->suspend_reschedule_counter--;
return -EAGAIN;
}
if (!vdev->pm->suspend_reschedule_counter) ret_d0i3 = ivpu_jsm_pwr_d0i3_enter(vdev);
hw_is_idle = false; if (ret_d0i3)
else if (ivpu_jsm_pwr_d0i3_enter(vdev)) ivpu_err(vdev, "Failed to prepare for d0i3: %d\n", ret_d0i3);
hw_is_idle = false;
ret = ivpu_suspend(vdev); ret = ivpu_suspend(vdev);
if (ret) if (ret)
ivpu_err(vdev, "Failed to suspend NPU: %d\n", ret); ivpu_err(vdev, "Failed to suspend NPU: %d\n", ret);
if (!hw_is_idle) { if (!is_idle || ret_d0i3) {
ivpu_err(vdev, "NPU failed to enter idle, force suspended.\n"); ivpu_err(vdev, "Forcing cold boot due to previous errors\n");
atomic_inc(&vdev->pm->reset_counter); atomic_inc(&vdev->pm->reset_counter);
ivpu_fw_log_dump(vdev); ivpu_fw_log_dump(vdev);
ivpu_pm_prepare_cold_boot(vdev); ivpu_pm_prepare_cold_boot(vdev);
@ -271,8 +266,6 @@ int ivpu_pm_runtime_suspend_cb(struct device *dev)
ivpu_pm_prepare_warm_boot(vdev); ivpu_pm_prepare_warm_boot(vdev);
} }
vdev->pm->suspend_reschedule_counter = PM_RESCHEDULE_LIMIT;
ivpu_dbg(vdev, PM, "Runtime suspend done.\n"); ivpu_dbg(vdev, PM, "Runtime suspend done.\n");
return 0; return 0;
@ -300,8 +293,7 @@ int ivpu_rpm_get(struct ivpu_device *vdev)
int ret; int ret;
ret = pm_runtime_resume_and_get(vdev->drm.dev); ret = pm_runtime_resume_and_get(vdev->drm.dev);
if (!drm_WARN_ON(&vdev->drm, ret < 0)) drm_WARN_ON(&vdev->drm, ret < 0);
vdev->pm->suspend_reschedule_counter = PM_RESCHEDULE_LIMIT;
return ret; return ret;
} }
@ -365,7 +357,6 @@ void ivpu_pm_init(struct ivpu_device *vdev)
int delay; int delay;
pm->vdev = vdev; pm->vdev = vdev;
pm->suspend_reschedule_counter = PM_RESCHEDULE_LIMIT;
init_rwsem(&pm->reset_lock); init_rwsem(&pm->reset_lock);
atomic_set(&pm->reset_pending, 0); atomic_set(&pm->reset_pending, 0);

3
drivers/accel/ivpu/ivpu_pm.h
View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
/* /*
* Copyright (C) 2020-2023 Intel Corporation * Copyright (C) 2020-2024 Intel Corporation
*/ */
#ifndef __IVPU_PM_H__ #ifndef __IVPU_PM_H__
@ -19,7 +19,6 @@ struct ivpu_pm_info {
atomic_t reset_counter; atomic_t reset_counter;
atomic_t reset_pending; atomic_t reset_pending;
bool is_warmboot; bool is_warmboot;
u32 suspend_reschedule_counter;
}; };
void ivpu_pm_init(struct ivpu_device *vdev); void ivpu_pm_init(struct ivpu_device *vdev);