diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c index 7b999ee3defb..379e1ae7a8fb 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | |||
@@ -1113,27 +1113,19 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout) | |||
1113 | return 0; | 1113 | return 0; |
1114 | 1114 | ||
1115 | r = amdgpu_vce_get_create_msg(ring, 1, NULL); | 1115 | r = amdgpu_vce_get_create_msg(ring, 1, NULL); |
1116 | if (r) { | 1116 | if (r) |
1117 | DRM_ERROR("amdgpu: failed to get create msg (%ld).\n", r); | ||
1118 | goto error; | 1117 | goto error; |
1119 | } | ||
1120 | 1118 | ||
1121 | r = amdgpu_vce_get_destroy_msg(ring, 1, true, &fence); | 1119 | r = amdgpu_vce_get_destroy_msg(ring, 1, true, &fence); |
1122 | if (r) { | 1120 | if (r) |
1123 | DRM_ERROR("amdgpu: failed to get destroy ib (%ld).\n", r); | ||
1124 | goto error; | 1121 | goto error; |
1125 | } | ||
1126 | 1122 | ||
1127 | r = dma_fence_wait_timeout(fence, false, timeout); | 1123 | r = dma_fence_wait_timeout(fence, false, timeout); |
1128 | if (r == 0) { | 1124 | if (r == 0) |
1129 | DRM_ERROR("amdgpu: IB test timed out.\n"); | ||
1130 | r = -ETIMEDOUT; | 1125 | r = -ETIMEDOUT; |
1131 | } else if (r < 0) { | 1126 | else if (r > 0) |
1132 | DRM_ERROR("amdgpu: fence wait failed (%ld).\n", r); | ||
1133 | } else { | ||
1134 | DRM_DEBUG("ib test on ring %d succeeded\n", ring->idx); | ||
1135 | r = 0; | 1127 | r = 0; |
1136 | } | 1128 | |
1137 | error: | 1129 | error: |
1138 | dma_fence_put(fence); | 1130 | dma_fence_put(fence); |
1139 | return r; | 1131 | return r; |