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

drm/ttm: allow bulk moves for all domains 



Not just TT and VRAM.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Tested-by: default avatarBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Link: https://patchwork.freedesktop.org/patch/msgid/20220321132601.2161-3-christian.koenig@amd.com
parent 5d05b988

drivers/gpu/drm/ttm/ttm_resource.c

+15 −37
Original line number Diff line number Diff line
@@ -51,10 +51,11 @@ EXPORT_SYMBOL(ttm_lru_bulk_move_init); 
 */

void ttm_lru_bulk_move_tail(struct ttm_lru_bulk_move *bulk)

{

	unsigned i;

	unsigned i, j;



	for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) {

		struct ttm_lru_bulk_move_pos *pos = &bulk->tt[i];

	for (i = 0; i < TTM_NUM_MEM_TYPES; ++i) {

		for (j = 0; j < TTM_MAX_BO_PRIORITY; ++j) {

			struct ttm_lru_bulk_move_pos *pos = &bulk->pos[i][j];

			struct ttm_resource_manager *man;



			if (!pos->first)
@@ -64,25 +65,10 @@ void ttm_lru_bulk_move_tail(struct ttm_lru_bulk_move *bulk) 
			dma_resv_assert_held(pos->first->bo->base.resv);

			dma_resv_assert_held(pos->last->bo->base.resv);



		man = ttm_manager_type(pos->first->bo->bdev, TTM_PL_TT);

		list_bulk_move_tail(&man->lru[i], &pos->first->lru,

			man = ttm_manager_type(pos->first->bo->bdev, i);

			list_bulk_move_tail(&man->lru[j], &pos->first->lru,

					    &pos->last->lru);

		}



	for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) {

		struct ttm_lru_bulk_move_pos *pos = &bulk->vram[i];

		struct ttm_resource_manager *man;



		if (!pos->first)

			continue;



		lockdep_assert_held(&pos->first->bo->bdev->lru_lock);

		dma_resv_assert_held(pos->first->bo->base.resv);

		dma_resv_assert_held(pos->last->bo->base.resv);



		man = ttm_manager_type(pos->first->bo->bdev, TTM_PL_VRAM);

		list_bulk_move_tail(&man->lru[i], &pos->first->lru,

				    &pos->last->lru);

	}

}

EXPORT_SYMBOL(ttm_lru_bulk_move_tail);
@@ -122,15 +108,7 @@ void ttm_resource_move_to_lru_tail(struct ttm_resource *res, 
	if (!bulk)

		return;



	switch (res->mem_type) {

	case TTM_PL_TT:

		ttm_lru_bulk_move_set_pos(&bulk->tt[bo->priority], res);

		break;



	case TTM_PL_VRAM:

		ttm_lru_bulk_move_set_pos(&bulk->vram[bo->priority], res);

		break;

	}

	ttm_lru_bulk_move_set_pos(&bulk->pos[res->mem_type][bo->priority], res);

}



/**

include/drm/ttm/ttm_device.h

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
#include <drm/ttm/ttm_resource.h>

#include <drm/ttm/ttm_pool.h>



#define TTM_NUM_MEM_TYPES 8



struct ttm_device;

struct ttm_placement;

struct ttm_buffer_object;

include/drm/ttm/ttm_resource.h

+2 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <drm/ttm/ttm_kmap_iter.h>



#define TTM_MAX_BO_PRIORITY	4U

#define TTM_NUM_MEM_TYPES 8



struct ttm_device;

struct ttm_resource_manager;
@@ -222,8 +223,7 @@ struct ttm_lru_bulk_move_pos { 
 * ttm_lru_bulk_move_init() and ttm_bo_move_to_lru_tail().

 */

struct ttm_lru_bulk_move {

	struct ttm_lru_bulk_move_pos tt[TTM_MAX_BO_PRIORITY];

	struct ttm_lru_bulk_move_pos vram[TTM_MAX_BO_PRIORITY];

	struct ttm_lru_bulk_move_pos pos[TTM_NUM_MEM_TYPES][TTM_MAX_BO_PRIORITY];

};



/**