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

drm/amdgpu: revert "generally allow over-commit during BO allocation" 



This reverts commit f9d00a4a.

This causes problem for KFD because when we overcommit we accidentially
bind the BO to GTT for moving it into VRAM. We also need to make sure
that this is done only as fallback after trying to evict first.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3273f116

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

+13 −3
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size, 
	bp.resv = resv;

	bp.preferred_domain = initial_domain;

	bp.flags = flags;

	bp.domain = initial_domain | AMDGPU_GEM_DOMAIN_CPU;

	bp.domain = initial_domain;

	bp.bo_ptr_size = sizeof(struct amdgpu_bo);



	r = amdgpu_bo_create_user(adev, &bp, &ubo);
@@ -332,10 +332,20 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data, 
	}



	initial_domain = (u32)(0xffffffff & args->in.domains);

retry:

	r = amdgpu_gem_object_create(adev, size, args->in.alignment,

				     initial_domain, flags, ttm_bo_type_device,

				     resv, &gobj);

				     initial_domain,

				     flags, ttm_bo_type_device, resv, &gobj);

	if (r && 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 (%llu, %d, %llu, %d)\n",

				size, initial_domain, args->in.alignment, r);

	}

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

+5 −1
Original line number Diff line number Diff line
@@ -580,6 +580,10 @@ int amdgpu_bo_create(struct amdgpu_device *adev, 
		bo->flags |= AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE;



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

	if (bp->domain & (AMDGPU_GEM_DOMAIN_GWS | AMDGPU_GEM_DOMAIN_OA |

			  AMDGPU_GEM_DOMAIN_GDS))

		amdgpu_bo_placement_from_domain(bo, AMDGPU_GEM_DOMAIN_CPU);

	else

		amdgpu_bo_placement_from_domain(bo, bp->domain);

	if (bp->type == ttm_bo_type_kernel)

		bo->tbo.priority = 1;