diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0417-drm-amdgpu-use-kernel-fence-for-vce-ib-test.patch')
-rw-r--r-- | common/recipes-kernel/linux/files/0417-drm-amdgpu-use-kernel-fence-for-vce-ib-test.patch | 124 |
1 files changed, 0 insertions, 124 deletions
diff --git a/common/recipes-kernel/linux/files/0417-drm-amdgpu-use-kernel-fence-for-vce-ib-test.patch b/common/recipes-kernel/linux/files/0417-drm-amdgpu-use-kernel-fence-for-vce-ib-test.patch deleted file mode 100644 index 32f7e89e..00000000 --- a/common/recipes-kernel/linux/files/0417-drm-amdgpu-use-kernel-fence-for-vce-ib-test.patch +++ /dev/null @@ -1,124 +0,0 @@ -From ed40bfb81af54fcdc1b96ffdeb14d69458234642 Mon Sep 17 00:00:00 2001 -From: Chunming Zhou <david1.zhou@amd.com> -Date: Mon, 3 Aug 2015 13:28:16 +0800 -Subject: [PATCH 0417/1050] 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> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 5 +++-- - drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 14 +++++++------- - drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 4 ++-- - 3 files changed, 12 insertions(+), 11 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c -index 567c5b3..251b1eb 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, - - } else if (ring == &adev->vce.ring[0] || - ring == &adev->vce.ring[1]) { -+ struct fence *f = NULL; - r = amdgpu_vce_get_create_msg(ring, handle, NULL); - if (r) { - DRM_ERROR("Failed to get dummy create msg\n"); - return r; - } - -- r = amdgpu_vce_get_destroy_msg(ring, handle, fence); -+ r = amdgpu_vce_get_destroy_msg(ring, handle, &f); - if (r) { - DRM_ERROR("Failed to get dummy destroy msg\n"); - return r; - } -- -+ *fence = to_amdgpu_fence(f); - } else { - r = amdgpu_ring_lock(ring, 64); - if (r) { -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c -index 59acb0b..94c40ca 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c -@@ -358,7 +358,7 @@ static int amdgpu_vce_free_job( - * Open up a stream for HW test - */ - int amdgpu_vce_get_create_msg(struct amdgpu_ring *ring, uint32_t handle, -- struct amdgpu_fence **fence) -+ struct fence **fence) - { - const unsigned ib_size_dw = 1024; - struct amdgpu_ib *ib = NULL; -@@ -412,7 +412,7 @@ int amdgpu_vce_get_create_msg(struct amdgpu_ring *ring, uint32_t handle, - if (r) - goto err; - if (fence) -- *fence = amdgpu_fence_ref(ib->fence); -+ *fence = fence_get(&ib->fence->base); - if (amdgpu_enable_scheduler) - return 0; - err: -@@ -432,7 +432,7 @@ err: - * Close up a stream for HW test or if userspace failed to do so - */ - int amdgpu_vce_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle, -- struct amdgpu_fence **fence) -+ struct fence **fence) - { - const unsigned ib_size_dw = 1024; - struct amdgpu_ib *ib = NULL; -@@ -476,7 +476,7 @@ int amdgpu_vce_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle, - if (r) - goto err; - if (fence) -- *fence = amdgpu_fence_ref(ib->fence); -+ *fence = fence_get(&ib->fence->base); - if (amdgpu_enable_scheduler) - return 0; - err: -@@ -827,7 +827,7 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring) - */ - int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring) - { -- struct amdgpu_fence *fence = NULL; -+ struct fence *fence = NULL; - int r; - - r = amdgpu_vce_get_create_msg(ring, 1, NULL); -@@ -842,13 +842,13 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring) - goto error; - } - -- r = amdgpu_fence_wait(fence, false); -+ r = fence_wait(fence, false); - if (r) { - DRM_ERROR("amdgpu: fence wait failed (%d).\n", r); - } else { - DRM_INFO("ib test on ring %d succeeded\n", ring->idx); - } - error: -- amdgpu_fence_unref(&fence); -+ fence_put(fence); - return r; - } -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h -index 7ccdb59..ba2da8e 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h -@@ -29,9 +29,9 @@ int amdgpu_vce_sw_fini(struct amdgpu_device *adev); - int amdgpu_vce_suspend(struct amdgpu_device *adev); - int amdgpu_vce_resume(struct amdgpu_device *adev); - int amdgpu_vce_get_create_msg(struct amdgpu_ring *ring, uint32_t handle, -- struct amdgpu_fence **fence); -+ struct fence **fence); - int amdgpu_vce_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle, -- struct amdgpu_fence **fence); -+ struct fence **fence); - void amdgpu_vce_free_handles(struct amdgpu_device *adev, struct drm_file *filp); - int amdgpu_vce_ring_parse_cs(struct amdgpu_cs_parser *p, uint32_t ib_idx); - bool amdgpu_vce_ring_emit_semaphore(struct amdgpu_ring *ring, --- -1.9.1 - |