diff options
author | Chunming Zhou <david1.zhou@amd.com> | 2015-08-03 01:28:16 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-08-17 16:50:52 -0400 |
commit | ed40bfb81af54fcdc1b96ffdeb14d69458234642 (patch) | |
tree | 6bc587cdfa283a0d35c892da1b713a8bb729c629 /drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | |
parent | 0e3f154a9eb9f7a5ec365c4586a606ba882a3f15 (diff) |
drm/amdgpu: use kernel fence for vce ib test
Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Christian K?nig <christian.koenig@amd.com>
Reviewed-by: Jammy Zhou <jammy.zhou@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_test.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c index 567c5b3c6f3a..251b1ebef722 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | |||
@@ -260,18 +260,19 @@ static int amdgpu_test_create_and_emit_fence(struct amdgpu_device *adev, | |||
260 | 260 | ||
261 | } else if (ring == &adev->vce.ring[0] || | 261 | } else if (ring == &adev->vce.ring[0] || |
262 | ring == &adev->vce.ring[1]) { | 262 | ring == &adev->vce.ring[1]) { |
263 | struct fence *f = NULL; | ||
263 | r = amdgpu_vce_get_create_msg(ring, handle, NULL); | 264 | r = amdgpu_vce_get_create_msg(ring, handle, NULL); |
264 | if (r) { | 265 | if (r) { |
265 | DRM_ERROR("Failed to get dummy create msg\n"); | 266 | DRM_ERROR("Failed to get dummy create msg\n"); |
266 | return r; | 267 | return r; |
267 | } | 268 | } |
268 | 269 | ||
269 | r = amdgpu_vce_get_destroy_msg(ring, handle, fence); | 270 | r = amdgpu_vce_get_destroy_msg(ring, handle, &f); |
270 | if (r) { | 271 | if (r) { |
271 | DRM_ERROR("Failed to get dummy destroy msg\n"); | 272 | DRM_ERROR("Failed to get dummy destroy msg\n"); |
272 | return r; | 273 | return r; |
273 | } | 274 | } |
274 | 275 | *fence = to_amdgpu_fence(f); | |
275 | } else { | 276 | } else { |
276 | r = amdgpu_ring_lock(ring, 64); | 277 | r = amdgpu_ring_lock(ring, 64); |
277 | if (r) { | 278 | if (r) { |