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

Commit 8036617e authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: revert "use more than 64KB fragment size if possible" 



This reverts commit 1dcd32fb9c54334ec948a0f18174a748d6b14364.

The block size is indeed an equal match, so this can cause performance regressions.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 2f9ba199

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

+4 −8
Original line number Original line Diff line number Diff line
@@ -878,13 +878,13 @@ static void amdgpu_vm_frag_ptes(struct amdgpu_pte_update_params *params, 
	 * allocation size to the fragment size.

	 * allocation size to the fragment size.

	 */

	 */





	const uint64_t frag_align = 1 << AMDGPU_LOG2_PAGES_PER_FRAG;

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

	uint64_t frag_flags = AMDGPU_PTE_FRAG(AMDGPU_LOG2_PAGES_PER_FRAG);

	uint64_t frag_align = 1 << AMDGPU_LOG2_PAGES_PER_FRAG;





	uint64_t frag_start = ALIGN(start, frag_align);

	uint64_t frag_start = ALIGN(start, frag_align);

	uint64_t frag_end = end & ~(frag_align - 1);

	uint64_t frag_end = end & ~(frag_align - 1);





	uint32_t frag;



	/* system pages are non continuously */

	/* system pages are non continuously */

	if (params->src || !(flags & AMDGPU_PTE_VALID) ||

	if (params->src || !(flags & AMDGPU_PTE_VALID) ||

	    (frag_start >= frag_end)) {

	    (frag_start >= frag_end)) {
@@ -893,10 +893,6 @@ static void amdgpu_vm_frag_ptes(struct amdgpu_pte_update_params *params, 
		return;

		return;

	}

	}





	/* use more than 64KB fragment size if possible */

	frag = lower_32_bits(frag_start | frag_end);

	frag = likely(frag) ? __ffs(frag) : 31;



	/* handle the 4K area at the beginning */

	/* handle the 4K area at the beginning */

	if (start != frag_start) {

	if (start != frag_start) {

		amdgpu_vm_update_ptes(params, vm, start, frag_start,

		amdgpu_vm_update_ptes(params, vm, start, frag_start,
@@ -906,7 +902,7 @@ static void amdgpu_vm_frag_ptes(struct amdgpu_pte_update_params *params, 




	/* handle the area in the middle */

	/* handle the area in the middle */

	amdgpu_vm_update_ptes(params, vm, frag_start, frag_end, dst,

	amdgpu_vm_update_ptes(params, vm, frag_start, frag_end, dst,

			      flags | AMDGPU_PTE_FRAG(frag));

			      flags | frag_flags);





	/* handle the 4K area at the end */

	/* handle the 4K area at the end */

	if (frag_end != end) {

	if (frag_end != end) {