diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-11-11 07:59:06 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-11-11 07:59:06 +0100 |
| commit | 1ca7feb59087a3d1a4ef79e09c42eca5c2e7fa38 (patch) | |
| tree | 548d3518b41341b93c88ee4ff5661e1eb42bd7f4 /drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | |
| parent | d44f821b0e13275735e8f3fe4db8703b45f05d52 (diff) | |
| parent | 31f4f5b495a62c9a8b15b1c3581acd5efeb9af8c (diff) | |
| download | linux-1ca7feb59087a3d1a4ef79e09c42eca5c2e7fa38.tar.gz linux-1ca7feb59087a3d1a4ef79e09c42eca5c2e7fa38.tar.bz2 linux-1ca7feb59087a3d1a4ef79e09c42eca5c2e7fa38.zip | |
Merge tag 'v5.4-rc7' into perf/core, to pick up fixes
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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index 9d76e0923a5a..96b2a31ccfed 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -218,7 +218,7 @@ static struct dma_fence *amdgpu_job_run(struct drm_sched_job *sched_job) struct amdgpu_ring *ring = to_amdgpu_ring(sched_job->sched); struct dma_fence *fence = NULL, *finished; struct amdgpu_job *job; - int r; + int r = 0; job = to_amdgpu_job(sched_job); finished = &job->base.s_fence->finished; @@ -243,6 +243,8 @@ static struct dma_fence *amdgpu_job_run(struct drm_sched_job *sched_job) job->fence = dma_fence_get(fence); amdgpu_job_free_resources(job); + + fence = r ? ERR_PTR(r) : fence; return fence; } |