From: Wachowski, Karol Date: Tue, 11 Jun 2024 12:04:29 +0000 (+0200) Subject: accel/ivpu: Synchronize device unbind with recovery work X-Git-Tag: v6.11-rc1~141^2~21^2~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4d46253fa056d56b1c48dd5dfe3635817296bdb;p=thirdparty%2Flinux.git accel/ivpu: Synchronize device unbind with recovery work Do not allow unbinding device in the middle of recovery flow. Signed-off-by: Wachowski, Karol Reviewed-by: Jacek Lawrynowicz Signed-off-by: Jacek Lawrynowicz Link: https://patchwork.freedesktop.org/patch/msgid/20240611120433.1012423-13-jacek.lawrynowicz@linux.intel.com --- diff --git a/drivers/accel/ivpu/ivpu_drv.c b/drivers/accel/ivpu/ivpu_drv.c index c59c6f113098d..c91400ecf9265 100644 --- a/drivers/accel/ivpu/ivpu_drv.c +++ b/drivers/accel/ivpu/ivpu_drv.c @@ -695,14 +695,14 @@ static void ivpu_bo_unbind_all_user_contexts(struct ivpu_device *vdev) static void ivpu_dev_fini(struct ivpu_device *vdev) { + ivpu_jobs_abort_all(vdev); + ivpu_pm_cancel_recovery(vdev); ivpu_pm_disable(vdev); ivpu_prepare_for_reset(vdev); ivpu_shutdown(vdev); ivpu_ms_cleanup_all(vdev); - ivpu_jobs_abort_all(vdev); ivpu_job_done_consumer_fini(vdev); - ivpu_pm_cancel_recovery(vdev); ivpu_bo_unbind_all_user_contexts(vdev); ivpu_ipc_fini(vdev);