This is a note to let you know that I've just added the patch titled

drm/amdgpu: fix amdgpu_sync_resv v2

to the 4.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git%3Ba=su...

The filename of the patch is: drm-amdgpu-fix-amdgpu_sync_resv-v2.patch and it can be found in the queue-4.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let stable@vger.kernel.org know about it.

From foo@baz Fri Mar 16 15:11:08 CET 2018

From: "Christian König" christian.koenig@amd.com Date: Fri, 24 Nov 2017 11:41:52 +0100 Subject: drm/amdgpu: fix amdgpu_sync_resv v2

From: "Christian König" christian.koenig@amd.com

[ Upstream commit d4b7648d6d1774f961f3f6a758d9b009f1f34f05 ]

Fixes a bug introduced by AMDGPU_GEM_CREATE_EXPLICIT_SYNC. We still need to wait for pipelined moves in the shared fences list.

v2: fix typo

Signed-off-by: Christian König christian.koenig@amd.com Reviewed-by: Andres Rodriguez andresx7@gmail.com Signed-off-by: Alex Deucher alexander.deucher@amd.com Signed-off-by: Sasha Levin alexander.levin@microsoft.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c @@ -191,9 +191,6 @@ int amdgpu_sync_resv(struct amdgpu_devic f = reservation_object_get_excl(resv); r = amdgpu_sync_fence(adev, sync, f);

- if (explicit_sync) - return r; - flist = reservation_object_get_list(resv); if (!flist || r) return r; @@ -212,11 +209,11 @@ int amdgpu_sync_resv(struct amdgpu_devic (fence_owner == AMDGPU_FENCE_OWNER_VM))) continue;

- /* Ignore fence from the same owner as + /* Ignore fence from the same owner and explicit one as * long as it isn't undefined. */ if (owner != AMDGPU_FENCE_OWNER_UNDEFINED && - fence_owner == owner) + (fence_owner == owner || explicit_sync)) continue; }

Patches currently in stable-queue which might be from christian.koenig@amd.com are

queue-4.15/drm-amdgpu-fix-random-missing-of-flr-notify.patch queue-4.15/drm-amdgpu-fix-amdgpu_sync_resv-v2.patch queue-4.15/dma-buf-fence-fix-lock-inversion-within-dma-fence-array.patch queue-4.15/drm-edid-set-eld-connector-type-in-drm_edid_to_eld.patch