aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2016-07-06 12:40:16 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-07-07 15:06:19 -0400
commit33b7ed0122e4da0d92d50cc226cd9db659834eaa (patch)
tree83c0d13e85faa249a1f7ca0833f297c32ce474d4 /drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
parentbb06d7ef99272ecf4f3d777b256cbae042888123 (diff)
drm/amdgpu: remove more of the ring backup code
Not used anymore. Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
index 71e146180e8e..3b885e3e9b56 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
@@ -190,14 +190,6 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
190 return r; 190 return r;
191 } 191 }
192 192
193 r = amdgpu_wb_get(adev, &ring->next_rptr_offs);
194 if (r) {
195 dev_err(adev->dev, "(%d) ring next_rptr wb alloc failed\n", r);
196 return r;
197 }
198 ring->next_rptr_gpu_addr = adev->wb.gpu_addr + ring->next_rptr_offs * 4;
199 ring->next_rptr_cpu_addr = &adev->wb.wb[ring->next_rptr_offs];
200
201 r = amdgpu_wb_get(adev, &ring->cond_exe_offs); 193 r = amdgpu_wb_get(adev, &ring->cond_exe_offs);
202 if (r) { 194 if (r) {
203 dev_err(adev->dev, "(%d) ring cond_exec_polling wb alloc failed\n", r); 195 dev_err(adev->dev, "(%d) ring cond_exec_polling wb alloc failed\n", r);
@@ -280,7 +272,6 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring)
280 amdgpu_wb_free(ring->adev, ring->fence_offs); 272 amdgpu_wb_free(ring->adev, ring->fence_offs);
281 amdgpu_wb_free(ring->adev, ring->rptr_offs); 273 amdgpu_wb_free(ring->adev, ring->rptr_offs);
282 amdgpu_wb_free(ring->adev, ring->wptr_offs); 274 amdgpu_wb_free(ring->adev, ring->wptr_offs);
283 amdgpu_wb_free(ring->adev, ring->next_rptr_offs);
284 275
285 if (ring_obj) { 276 if (ring_obj) {
286 r = amdgpu_bo_reserve(ring_obj, false); 277 r = amdgpu_bo_reserve(ring_obj, false);