diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0416-drm-amdgpu-change-uvd-ib-test-to-use-kernel-fence-di.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0416-drm-amdgpu-change-uvd-ib-test-to-use-kernel-fence-di.patch | 212 |
1 files changed, 0 insertions, 212 deletions
diff --git a/common/recipes-kernel/linux/files/0416-drm-amdgpu-change-uvd-ib-test-to-use-kernel-fence-di.patch b/common/recipes-kernel/linux/files/0416-drm-amdgpu-change-uvd-ib-test-to-use-kernel-fence-di.patch deleted file mode 100644 index 40848dc0..00000000 --- a/common/recipes-kernel/linux/files/0416-drm-amdgpu-change-uvd-ib-test-to-use-kernel-fence-di.patch +++ /dev/null @@ -1,212 +0,0 @@ -From 0e3f154a9eb9f7a5ec365c4586a606ba882a3f15 Mon Sep 17 00:00:00 2001 -From: Chunming Zhou <david1.zhou@amd.com> -Date: Mon, 3 Aug 2015 13:11:04 +0800 -Subject: [PATCH 0416/1050] 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> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 4 +++- - drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 14 +++++++------- - drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 4 ++-- - drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 6 +++--- - drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 6 +++--- - drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 6 +++--- - 6 files changed, 21 insertions(+), 19 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c -index df20299..567c5b3 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, - int r; - - if (ring == &adev->uvd.ring) { -+ struct fence *f = NULL; - r = amdgpu_uvd_get_create_msg(ring, handle, NULL); - if (r) { - DRM_ERROR("Failed to get dummy create msg\n"); - return r; - } - -- r = amdgpu_uvd_get_destroy_msg(ring, handle, fence); -+ r = amdgpu_uvd_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 if (ring == &adev->vce.ring[0] || - ring == &adev->vce.ring[1]) { -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c -index c1be7db..9b27305 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c -@@ -288,7 +288,7 @@ void amdgpu_uvd_free_handles(struct amdgpu_device *adev, struct drm_file *filp) - for (i = 0; i < AMDGPU_MAX_UVD_HANDLES; ++i) { - uint32_t handle = atomic_read(&adev->uvd.handles[i]); - if (handle != 0 && adev->uvd.filp[i] == filp) { -- struct amdgpu_fence *fence; -+ struct fence *fence; - - amdgpu_uvd_note_usage(adev); - -@@ -298,8 +298,8 @@ void amdgpu_uvd_free_handles(struct amdgpu_device *adev, struct drm_file *filp) - continue; - } - -- amdgpu_fence_wait(fence, false); -- amdgpu_fence_unref(&fence); -+ fence_wait(fence, false); -+ fence_put(fence); - - adev->uvd.filp[i] = NULL; - atomic_set(&adev->uvd.handles[i], 0); -@@ -819,7 +819,7 @@ static int amdgpu_uvd_free_job( - - static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, - struct amdgpu_bo *bo, -- struct amdgpu_fence **fence) -+ struct fence **fence) - { - struct ttm_validate_buffer tv; - struct ww_acquire_ctx ticket; -@@ -876,7 +876,7 @@ static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, - ttm_eu_fence_buffer_objects(&ticket, &head, &ib->fence->base); - - if (fence) -- *fence = amdgpu_fence_ref(ib->fence); -+ *fence = fence_get(&ib->fence->base); - amdgpu_bo_unref(&bo); - - if (amdgpu_enable_scheduler) -@@ -898,7 +898,7 @@ err: - crash the vcpu so just try to emmit a dummy create/destroy msg to - avoid this */ - int amdgpu_uvd_get_create_msg(struct amdgpu_ring *ring, uint32_t handle, -- struct amdgpu_fence **fence) -+ struct fence **fence) - { - struct amdgpu_device *adev = ring->adev; - struct amdgpu_bo *bo; -@@ -945,7 +945,7 @@ int amdgpu_uvd_get_create_msg(struct amdgpu_ring *ring, uint32_t handle, - } - - int amdgpu_uvd_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle, -- struct amdgpu_fence **fence) -+ struct fence **fence) - { - struct amdgpu_device *adev = ring->adev; - struct amdgpu_bo *bo; -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h -index 2255aa7..1724c2c 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h -@@ -29,9 +29,9 @@ int amdgpu_uvd_sw_fini(struct amdgpu_device *adev); - int amdgpu_uvd_suspend(struct amdgpu_device *adev); - int amdgpu_uvd_resume(struct amdgpu_device *adev); - int amdgpu_uvd_get_create_msg(struct amdgpu_ring *ring, uint32_t handle, -- struct amdgpu_fence **fence); -+ struct fence **fence); - int amdgpu_uvd_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle, -- struct amdgpu_fence **fence); -+ struct fence **fence); - void amdgpu_uvd_free_handles(struct amdgpu_device *adev, - struct drm_file *filp); - int amdgpu_uvd_ring_parse_cs(struct amdgpu_cs_parser *parser, uint32_t ib_idx); -diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c -index 4efd671..9ac383b 100644 ---- a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c -+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c -@@ -534,7 +534,7 @@ static void uvd_v4_2_ring_emit_ib(struct amdgpu_ring *ring, - static int uvd_v4_2_ring_test_ib(struct amdgpu_ring *ring) - { - struct amdgpu_device *adev = ring->adev; -- struct amdgpu_fence *fence = NULL; -+ struct fence *fence = NULL; - int r; - - r = amdgpu_asic_set_uvd_clocks(adev, 53300, 40000); -@@ -555,14 +555,14 @@ static int uvd_v4_2_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); - goto error; - } - DRM_INFO("ib test on ring %d succeeded\n", ring->idx); - error: -- amdgpu_fence_unref(&fence); -+ fence_put(fence); - amdgpu_asic_set_uvd_clocks(adev, 0, 0); - return r; - } -diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c -index b756bd9..de4b3f5 100644 ---- a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c -@@ -580,7 +580,7 @@ static void uvd_v5_0_ring_emit_ib(struct amdgpu_ring *ring, - static int uvd_v5_0_ring_test_ib(struct amdgpu_ring *ring) - { - struct amdgpu_device *adev = ring->adev; -- struct amdgpu_fence *fence = NULL; -+ struct fence *fence = NULL; - int r; - - r = amdgpu_asic_set_uvd_clocks(adev, 53300, 40000); -@@ -601,14 +601,14 @@ static int uvd_v5_0_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); - goto error; - } - DRM_INFO("ib test on ring %d succeeded\n", ring->idx); - error: -- amdgpu_fence_unref(&fence); -+ fence_put(fence); - amdgpu_asic_set_uvd_clocks(adev, 0, 0); - return r; - } -diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c -index 49aa931..66c9758 100644 ---- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c -@@ -575,7 +575,7 @@ static void uvd_v6_0_ring_emit_ib(struct amdgpu_ring *ring, - */ - static int uvd_v6_0_ring_test_ib(struct amdgpu_ring *ring) - { -- struct amdgpu_fence *fence = NULL; -+ struct fence *fence = NULL; - int r; - - r = amdgpu_uvd_get_create_msg(ring, 1, NULL); -@@ -590,14 +590,14 @@ static int uvd_v6_0_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); - goto error; - } - DRM_INFO("ib test on ring %d succeeded\n", ring->idx); - error: -- amdgpu_fence_unref(&fence); -+ fence_put(fence); - return r; - } - --- -1.9.1 - |