Commit 4b41726a authored by Christian König's avatar Christian König
Browse files

drm/radeon: wait for moving fence after pinning 



We actually need to wait for the moving fence after pinning
the BO to make sure that the pin is completed.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
References: https://lore.kernel.org/dri-devel/20210621151758.2347474-1-daniel.vetter@ffwll.ch/
CC: stable@kernel.org
Link: https://patchwork.freedesktop.org/patch/msgid/20210622114506.106349-2-christian.koenig@amd.com
parent 17b11f71

drivers/gpu/drm/radeon/radeon_prime.c

+13 −3
Original line number Diff line number Diff line
@@ -77,9 +77,19 @@ int radeon_gem_prime_pin(struct drm_gem_object *obj) 


	/* pin buffer into GTT */

	ret = radeon_bo_pin(bo, RADEON_GEM_DOMAIN_GTT, NULL);

	if (likely(ret == 0))

		bo->prime_shared_count++;

	if (unlikely(ret))

		goto error;



	if (bo->tbo.moving) {

		ret = dma_fence_wait(bo->tbo.moving, false);

		if (unlikely(ret)) {

			radeon_bo_unpin(bo);

			goto error;

		}

	}



	bo->prime_shared_count++;

error:

	radeon_bo_unreserve(bo);

	return ret;

}