aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2016-05-06 09:57:42 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-05-11 13:30:31 -0400
commit92f250989b7098f4b52d50183a7b2fc4e010731b (patch)
tree27e9b9a83675ce36313a789dac7ad27a827d671f /drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
parentf153d2867bf74f84d47f67c377a8e3a34865e562 (diff)
drm/amdgpu: move the context from the IBs into the job
We only have one context for all IBs. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@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.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
index 917c6f3bfa09..a0961f2a93d2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
@@ -122,14 +122,13 @@ int amdgpu_job_submit(struct amdgpu_job *job, struct amdgpu_ring *ring,
122 return -EINVAL; 122 return -EINVAL;
123 123
124 r = amd_sched_job_init(&job->base, &ring->sched, 124 r = amd_sched_job_init(&job->base, &ring->sched,
125 entity, 125 entity, amdgpu_job_timeout_func,
126 amdgpu_job_timeout_func, 126 amdgpu_job_free_func, owner, &fence);
127 amdgpu_job_free_func,
128 owner, &fence);
129 if (r) 127 if (r)
130 return r; 128 return r;
131 129
132 job->owner = owner; 130 job->owner = owner;
131 job->ctx = entity->fence_context;
133 *f = fence_get(fence); 132 *f = fence_get(fence);
134 amd_sched_entity_push_job(&job->base); 133 amd_sched_entity_push_job(&job->base);
135 134