diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1670-drm-amdkfd-fit-new-kiq-ring-lock-structure-depend-on.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1670-drm-amdkfd-fit-new-kiq-ring-lock-structure-depend-on.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1670-drm-amdkfd-fit-new-kiq-ring-lock-structure-depend-on.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1670-drm-amdkfd-fit-new-kiq-ring-lock-structure-depend-on.patch new file mode 100644 index 00000000..5772d872 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1670-drm-amdkfd-fit-new-kiq-ring-lock-structure-depend-on.patch @@ -0,0 +1,65 @@ +From d4302d3334a629ae4b0b086164838c5a8fa8fcd1 Mon Sep 17 00:00:00 2001 +From: Evan Quan <evan.quan@amd.com> +Date: Tue, 2 May 2017 12:52:04 +0800 +Subject: [PATCH 1670/4131] drm/amdkfd: fit new kiq ring lock structure - + depend on the commit: d59fbdf Move kiq ring lock out of virt structure + +Change-Id: I9b6cb3b7b07b5c2c44e292240b76ab73f4f1f694 +Signed-off-by: Evan Quan <evan.quan@amd.com> +Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 5 +++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 5 +++-- + 2 files changed, 6 insertions(+), 4 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 4cc8052..122bc64 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +@@ -771,8 +771,9 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid) + signed long r; + struct fence *f; + struct amdgpu_ring *ring = &adev->gfx.kiq.ring; ++ struct amdgpu_kiq *kiq = &adev->gfx.kiq; + +- mutex_lock(&adev->virt.lock_kiq); ++ mutex_lock(&kiq->ring_mutex); + amdgpu_ring_alloc(ring, 12); /* fence + invalidate_tlbs package*/ + amdgpu_ring_write(ring, PACKET3(PACKET3_INVALIDATE_TLBS, 0)); + amdgpu_ring_write(ring, +@@ -780,7 +781,7 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid) + PACKET3_INVALIDATE_TLBS_PASID(pasid)); + amdgpu_fence_emit(ring, &f); + amdgpu_ring_commit(ring); +- mutex_unlock(&adev->virt.lock_kiq); ++ mutex_unlock(&kiq->ring_mutex); + + r = fence_wait(f, false); + if (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 340f0524..fc72b49 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +@@ -951,8 +951,9 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid) + signed long r; + struct fence *f; + struct amdgpu_ring *ring = &adev->gfx.kiq.ring; ++ struct amdgpu_kiq *kiq = &adev->gfx.kiq; + +- mutex_lock(&adev->virt.lock_kiq); ++ mutex_lock(&kiq->ring_mutex); + amdgpu_ring_alloc(ring, 12); /* fence + invalidate_tlbs package*/ + amdgpu_ring_write(ring, PACKET3(PACKET3_INVALIDATE_TLBS, 0)); + amdgpu_ring_write(ring, +@@ -960,7 +961,7 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid) + PACKET3_INVALIDATE_TLBS_PASID(pasid)); + amdgpu_fence_emit(ring, &f); + amdgpu_ring_commit(ring); +- mutex_unlock(&adev->virt.lock_kiq); ++ mutex_unlock(&kiq->ring_mutex); + + r = fence_wait(f, false); + if (r) +-- +2.7.4 + |