diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2020-07-25 12:16:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-07-25 12:16:16 +0200 |
| commit | fb4405ae6e1c66277b7d69d2c7a34215671da585 (patch) | |
| tree | 95a24efe3a3ca90a4b041d5ca548c2d37eac1ae8 /drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | |
| parent | x86/stackprotector: Pre-initialize canary for secondary CPUs (diff) | |
| parent | Linux 5.8-rc6 (diff) | |
| download | wireguard-linux-fb4405ae6e1c66277b7d69d2c7a34215671da585.tar.xz wireguard-linux-fb4405ae6e1c66277b7d69d2c7a34215671da585.zip | |
Merge tag 'v5.8-rc6' into x86/cpu, to refresh the branch before adding new commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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; |