Commit 0d9a9509 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: grab an additional reference on the gang fence v2 



We keep the gang submission fence around in adev, make sure that it
stays alive.

v2: fix memory leak on retry

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarSrinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6c11d4a8

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+9 −1
Original line number Diff line number Diff line
@@ -6913,18 +6913,26 @@ struct dma_fence *amdgpu_device_switch_gang(struct amdgpu_device *adev, 
{

	struct dma_fence *old = NULL;



	dma_fence_get(gang);

	do {

		dma_fence_put(old);

		old = amdgpu_device_get_gang(adev);

		if (old == gang)

			break;



		if (!dma_fence_is_signaled(old))

		if (!dma_fence_is_signaled(old)) {

			dma_fence_put(gang);

			return old;

		}



	} while (cmpxchg((struct dma_fence __force **)&adev->gang_submit,

			 old, gang) != old);



	/*

	 * Drop it once for the exchanged reference in adev and once for the

	 * thread local reference acquired in amdgpu_device_get_gang().

	 */

	dma_fence_put(old);

	dma_fence_put(old);

	return NULL;

}