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

Commit 1303c73c authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: cleanup VM fragment defines 



We can actually do way more than just the 64KB we currently used as default.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3a8a6ab4

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

+4 −4
Original line number Diff line number Diff line
@@ -830,6 +830,9 @@ struct amdgpu_ring { 
/* PTBs (Page Table Blocks) need to be aligned to 32K */

#define AMDGPU_VM_PTB_ALIGN_SIZE   32768



/* LOG2 number of continuous pages for the fragment field */

#define AMDGPU_LOG2_PAGES_PER_FRAG 4



#define AMDGPU_PTE_VALID	(1 << 0)

#define AMDGPU_PTE_SYSTEM	(1 << 1)

#define AMDGPU_PTE_SNOOPED	(1 << 2)
@@ -840,10 +843,7 @@ struct amdgpu_ring { 
#define AMDGPU_PTE_READABLE	(1 << 5)

#define AMDGPU_PTE_WRITEABLE	(1 << 6)



/* PTE (Page Table Entry) fragment field for different page sizes */

#define AMDGPU_PTE_FRAG_4KB	(0 << 7)

#define AMDGPU_PTE_FRAG_64KB	(4 << 7)

#define AMDGPU_LOG2_PAGES_PER_FRAG 4

#define AMDGPU_PTE_FRAG(x)	((x & 0x1f) << 7)



/* How to programm VM fault handling */

#define AMDGPU_VM_FAULT_STOP_NEVER	0

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

+1 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ static void amdgpu_vm_frag_ptes(struct amdgpu_device *adev, 
	 */



	/* SI and newer are optimized for 64KB */

	uint64_t frag_flags = AMDGPU_PTE_FRAG_64KB;

	uint64_t frag_flags = AMDGPU_PTE_FRAG(AMDGPU_LOG2_PAGES_PER_FRAG);

	uint64_t frag_align = 0x80;



	uint64_t frag_start = ALIGN(pe_start, frag_align);