diff options
| author | Dave Airlie <airlied@redhat.com> | 2026-04-10 11:15:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2026-04-10 11:15:22 +1000 |
| commit | 83e8d8bbffa8161e94f3aeee4dd09a35062a78c8 (patch) | |
| tree | d81269f5dee31164e688e6e54c029f2f00386b4f /drivers/accel | |
| parent | 9fb0106249ca3e01d60c15d4f5592cd58a9164b0 (diff) | |
| parent | 4aa0deae1070690d08c1f47c489f8b5ce3f6ea6d (diff) | |
Merge tag 'drm-misc-next-fixes-2026-04-09' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
Short summary of fixes pull:
dma-buf:
- fence: fix docs for dma_fence_unlock_irqrestore()
fb-helper:
- unlock in error path
gem-shmem:
- fix PMD write update
gem-vram:
- remove obsolete documentation
ivpu:
- fix device-recovery handling
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patch.msgid.link/20260409113921.GA181028@linux.fritz.box
Diffstat (limited to 'drivers/accel')
| -rw-r--r-- | drivers/accel/ivpu/ivpu_pm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/accel/ivpu/ivpu_pm.c b/drivers/accel/ivpu/ivpu_pm.c index 83da9b297f37..c1ce8329790e 100644 --- a/drivers/accel/ivpu/ivpu_pm.c +++ b/drivers/accel/ivpu/ivpu_pm.c @@ -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); |