Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb1aacae authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'ttm_pfn' of git://people.freedesktop.org/~deathsimple/linux into drm-next 

pull in placement changes radeon requires.

* 'ttm_pfn' of git://people.freedesktop.org/~deathsimple/linux:
  drm/ttm: move fpfn and lpfn into each placement v2
parents 484048db f1217ed0

drivers/gpu/drm/ast/ast_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ struct ast_bo { 
	struct ttm_placement placement;

	struct ttm_bo_kmap_obj kmap;

	struct drm_gem_object gem;

	u32 placements[3];

	struct ttm_place placements[3];

	int pin_count;

};

#define gem_to_ast_bo(gobj) container_of((gobj), struct ast_bo, gem)

drivers/gpu/drm/ast/ast_ttm.c

+12 −8
Original line number Diff line number Diff line
@@ -293,18 +293,22 @@ void ast_mm_fini(struct ast_private *ast) 
void ast_ttm_placement(struct ast_bo *bo, int domain)

{

	u32 c = 0;

	bo->placement.fpfn = 0;

	bo->placement.lpfn = 0;

	unsigned i;



	bo->placement.placement = bo->placements;

	bo->placement.busy_placement = bo->placements;

	if (domain & TTM_PL_FLAG_VRAM)

		bo->placements[c++] = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM;

		bo->placements[c++].flags = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM;

	if (domain & TTM_PL_FLAG_SYSTEM)

		bo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;

		bo->placements[c++].flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;

	if (!c)

		bo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;

		bo->placements[c++].flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;

	bo->placement.num_placement = c;

	bo->placement.num_busy_placement = c;

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

		bo->placements[i].fpfn = 0;

		bo->placements[i].lpfn = 0;

	}

}



int ast_bo_create(struct drm_device *dev, int size, int align,
@@ -360,7 +364,7 @@ int ast_bo_pin(struct ast_bo *bo, u32 pl_flag, u64 *gpu_addr) 


	ast_ttm_placement(bo, pl_flag);

	for (i = 0; i < bo->placement.num_placement; i++)

		bo->placements[i] |= TTM_PL_FLAG_NO_EVICT;

		bo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT;

	ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);

	if (ret)

		return ret;
@@ -383,7 +387,7 @@ int ast_bo_unpin(struct ast_bo *bo) 
		return 0;



	for (i = 0; i < bo->placement.num_placement ; i++)

		bo->placements[i] &= ~TTM_PL_FLAG_NO_EVICT;

		bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT;

	ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);

	if (ret)

		return ret;
@@ -407,7 +411,7 @@ int ast_bo_push_sysram(struct ast_bo *bo) 


	ast_ttm_placement(bo, TTM_PL_FLAG_SYSTEM);

	for (i = 0; i < bo->placement.num_placement ; i++)

		bo->placements[i] |= TTM_PL_FLAG_NO_EVICT;

		bo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT;



	ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);

	if (ret) {

drivers/gpu/drm/bochs/bochs.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ struct bochs_bo { 
	struct ttm_placement placement;

	struct ttm_bo_kmap_obj kmap;

	struct drm_gem_object gem;

	u32 placements[3];

	struct ttm_place placements[3];

	int pin_count;

};

drivers/gpu/drm/bochs/bochs_mm.c

+13 −7
Original line number Diff line number Diff line
@@ -257,20 +257,26 @@ void bochs_mm_fini(struct bochs_device *bochs) 


static void bochs_ttm_placement(struct bochs_bo *bo, int domain)

{

	unsigned i;

	u32 c = 0;

	bo->placement.fpfn = 0;

	bo->placement.lpfn = 0;

	bo->placement.placement = bo->placements;

	bo->placement.busy_placement = bo->placements;

	if (domain & TTM_PL_FLAG_VRAM) {

		bo->placements[c++] = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED

		bo->placements[c++].flags = TTM_PL_FLAG_WC

			| TTM_PL_FLAG_UNCACHED

			| TTM_PL_FLAG_VRAM;

	}

	if (domain & TTM_PL_FLAG_SYSTEM) {

		bo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;

		bo->placements[c++].flags = TTM_PL_MASK_CACHING

			| TTM_PL_FLAG_SYSTEM;

	}

	if (!c) {

		bo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;

		bo->placements[c++].flags = TTM_PL_MASK_CACHING

			| TTM_PL_FLAG_SYSTEM;

	}

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

		bo->placements[i].fpfn = 0;

		bo->placements[i].lpfn = 0;

	}

	bo->placement.num_placement = c;

	bo->placement.num_busy_placement = c;
@@ -294,7 +300,7 @@ int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag, u64 *gpu_addr) 


	bochs_ttm_placement(bo, pl_flag);

	for (i = 0; i < bo->placement.num_placement; i++)

		bo->placements[i] |= TTM_PL_FLAG_NO_EVICT;

		bo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT;

	ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);

	if (ret)

		return ret;
@@ -319,7 +325,7 @@ int bochs_bo_unpin(struct bochs_bo *bo) 
		return 0;



	for (i = 0; i < bo->placement.num_placement; i++)

		bo->placements[i] &= ~TTM_PL_FLAG_NO_EVICT;

		bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT;

	ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);

	if (ret)

		return ret;

drivers/gpu/drm/cirrus/cirrus_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ struct cirrus_bo { 
	struct ttm_placement placement;

	struct ttm_bo_kmap_obj kmap;

	struct drm_gem_object gem;

	u32 placements[3];

	struct ttm_place placements[3];

	int pin_count;

};

#define gem_to_cirrus_bo(gobj) container_of((gobj), struct cirrus_bo, gem)