aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
diff options
context:
space:
mode:
authorChunming Zhou <david1.zhou@amd.com>2015-08-03 01:11:04 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-08-17 16:50:51 -0400
commit0e3f154a9eb9f7a5ec365c4586a606ba882a3f15 (patch)
tree00e8c0f2ad43e943005e7f47ecb4392909fb48fe /drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
parentbb1e38a4bead5025ecca90544f0f733f59996b13 (diff)
drm/amdgpu: change uvd ib test to use kernel fence directly
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.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
index df202999fbfe..567c5b3c6f3a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
@@ -244,17 +244,19 @@ static int amdgpu_test_create_and_emit_fence(struct amdgpu_device *adev,
244 int r; 244 int r;
245 245
246 if (ring == &adev->uvd.ring) { 246 if (ring == &adev->uvd.ring) {
247 struct fence *f = NULL;
247 r = amdgpu_uvd_get_create_msg(ring, handle, NULL); 248 r = amdgpu_uvd_get_create_msg(ring, handle, NULL);
248 if (r) { 249 if (r) {
249 DRM_ERROR("Failed to get dummy create msg\n"); 250 DRM_ERROR("Failed to get dummy create msg\n");
250 return r; 251 return r;
251 } 252 }
252 253
253 r = amdgpu_uvd_get_destroy_msg(ring, handle, fence); 254 r = amdgpu_uvd_get_destroy_msg(ring, handle, &f);
254 if (r) { 255 if (r) {
255 DRM_ERROR("Failed to get dummy destroy msg\n"); 256 DRM_ERROR("Failed to get dummy destroy msg\n");
256 return r; 257 return r;
257 } 258 }
259 *fence = to_amdgpu_fence(f);
258 260
259 } else if (ring == &adev->vce.ring[0] || 261 } else if (ring == &adev->vce.ring[0] ||
260 ring == &adev->vce.ring[1]) { 262 ring == &adev->vce.ring[1]) {