Commit d395fb19 authored by Arunpravin Paneer Selvam's avatar Arunpravin Paneer Selvam Committed by Christian König
Browse files

Revert "drm/amdgpu: move internal vram_mgr function into the C file" 



This reverts commit 708d19d9.

This is part of a revert of the following commits:
commit 708d19d9 ("drm/amdgpu: move internal vram_mgr function into the C file")
commit 5e3f1e77 ("drm/amdgpu: fix start calculation in amdgpu_vram_mgr_new")
commit c9cad937 ("drm/amdgpu: add drm buddy support to amdgpu")

[WHY]
Few users reported garbaged graphics as soon as x starts,
reverting until this can be resolved.

Signed-off-by: default avatarArunpravin Paneer Selvam <Arunpravin.PaneerSelvam@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220708093047.492662-1-Arunpravin.PaneerSelvam@amd.com
parent 006f3b2f

drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c

+0 −29
Original line number Diff line number Diff line
@@ -50,35 +50,6 @@ to_amdgpu_device(struct amdgpu_vram_mgr *mgr) 
	return container_of(mgr, struct amdgpu_device, mman.vram_mgr);

}



static inline struct drm_buddy_block *

amdgpu_vram_mgr_first_block(struct list_head *list)

{

	return list_first_entry_or_null(list, struct drm_buddy_block, link);

}



static inline bool amdgpu_is_vram_mgr_blocks_contiguous(struct list_head *head)

{

	struct drm_buddy_block *block;

	u64 start, size;



	block = amdgpu_vram_mgr_first_block(head);

	if (!block)

		return false;



	while (head != block->link.next) {

		start = amdgpu_vram_mgr_block_start(block);

		size = amdgpu_vram_mgr_block_size(block);



		block = list_entry(block->link.next, struct drm_buddy_block, link);

		if (start + size != amdgpu_vram_mgr_block_start(block))

			return false;

	}



	return true;

}







/**

 * DOC: mem_info_vram_total

 *

drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h

+27 −0
Original line number Diff line number Diff line
@@ -53,6 +53,33 @@ static inline u64 amdgpu_vram_mgr_block_size(struct drm_buddy_block *block) 
	return PAGE_SIZE << drm_buddy_block_order(block);

}



static inline struct drm_buddy_block *

amdgpu_vram_mgr_first_block(struct list_head *list)

{

	return list_first_entry_or_null(list, struct drm_buddy_block, link);

}



static inline bool amdgpu_is_vram_mgr_blocks_contiguous(struct list_head *head)

{

	struct drm_buddy_block *block;

	u64 start, size;



	block = amdgpu_vram_mgr_first_block(head);

	if (!block)

		return false;



	while (head != block->link.next) {

		start = amdgpu_vram_mgr_block_start(block);

		size = amdgpu_vram_mgr_block_size(block);



		block = list_entry(block->link.next, struct drm_buddy_block, link);

		if (start + size != amdgpu_vram_mgr_block_start(block))

			return false;

	}



	return true;

}



static inline struct amdgpu_vram_mgr_resource *

to_amdgpu_vram_mgr_resource(struct ttm_resource *res)

{