diff options
| author |   jsg <jsg@openbsd.org> | 2020-07-16 10:07:02 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2020-07-16 10:07:02 +0000 |
| commit | 60ed5e115382cfcbb12b85d9e8df3c9b1219277e (patch) | |
| tree | a4984f298d1fd699c98b8584d4ee534ee1b16fa6 /sys/dev/pci/drm/amd/amdgpu/amdgpu_job.c | |
| parent | drm/i915: Skip stale object handle for debugfs per-file-stats (diff) | |
| download | wireguard-openbsd-60ed5e115382cfcbb12b85d9e8df3c9b1219277e.tar.xz wireguard-openbsd-60ed5e115382cfcbb12b85d9e8df3c9b1219277e.zip | |
drm/amdgpu: don't do soft recovery if gpu_recovery=0
From Marek Olsak
d7915047a1d59474d06789a9dd1925064969e080 in linux 5.7.y/5.7.9
f4892c327a8e5df7ce16cab40897daf90baf6bec in mainline linux
Diffstat (limited to 'sys/dev/pci/drm/amd/amdgpu/amdgpu_job.c')
| -rw-r--r-- | sys/dev/pci/drm/amd/amdgpu/amdgpu_job.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_job.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_job.c index 4981e443a88..2f0eff2c23c 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_job.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_job.c @@ -36,7 +36,8 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job) memset(&ti, 0, sizeof(struct amdgpu_task_info)); - if (amdgpu_ring_soft_recovery(ring, job->vmid, s_job->s_fence->parent)) { + if (amdgpu_gpu_recovery && + amdgpu_ring_soft_recovery(ring, job->vmid, s_job->s_fence->parent)) { DRM_ERROR("ring %s timeout, but soft recovered\n", s_job->sched->name); return; |