diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2017-12-14 16:03:43 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-12-18 10:59:07 -0500 |
commit | 131b4b3686b701079e8fb82eb9384c8acdd3fc72 (patch) | |
tree | a85a6eeb96609d29f86a16c749282ec59b735661 /drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | |
parent | 75758255dc0fae76a845fd5185cfcdf60990cc99 (diff) |
drm/amdgpu: rename amdgpu_wb_* functions
add device for consistency.
Acked-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.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c index 41c75f9632dc..13044e66dcaf 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | |||
@@ -263,25 +263,25 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, | |||
263 | return r; | 263 | return r; |
264 | } | 264 | } |
265 | 265 | ||
266 | r = amdgpu_wb_get(adev, &ring->rptr_offs); | 266 | r = amdgpu_device_wb_get(adev, &ring->rptr_offs); |
267 | if (r) { | 267 | if (r) { |
268 | dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r); | 268 | dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r); |
269 | return r; | 269 | return r; |
270 | } | 270 | } |
271 | 271 | ||
272 | r = amdgpu_wb_get(adev, &ring->wptr_offs); | 272 | r = amdgpu_device_wb_get(adev, &ring->wptr_offs); |
273 | if (r) { | 273 | if (r) { |
274 | dev_err(adev->dev, "(%d) ring wptr_offs wb alloc failed\n", r); | 274 | dev_err(adev->dev, "(%d) ring wptr_offs wb alloc failed\n", r); |
275 | return r; | 275 | return r; |
276 | } | 276 | } |
277 | 277 | ||
278 | r = amdgpu_wb_get(adev, &ring->fence_offs); | 278 | r = amdgpu_device_wb_get(adev, &ring->fence_offs); |
279 | if (r) { | 279 | if (r) { |
280 | dev_err(adev->dev, "(%d) ring fence_offs wb alloc failed\n", r); | 280 | dev_err(adev->dev, "(%d) ring fence_offs wb alloc failed\n", r); |
281 | return r; | 281 | return r; |
282 | } | 282 | } |
283 | 283 | ||
284 | r = amdgpu_wb_get(adev, &ring->cond_exe_offs); | 284 | r = amdgpu_device_wb_get(adev, &ring->cond_exe_offs); |
285 | if (r) { | 285 | if (r) { |
286 | dev_err(adev->dev, "(%d) ring cond_exec_polling wb alloc failed\n", r); | 286 | dev_err(adev->dev, "(%d) ring cond_exec_polling wb alloc failed\n", r); |
287 | return r; | 287 | return r; |
@@ -348,11 +348,11 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring) | |||
348 | if (!(ring->adev) || !(ring->adev->rings[ring->idx])) | 348 | if (!(ring->adev) || !(ring->adev->rings[ring->idx])) |
349 | return; | 349 | return; |
350 | 350 | ||
351 | amdgpu_wb_free(ring->adev, ring->rptr_offs); | 351 | amdgpu_device_wb_free(ring->adev, ring->rptr_offs); |
352 | amdgpu_wb_free(ring->adev, ring->wptr_offs); | 352 | amdgpu_device_wb_free(ring->adev, ring->wptr_offs); |
353 | 353 | ||
354 | amdgpu_wb_free(ring->adev, ring->cond_exe_offs); | 354 | amdgpu_device_wb_free(ring->adev, ring->cond_exe_offs); |
355 | amdgpu_wb_free(ring->adev, ring->fence_offs); | 355 | amdgpu_device_wb_free(ring->adev, ring->fence_offs); |
356 | 356 | ||
357 | amdgpu_bo_free_kernel(&ring->ring_obj, | 357 | amdgpu_bo_free_kernel(&ring->ring_obj, |
358 | &ring->gpu_addr, | 358 | &ring->gpu_addr, |