Commit 2eb557d2 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2021-12-09' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



A fix in syncobj to handle fence already signalled better, and a fix for
a ttm_bo_swapout eviction check.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20211209124305.gxhid5zwf7m4oasn@houat
parents 0fcfb00b b19926d4

drivers/gpu/drm/drm_syncobj.c

+10 −1
Original line number Diff line number Diff line
@@ -404,8 +404,17 @@ int drm_syncobj_find_fence(struct drm_file *file_private, 


	if (*fence) {

		ret = dma_fence_chain_find_seqno(fence, point);

		if (!ret)

		if (!ret) {

			/* If the requested seqno is already signaled

			 * drm_syncobj_find_fence may return a NULL

			 * fence. To make sure the recipient gets

			 * signalled, use a new fence instead.

			 */

			if (!*fence)

				*fence = dma_fence_get_stub();



			goto out;

		}

		dma_fence_put(*fence);

	} else {

		ret = -EINVAL;

drivers/gpu/drm/ttm/ttm_bo.c

+2 −1
Original line number Diff line number Diff line
@@ -1103,7 +1103,7 @@ int ttm_bo_swapout(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx, 
	 * as an indication that we're about to swap out.

	 */

	memset(&place, 0, sizeof(place));

	place.mem_type = TTM_PL_SYSTEM;

	place.mem_type = bo->resource->mem_type;

	if (!ttm_bo_evict_swapout_allowable(bo, ctx, &place, &locked, NULL))

		return -EBUSY;
@@ -1135,6 +1135,7 @@ int ttm_bo_swapout(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx, 
		struct ttm_place hop;



		memset(&hop, 0, sizeof(hop));

		place.mem_type = TTM_PL_SYSTEM;

		ret = ttm_resource_alloc(bo, &place, &evict_mem);

		if (unlikely(ret))

			goto out;