Commit 05f8d250 authored by Christian König's avatar Christian König
Browse files

drm/ttm: move swapin out of page alloc backend 



This is not related to allocating the backing store in any way.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/396947/
parent d1cb1f25

drivers/gpu/drm/ttm/ttm_page_alloc.c

+0 −8
Original line number Diff line number Diff line
@@ -1071,14 +1071,6 @@ int ttm_pool_populate(struct ttm_tt *ttm, struct ttm_operation_ctx *ctx) 
		}

	}



	if (unlikely(ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)) {

		ret = ttm_tt_swapin(ttm);

		if (unlikely(ret != 0)) {

			ttm_pool_unpopulate(ttm);

			return ret;

		}

	}



	return 0;

}

EXPORT_SYMBOL(ttm_pool_populate);

drivers/gpu/drm/ttm/ttm_page_alloc_dma.c

+0 −8
Original line number Diff line number Diff line
@@ -975,14 +975,6 @@ skip_huge: 
		--num_pages;

	}



	if (unlikely(ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)) {

		ret = ttm_tt_swapin(ttm);

		if (unlikely(ret != 0)) {

			ttm_dma_unpopulate(ttm_dma, dev);

			return ret;

		}

	}



	return 0;

}

EXPORT_SYMBOL_GPL(ttm_dma_populate);

drivers/gpu/drm/ttm/ttm_tt.c

+8 −0
Original line number Diff line number Diff line
@@ -338,6 +338,14 @@ int ttm_tt_populate(struct ttm_bo_device *bdev, 


	ttm_tt_add_mapping(bdev, ttm);

	ttm->page_flags |= TTM_PAGE_FLAG_PRIV_POPULATED;

	if (unlikely(ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)) {

		ret = ttm_tt_swapin(ttm);

		if (unlikely(ret != 0)) {

			ttm_tt_unpopulate(bdev, ttm);

			return ret;

		}

	}



	return 0;

}

EXPORT_SYMBOL(ttm_tt_populate);

CRA Git | Maintained and supported by SUSTech CRA and CCSE