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

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

drm/amdgpu: remove VI hw bug workaround v3 



The workaround simply doesn't work because VM mappings
are controlled by userspace not the kernel.

Additional to that this is just a performance problem
which happens if you have holes in your VM mapping.

v2: adjust virtual addr alignment as well.
v3: fix trivial warning

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: Monk Liu  <monk.liu@amd.com> (v1)
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com> (v2)
parent 00d2a2b2

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

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
			dev_info.ids_flags |= AMDGPU_IDS_FLAGS_FUSION;

		dev_info.virtual_address_offset = AMDGPU_VA_RESERVED_SIZE;

		dev_info.virtual_address_max = (uint64_t)adev->vm_manager.max_pfn * AMDGPU_GPU_PAGE_SIZE;

		dev_info.virtual_address_alignment = max(PAGE_SIZE, 0x10000UL);

		dev_info.virtual_address_alignment = max((int)PAGE_SIZE, AMDGPU_GPU_PAGE_SIZE);

		dev_info.pte_fragment_size = (1 << AMDGPU_LOG2_PAGES_PER_FRAG) *

					     AMDGPU_GPU_PAGE_SIZE;

		dev_info.gart_page_size = AMDGPU_GPU_PAGE_SIZE;

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

+0 −12
Original line number Diff line number Diff line
@@ -223,18 +223,6 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev, 
	size_t acc_size;

	int r;



	/* VI has a hw bug where VM PTEs have to be allocated in groups of 8.

	 * do this as a temporary workaround

	 */

	if (!(domain & (AMDGPU_GEM_DOMAIN_GDS | AMDGPU_GEM_DOMAIN_GWS | AMDGPU_GEM_DOMAIN_OA))) {

		if ((adev->asic_type >= CHIP_TOPAZ) && (adev->asic_type != CHIP_FIJI)) {

			if (byte_align & 0x7fff)

				byte_align = ALIGN(byte_align, 0x8000);

			if (size & 0x7fff)

				size = ALIGN(size, 0x8000);

		}

	}



	page_align = roundup(byte_align, PAGE_SIZE) >> PAGE_SHIFT;

	size = ALIGN(size, PAGE_SIZE);