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

Commit cc15dfaa authored by Chunming Zhou's avatar Chunming Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: Don't change preferred domian when fallback GTT v5 



v2: add sanity checking
v3: make code open
v4: also handle visible to invisible fallback
v5: Since two fallback cases, re-use goto retry

Signed-off-by: default avatarChunming Zhou <david1.zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b6356df3

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

+2 −14
Original line number Diff line number Diff line
@@ -56,23 +56,11 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size, 
		alignment = PAGE_SIZE;

	}



retry:

	r = amdgpu_bo_create(adev, size, alignment, initial_domain,

			     flags, type, resv, &bo);

	if (r) {

		if (r != -ERESTARTSYS) {

			if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) {

				flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;

				goto retry;

			}



			if (initial_domain == AMDGPU_GEM_DOMAIN_VRAM) {

				initial_domain |= AMDGPU_GEM_DOMAIN_GTT;

				goto retry;

			}

		DRM_DEBUG("Failed to allocate GEM object (%ld, %d, %u, %d)\n",

			  size, initial_domain, alignment, r);

		}

		return r;

	}

	*obj = &bo->gem_base;

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

+15 −3
Original line number Diff line number Diff line
@@ -356,6 +356,7 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, unsigned long size, 
	struct amdgpu_bo *bo;

	unsigned long page_align;

	size_t acc_size;

	u32 domains;

	int r;



	page_align = roundup(byte_align, PAGE_SIZE) >> PAGE_SHIFT;
@@ -417,12 +418,23 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, unsigned long size, 
#endif



	bo->tbo.bdev = &adev->mman.bdev;

	amdgpu_ttm_placement_from_domain(bo, domain);



	domains = bo->preferred_domains;

retry:

	amdgpu_ttm_placement_from_domain(bo, domains);

	r = ttm_bo_init_reserved(&adev->mman.bdev, &bo->tbo, size, type,

				 &bo->placement, page_align, &ctx, acc_size,

				 NULL, resv, &amdgpu_ttm_bo_destroy);

	if (unlikely(r != 0))



	if (unlikely(r && r != -ERESTARTSYS)) {

		if (bo->flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) {

			bo->flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;

			goto retry;

		} else if (domains != bo->preferred_domains) {

			domains = bo->allowed_domains;

			goto retry;

		}

	}

	if (unlikely(r))

		return r;



	if (adev->gmc.visible_vram_size < adev->gmc.real_vram_size &&