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_ttm.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_ttm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 11a12483c995..9958e76d1c78 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |||
@@ -2006,7 +2006,7 @@ static int amdgpu_map_buffer(struct ttm_buffer_object *bo, | |||
2006 | if (r) | 2006 | if (r) |
2007 | goto error_free; | 2007 | goto error_free; |
2008 | 2008 | ||
2009 | r = amdgpu_job_submit(job, ring, &adev->mman.entity, | 2009 | r = amdgpu_job_submit(job, &adev->mman.entity, |
2010 | AMDGPU_FENCE_OWNER_UNDEFINED, &fence); | 2010 | AMDGPU_FENCE_OWNER_UNDEFINED, &fence); |
2011 | if (r) | 2011 | if (r) |
2012 | goto error_free; | 2012 | goto error_free; |
@@ -2083,7 +2083,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, | |||
2083 | DRM_ERROR("Error scheduling IBs (%d)\n", r); | 2083 | DRM_ERROR("Error scheduling IBs (%d)\n", r); |
2084 | amdgpu_job_free(job); | 2084 | amdgpu_job_free(job); |
2085 | } else { | 2085 | } else { |
2086 | r = amdgpu_job_submit(job, ring, &adev->mman.entity, | 2086 | r = amdgpu_job_submit(job, &adev->mman.entity, |
2087 | AMDGPU_FENCE_OWNER_UNDEFINED, fence); | 2087 | AMDGPU_FENCE_OWNER_UNDEFINED, fence); |
2088 | if (r) | 2088 | if (r) |
2089 | goto error_free; | 2089 | goto error_free; |
@@ -2175,7 +2175,7 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo, | |||
2175 | 2175 | ||
2176 | amdgpu_ring_pad_ib(ring, &job->ibs[0]); | 2176 | amdgpu_ring_pad_ib(ring, &job->ibs[0]); |
2177 | WARN_ON(job->ibs[0].length_dw > num_dw); | 2177 | WARN_ON(job->ibs[0].length_dw > num_dw); |
2178 | r = amdgpu_job_submit(job, ring, &adev->mman.entity, | 2178 | r = amdgpu_job_submit(job, &adev->mman.entity, |
2179 | AMDGPU_FENCE_OWNER_UNDEFINED, fence); | 2179 | AMDGPU_FENCE_OWNER_UNDEFINED, fence); |
2180 | if (r) | 2180 | if (r) |
2181 | goto error_free; | 2181 | goto error_free; |