diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/cik_sdma.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c index 538d6a26e529..e8a48ae8d360 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c | |||
@@ -560,7 +560,7 @@ static int cik_sdma_ring_test_ring(struct amdgpu_ring *ring) | |||
560 | tmp = 0xCAFEDEAD; | 560 | tmp = 0xCAFEDEAD; |
561 | adev->wb.wb[index] = cpu_to_le32(tmp); | 561 | adev->wb.wb[index] = cpu_to_le32(tmp); |
562 | 562 | ||
563 | r = amdgpu_ring_lock(ring, 5); | 563 | r = amdgpu_ring_alloc(ring, 5); |
564 | if (r) { | 564 | if (r) { |
565 | DRM_ERROR("amdgpu: dma failed to lock ring %d (%d).\n", ring->idx, r); | 565 | DRM_ERROR("amdgpu: dma failed to lock ring %d (%d).\n", ring->idx, r); |
566 | amdgpu_wb_free(adev, index); | 566 | amdgpu_wb_free(adev, index); |
@@ -571,7 +571,7 @@ static int cik_sdma_ring_test_ring(struct amdgpu_ring *ring) | |||
571 | amdgpu_ring_write(ring, upper_32_bits(gpu_addr)); | 571 | amdgpu_ring_write(ring, upper_32_bits(gpu_addr)); |
572 | amdgpu_ring_write(ring, 1); /* number of DWs to follow */ | 572 | amdgpu_ring_write(ring, 1); /* number of DWs to follow */ |
573 | amdgpu_ring_write(ring, 0xDEADBEEF); | 573 | amdgpu_ring_write(ring, 0xDEADBEEF); |
574 | amdgpu_ring_unlock_commit(ring); | 574 | amdgpu_ring_commit(ring); |
575 | 575 | ||
576 | for (i = 0; i < adev->usec_timeout; i++) { | 576 | for (i = 0; i < adev->usec_timeout; i++) { |
577 | tmp = le32_to_cpu(adev->wb.wb[index]); | 577 | tmp = le32_to_cpu(adev->wb.wb[index]); |