diff options
| author |   Christian König <christian.koenig@amd.com> | 2018-10-30 13:07:26 +0100 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2018-11-05 14:21:30 -0500 |
| commit | b7ff853f15a278583414bbaeeb47b6084a32b0fb (patch) | |
| tree | e354cc608a7c085369201ea14c050f71dec58a07 /drivers/gpu/drm/amd/amdgpu/si_dma.c | |
| parent | drm/amdgpu: cleanup uvd_v6_0_ring_test_ring (diff) | |
| download | linux-dev-b7ff853f15a278583414bbaeeb47b6084a32b0fb.tar.xz linux-dev-b7ff853f15a278583414bbaeeb47b6084a32b0fb.zip | |
drm/amdgpu: cleanup si_dma_ring_test_ib
Accidentially missed during the last cleanup.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/si_dma.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/si_dma.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdgpu/si_dma.c index 68718ddf6ed0..bff6954c2150 100644 --- a/drivers/gpu/drm/amd/amdgpu/si_dma.c +++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c @@ -286,13 +286,10 @@ static int si_dma_ring_test_ib(struct amdgpu_ring *ring, long timeout) goto err1; } tmp = le32_to_cpu(adev->wb.wb[index]); - if (tmp == 0xDEADBEEF) { - DRM_DEBUG("ib test on ring %d succeeded\n", ring->idx); + if (tmp == 0xDEADBEEF) r = 0; - } else { - DRM_ERROR("amdgpu: ib test failed (0x%08X)\n", tmp); + else r = -EINVAL; - } err1: amdgpu_ib_free(adev, &ib, NULL); |