diff options
| author |   Thomas Zimmermann <tzimmermann@suse.de> | 2020-07-28 15:35:50 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2020-07-28 15:35:50 +0200 |
| commit | f4a1692491b5cce8978cea19cb8946bc2c6f14bc (patch) | |
| tree | 1865126859b5b9d613c49113a5aaafc78f79b99b /drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | |
| parent | drm: hold gem reference until object is no longer accessed (diff) | |
| parent | Merge branch 'linux-5.8' of git://github.com/skeggsb/linux into drm-fixes (diff) | |
| download | wireguard-linux-f4a1692491b5cce8978cea19cb8946bc2c6f14bc.tar.xz wireguard-linux-f4a1692491b5cce8978cea19cb8946bc2c6f14bc.zip | |
Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes
Updating drm-misc-fixes to v5.8-rc7.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_job.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index 47207188c569..4fb4c3b69687 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -37,7 +37,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; |