From dd32db53b98d93cfc61e85392ec29600311439e5 Mon Sep 17 00:00:00 2001 From: Evan Quan Date: Thu, 11 May 2017 09:14:08 +0800 Subject: [PATCH 1687/4131] drm/amdkfd: imported the change brought by kfd merge commit c94f9eb Change-Id: If11b5ec3b47f9275ae4321b66711a9776a8f8ed8 Signed-off-by: Evan Quan --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 4 ++-- 2 files changed, 4 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 122bc64..b07c26f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c @@ -773,7 +773,7 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid) struct amdgpu_ring *ring = &adev->gfx.kiq.ring; struct amdgpu_kiq *kiq = &adev->gfx.kiq; - mutex_lock(&kiq->ring_mutex); + mutex_lock(&adev->gfx.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, @@ -781,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(&kiq->ring_mutex); + mutex_unlock(&adev->gfx.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 7240048..e315dc7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c @@ -953,7 +953,7 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid) struct amdgpu_ring *ring = &adev->gfx.kiq.ring; struct amdgpu_kiq *kiq = &adev->gfx.kiq; - mutex_lock(&kiq->ring_mutex); + mutex_lock(&adev->gfx.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, @@ -961,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(&kiq->ring_mutex); + mutex_unlock(&adev->gfx.kiq.ring_mutex); r = fence_wait(f, false); if (r) -- 2.7.4