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

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

drm/amdgpu: revert "add new bo flag that indicates BOs don't need fallback (v2)" 



This reverts commit 6f51d28bfe8e1a676de5cd877639245bed3cc818.

Makes fallback handling to complicated. This is just a feature for the
GEM interface and shouldn't leak into the core BO create function.

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

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

+1 −2
Original line number Diff line number Diff line
@@ -385,8 +385,7 @@ static int amdgpu_cs_bo_validate(struct amdgpu_cs_parser *p, 
	    amdgpu_bo_in_cpu_visible_vram(bo))

		p->bytes_moved_vis += ctx.bytes_moved;



	if (unlikely(r == -ENOMEM) && domain != bo->allowed_domains &&

	    !(bo->flags & AMDGPU_GEM_CREATE_NO_FALLBACK)) {

	if (unlikely(r == -ENOMEM) && domain != bo->allowed_domains) {

		domain = bo->allowed_domains;

		goto retry;

	}

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

+1 −4
Original line number Diff line number Diff line
@@ -388,8 +388,6 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, unsigned long size, 
	drm_gem_private_object_init(adev->ddev, &bo->gem_base, size);

	INIT_LIST_HEAD(&bo->shadow_list);

	INIT_LIST_HEAD(&bo->va);

	bo->preferred_domains = preferred_domains;

	bo->allowed_domains = allowed_domains;



	bo->flags = flags;
@@ -426,8 +424,7 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, unsigned long size, 
	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 && r != -ERESTARTSYS) && type == ttm_bo_type_device &&

	    !(flags & AMDGPU_GEM_CREATE_NO_FALLBACK)) {

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

		if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) {

			flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;

			goto retry;

include/uapi/drm/amdgpu_drm.h

+0 −2
Original line number Diff line number Diff line
@@ -95,8 +95,6 @@ extern "C" { 
#define AMDGPU_GEM_CREATE_VM_ALWAYS_VALID	(1 << 6)

/* Flag that BO sharing will be explicitly synchronized */

#define AMDGPU_GEM_CREATE_EXPLICIT_SYNC		(1 << 7)

/* Flag that BO doesn't need fallback */

#define AMDGPU_GEM_CREATE_NO_FALLBACK		(1 << 8)



struct drm_amdgpu_gem_create_in  {

	/** the requested memory size */