aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2018-10-29 11:12:42 -0400
committerAlex Deucher <alexander.deucher@amd.com>2018-11-05 14:21:27 -0500
commit98079389a873f45ba75bbb20dcf14db0ec694a9a (patch)
tree902b6ca7657d9262bbe614f1fd2007891d8d1a5f /drivers/gpu/drm/amd/amdgpu/cik_sdma.c
parent315fed0367b4b4197cdc9585d09a1e659ae6c716 (diff)
drm/amdgpu: remove messages from IB tests
We already print an error message that an IB test failed in the common code. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/cik_sdma.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/cik_sdma.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
index 5eb15bf9ec7c..49275f358f7a 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
@@ -668,20 +668,16 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring, long timeout)
668 long r; 668 long r;
669 669
670 r = amdgpu_device_wb_get(adev, &index); 670 r = amdgpu_device_wb_get(adev, &index);
671 if (r) { 671 if (r)
672 dev_err(adev->dev, "(%ld) failed to allocate wb slot\n", r);
673 return r; 672 return r;
674 }
675 673
676 gpu_addr = adev->wb.gpu_addr + (index * 4); 674 gpu_addr = adev->wb.gpu_addr + (index * 4);
677 tmp = 0xCAFEDEAD; 675 tmp = 0xCAFEDEAD;
678 adev->wb.wb[index] = cpu_to_le32(tmp); 676 adev->wb.wb[index] = cpu_to_le32(tmp);
679 memset(&ib, 0, sizeof(ib)); 677 memset(&ib, 0, sizeof(ib));
680 r = amdgpu_ib_get(adev, NULL, 256, &ib); 678 r = amdgpu_ib_get(adev, NULL, 256, &ib);
681 if (r) { 679 if (r)
682 DRM_ERROR("amdgpu: failed to get ib (%ld).\n", r);
683 goto err0; 680 goto err0;
684 }
685 681
686 ib.ptr[0] = SDMA_PACKET(SDMA_OPCODE_WRITE, 682 ib.ptr[0] = SDMA_PACKET(SDMA_OPCODE_WRITE,
687 SDMA_WRITE_SUB_OPCODE_LINEAR, 0); 683 SDMA_WRITE_SUB_OPCODE_LINEAR, 0);
@@ -696,21 +692,16 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring, long timeout)
696 692
697 r = dma_fence_wait_timeout(f, false, timeout); 693 r = dma_fence_wait_timeout(f, false, timeout);
698 if (r == 0) { 694 if (r == 0) {
699 DRM_ERROR("amdgpu: IB test timed out\n");
700 r = -ETIMEDOUT; 695 r = -ETIMEDOUT;
701 goto err1; 696 goto err1;
702 } else if (r < 0) { 697 } else if (r < 0) {
703 DRM_ERROR("amdgpu: fence wait failed (%ld).\n", r);
704 goto err1; 698 goto err1;
705 } 699 }
706 tmp = le32_to_cpu(adev->wb.wb[index]); 700 tmp = le32_to_cpu(adev->wb.wb[index]);
707 if (tmp == 0xDEADBEEF) { 701 if (tmp == 0xDEADBEEF)
708 DRM_DEBUG("ib test on ring %d succeeded\n", ring->idx);
709 r = 0; 702 r = 0;
710 } else { 703 else
711 DRM_ERROR("amdgpu: ib test failed (0x%08X)\n", tmp);
712 r = -EINVAL; 704 r = -EINVAL;
713 }
714 705
715err1: 706err1:
716 amdgpu_ib_free(adev, &ib, NULL); 707 amdgpu_ib_free(adev, &ib, NULL);