]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
accel/ivpu: Trigger recovery on TDR with OS scheduling
authorKarol Wachowski <karol.wachowski@linux.intel.com>
Thu, 2 Apr 2026 12:55:26 +0000 (14:55 +0200)
committerKarol Wachowski <karol.wachowski@linux.intel.com>
Thu, 2 Apr 2026 19:29:01 +0000 (21:29 +0200)
With OS scheduling mode the driver cannot determine which context
caused the timeout, so context abort cannot be used. Instead of
queuing context_abort_work, directly trigger full device recovery
when a job timeout (TDR) occurs in OS scheduling mode.

Fixes: ade00a6c903f ("accel/ivpu: Perform engine reset instead of device recovery on TDR")
Reviewed-by: Jeff Hugo <jeff.hugo@oss.qualcomm.com>
Reviewed-by: Lizhi Hou <lizhi.hou@amd.com>
Signed-off-by: Karol Wachowski <karol.wachowski@linux.intel.com>
Link: https://patch.msgid.link/20260402125526.845210-1-karol.wachowski@linux.intel.com
drivers/accel/ivpu/ivpu_pm.c

index 83da9b297f3782a12bc3002cdfb41050feef3b23..c1ce8329790e0099ab8c166652b36e31b39da7ec 100644 (file)
@@ -221,6 +221,12 @@ static void ivpu_job_timeout_work(struct work_struct *work)
 
 abort:
        atomic_set(&vdev->job_timeout_counter, 0);
+
+       if (vdev->fw->sched_mode == VPU_SCHEDULING_MODE_OS) {
+               ivpu_pm_trigger_recovery(vdev, "Job timeout");
+               return;
+       }
+
        ivpu_jsm_state_dump(vdev);
        ivpu_dev_coredump(vdev);
        queue_work(system_percpu_wq, &vdev->context_abort_work);