[PATCH 1/2] drm/amdgpu: Don't change preferred domian when fallback GTT

[Christian König]

Am 16.03.2018 um 10:56 schrieb Chunming Zhou:
> Change-Id: I2cf672ad36b8b4cc1a6b2e704f786bf6a155d9ce
> Signed-off-by: Chunming Zhou <david1.zhou at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c    |  5 -----
>   drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 12 ++++++++++--
>   2 files changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> index 6e6570ff9f8b..660f5e44b1a5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> @@ -85,11 +85,6 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size,
>   				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);
>   		}
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index b3310219e0ac..3d70d682f83b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -371,6 +371,7 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev,
>   	enum ttm_bo_type type;
>   	unsigned long page_align;
>   	size_t acc_size;
> +	u32 setting_domain;
>   	int r;
>   
>   	page_align = roundup(byte_align, PAGE_SIZE) >> PAGE_SHIFT;
> @@ -440,13 +441,20 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev,
>   #endif
>   
>   	bo->tbo.bdev = &adev->mman.bdev;
> -	amdgpu_ttm_placement_from_domain(bo, domain);
> +	setting_domain = bo->preferred_domains;
> +retry:
> +	amdgpu_ttm_placement_from_domain(bo, setting_domain);
>   
>   	r = ttm_bo_init_reserved(&adev->mman.bdev, &bo->tbo, size, type,
>   				 &bo->placement, page_align, &ctx, acc_size,
>   				 sg, resv, &amdgpu_ttm_bo_destroy);
> -	if (unlikely(r != 0))
> +	if (unlikely(r != 0)) {
> +		if (r != -ERESTARTSYS) {
> +			setting_domain = bo->allowed_domains;

If the allocation fails with setting domain as well that will result in 
an endless loop. Rather open code that, e.g.

amdgpu_ttm_placement_from_domain(bo, bo->prefered_domains);
r = ttm_bo_init_reserved(&adev->mman.bdev, &bo->tbo, size, type,
                   &bo->placement, page_align, &ctx, acc_size,
                   sg, resv, &amdgpu_ttm_bo_destroy);

if (unlikely(r && r != -ERESTARTSYS) && bo->allowed_domains != 
bo->prefered_domains) {
     amdgpu_ttm_placement_from_domain(bo, bo->allowed_domains);
     r = ttm_bo_init_reserved(&adev->mman.bdev, &bo->tbo, size, type,
....

Regards,
Christian.

> +			goto retry;
> +		}
>   		return r;
> +	}
>   
>   	if (adev->gmc.visible_vram_size < adev->gmc.real_vram_size &&
>   	    bo->tbo.mem.mem_type == TTM_PL_VRAM &&