diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/1700-drm-amdgpu-Adapt-new-invalidate_tlb-to-use-dma_fence.patch')
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/1700-drm-amdgpu-Adapt-new-invalidate_tlb-to-use-dma_fence.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/1700-drm-amdgpu-Adapt-new-invalidate_tlb-to-use-dma_fence.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/1700-drm-amdgpu-Adapt-new-invalidate_tlb-to-use-dma_fence.patch new file mode 100644 index 00000000..4396b7f4 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/1700-drm-amdgpu-Adapt-new-invalidate_tlb-to-use-dma_fence.patch @@ -0,0 +1,70 @@ +From 126ce1e5458295dae848c368d888a3a26fcd7a86 Mon Sep 17 00:00:00 2001 +From: Kent Russell <kent.russell@amd.com> +Date: Mon, 1 May 2017 09:39:41 -0400 +Subject: [PATCH 1700/4131] drm/amdgpu: Adapt new invalidate_tlb to use + dma_fences + +[4.11] Needed now that we're on drm_next + +Change-Id: I49ecc845088f4cd64af4750063827cfec861d20a +Signed-off-by: Kent Russell <kent.russell@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 6 +++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +index 7ca7f0a..ea11ac6 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +@@ -780,7 +780,7 @@ static void write_vmid_invalidate_request(struct kgd_dev *kgd, uint8_t vmid) + static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid) + { + signed long r; +- struct fence *f; ++ struct dma_fence *f; + struct amdgpu_ring *ring = &adev->gfx.kiq.ring; + struct amdgpu_kiq *kiq = &adev->gfx.kiq; + +@@ -794,10 +794,10 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid) + amdgpu_ring_commit(ring); + mutex_unlock(&adev->gfx.kiq.ring_mutex); + +- r = fence_wait(f, false); ++ r = dma_fence_wait(f, false); + if (r) + DRM_ERROR("wait for kiq fence error: %ld.\n", r); +- fence_put(f); ++ dma_fence_put(f); + + return r; + } +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +index 28ce042..99abdf3 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +@@ -959,7 +959,7 @@ static void write_vmid_invalidate_request(struct kgd_dev *kgd, uint8_t vmid) + static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid) + { + signed long r; +- struct fence *f; ++ struct dma_fence *f; + struct amdgpu_ring *ring = &adev->gfx.kiq.ring; + struct amdgpu_kiq *kiq = &adev->gfx.kiq; + +@@ -973,10 +973,10 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid) + amdgpu_ring_commit(ring); + mutex_unlock(&adev->gfx.kiq.ring_mutex); + +- r = fence_wait(f, false); ++ r = dma_fence_wait(f, false); + if (r) + DRM_ERROR("wait for kiq fence error: %ld.\n", r); +- fence_put(f); ++ dma_fence_put(f); + + return r; + } +-- +2.7.4 + |