diff options
author | Monk Liu <Monk.Liu@amd.com> | 2016-03-17 01:48:13 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-03-17 11:54:11 -0400 |
commit | 73cfa5f5cec3f4b99185d3535928dee6d01ba2f6 (patch) | |
tree | 98dc76f0278ae75f41b597610e70879076b2b3bd /drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | |
parent | cc55c45db5e2c97445d4663d45348a0fc27bf9ad (diff) |
drm/amdgpu: move ib.fence to job.fence
Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_job.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index df2f66666f85..063064c9351f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | |||
@@ -72,8 +72,8 @@ void amdgpu_job_free(struct amdgpu_job *job) | |||
72 | unsigned i; | 72 | unsigned i; |
73 | 73 | ||
74 | for (i = 0; i < job->num_ibs; ++i) | 74 | for (i = 0; i < job->num_ibs; ++i) |
75 | amdgpu_sa_bo_free(job->adev, &job->ibs[i].sa_bo, job->ibs[job->num_ibs - 1].fence); | 75 | amdgpu_sa_bo_free(job->adev, &job->ibs[i].sa_bo, job->fence); |
76 | fence_put(job->ibs[job->num_ibs - 1].fence); | 76 | fence_put(job->fence); |
77 | 77 | ||
78 | amdgpu_bo_unref(&job->uf.bo); | 78 | amdgpu_bo_unref(&job->uf.bo); |
79 | amdgpu_sync_free(&job->sync); | 79 | amdgpu_sync_free(&job->sync); |
@@ -157,6 +157,7 @@ static struct fence *amdgpu_job_run(struct amd_sched_job *sched_job) | |||
157 | } | 157 | } |
158 | 158 | ||
159 | err: | 159 | err: |
160 | job->fence = fence; | ||
160 | amdgpu_job_free(job); | 161 | amdgpu_job_free(job); |
161 | return fence; | 162 | return fence; |
162 | } | 163 | } |