diff options
author | Christian König <christian.koenig@amd.com> | 2018-07-13 07:54:56 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-07-16 17:11:52 -0400 |
commit | 0e28b10ff1b8e65788040b51c30c9cc984060dcd (patch) | |
tree | 4ca6f18e88b3345e26b170b54ae2b78e74675342 /drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | |
parent | eb3961a57424a5c3dae44576d1c88e64a818d871 (diff) |
drm/amdgpu: remove ring parameter from amdgpu_job_submit
We know the ring through the entity anyway.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Acked-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 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index 10e0a97c7c03..51ff751e093b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | |||
@@ -117,21 +117,20 @@ void amdgpu_job_free(struct amdgpu_job *job) | |||
117 | kfree(job); | 117 | kfree(job); |
118 | } | 118 | } |
119 | 119 | ||
120 | int amdgpu_job_submit(struct amdgpu_job *job, struct amdgpu_ring *ring, | 120 | int amdgpu_job_submit(struct amdgpu_job *job, struct drm_sched_entity *entity, |
121 | struct drm_sched_entity *entity, void *owner, | 121 | void *owner, struct dma_fence **f) |
122 | struct dma_fence **f) | ||
123 | { | 122 | { |
124 | int r; | 123 | int r; |
125 | job->ring = ring; | ||
126 | 124 | ||
127 | if (!f) | 125 | if (!f) |
128 | return -EINVAL; | 126 | return -EINVAL; |
129 | 127 | ||
130 | r = drm_sched_job_init(&job->base, &ring->sched, entity, owner); | 128 | r = drm_sched_job_init(&job->base, entity->sched, entity, owner); |
131 | if (r) | 129 | if (r) |
132 | return r; | 130 | return r; |
133 | 131 | ||
134 | job->owner = owner; | 132 | job->owner = owner; |
133 | job->ring = to_amdgpu_ring(entity->sched); | ||
135 | *f = dma_fence_get(&job->base.s_fence->finished); | 134 | *f = dma_fence_get(&job->base.s_fence->finished); |
136 | amdgpu_job_free_resources(job); | 135 | amdgpu_job_free_resources(job); |
137 | amdgpu_ring_priority_get(job->ring, job->base.s_priority); | 136 | amdgpu_ring_priority_get(job->ring, job->base.s_priority); |