diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0420-drm-amdgpu-use-kernel-fence-for-sdma-ib-test.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0420-drm-amdgpu-use-kernel-fence-for-sdma-ib-test.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0420-drm-amdgpu-use-kernel-fence-for-sdma-ib-test.patch b/common/recipes-kernel/linux/files/0420-drm-amdgpu-use-kernel-fence-for-sdma-ib-test.patch new file mode 100644 index 00000000..56f03b10 --- /dev/null +++ b/common/recipes-kernel/linux/files/0420-drm-amdgpu-use-kernel-fence-for-sdma-ib-test.patch @@ -0,0 +1,56 @@ +From ed88a0ee7ff53c292350fc5d38eae161c2372d51 Mon Sep 17 00:00:00 2001 +From: Chunming Zhou <david1.zhou@amd.com> +Date: Mon, 3 Aug 2015 13:22:35 +0800 +Subject: [PATCH 0420/1050] drm/amdgpu: use kernel fence for sdma 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/cik_sdma.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c +index 6e8642b..115b770 100644 +--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c ++++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c +@@ -646,7 +646,7 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring) + if (r) + goto err1; + +- r = amdgpu_fence_wait(ib.fence, false); ++ r = fence_wait(&ib.fence->base, false); + if (r) { + DRM_ERROR("amdgpu: fence wait failed (%d).\n", r); + goto err1; +diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +index 5511a19..2b7ce93 100644 +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +@@ -710,7 +710,7 @@ static int sdma_v2_4_ring_test_ib(struct amdgpu_ring *ring) + if (r) + goto err1; + +- r = amdgpu_fence_wait(ib.fence, false); ++ r = fence_wait(&ib.fence->base, false); + if (r) { + DRM_ERROR("amdgpu: fence wait failed (%d).\n", r); + goto err1; +diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +index 679ea9c..cba45e6 100644 +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +@@ -831,7 +831,7 @@ static int sdma_v3_0_ring_test_ib(struct amdgpu_ring *ring) + if (r) + goto err1; + +- r = amdgpu_fence_wait(ib.fence, false); ++ r = fence_wait(&ib.fence->base, false); + if (r) { + DRM_ERROR("amdgpu: fence wait failed (%d).\n", r); + goto err1; +-- +1.9.1 + |