diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-07-24 15:03:59 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-07-24 15:03:59 +0200 |
| commit | b35ad8405d3951721126c3942d863056c2f39c64 (patch) | |
| tree | a33abc961c828287673b607c430d6fb80754807f /drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | |
| parent | 7f6fa101dfac8739764e47751d314551f6160c98 (diff) | |
| parent | 935ace2fb5cc49ae88bd1f1735ddc51cdc2ebfb3 (diff) | |
Merge branch 'core/entry' into x86/entry
Pick up generic entry code to migrate x86 over.
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; |