AMD-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Christian König" <ckoenig.leichtzumerken-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Chunming Zhou <david1.zhou-5C7GfCeVMHo@public.gmane.org>,
	amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Subject: Re: [PATCH 1/2] drm/amdgpu: Don't change preferred domian when fallback GTT v3
Date: Mon, 19 Mar 2018 11:03:52 +0100	[thread overview]
Message-ID: <dc6ed4e0-6858-a78a-4fa3-02bcd2685d31@gmail.com> (raw)
In-Reply-To: <20180319100048.8925-1-david1.zhou-5C7GfCeVMHo@public.gmane.org>

Am 19.03.2018 um 11:00 schrieb Chunming Zhou:
> v2: add sanity checking
> v3: make code open
>
> Change-Id: I2cf672ad36b8b4cc1a6b2e704f786bf6a155d9ce
> Signed-off-by: Chunming Zhou <david1.zhou@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c    |  5 -----
>   drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 16 ++++++++++++----
>   2 files changed, 12 insertions(+), 9 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..e167e98c746c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -440,13 +440,21 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev,
>   #endif
>   
>   	bo->tbo.bdev = &adev->mman.bdev;
> -	amdgpu_ttm_placement_from_domain(bo, domain);
> -
> +	amdgpu_ttm_placement_from_domain(bo, bo->preferred_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 != 0))
> -		return r;
> +
> +	if (unlikely(r && r != -ERESTARTSYS) && bo->allowed_domains !=
> +	    bo->preferred_domains) {
> +		amdgpu_ttm_placement_from_domain(bo, bo->allowed_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 != 0))
> +			return r;
> +	}
>   
>   	if (adev->gmc.visible_vram_size < adev->gmc.real_vram_size &&
>   	    bo->tbo.mem.mem_type == TTM_PL_VRAM &&

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

  parent reply	other threads:[~2018-03-19 10:03 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-19 10:00 [PATCH 1/2] drm/amdgpu: Don't change preferred domian when fallback GTT v3 Chunming Zhou
     [not found] ` <20180319100048.8925-1-david1.zhou-5C7GfCeVMHo@public.gmane.org>
2018-03-19 10:00   ` [PATCH 2/2] drm/amdgpu: validate fallback BOs Chunming Zhou
     [not found]     ` <20180319100048.8925-2-david1.zhou-5C7GfCeVMHo@public.gmane.org>
2018-03-19 10:43       ` Christian König
2018-03-19 10:03   ` Christian König [this message]
     [not found]     ` <dc6ed4e0-6858-a78a-4fa3-02bcd2685d31-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-03-20  3:22       ` [PATCH 1/2] drm/amdgpu: Don't change preferred domian when fallback GTT v3 zhoucm1

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=dc6ed4e0-6858-a78a-4fa3-02bcd2685d31@gmail.com \
    --to=ckoenig.leichtzumerken-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    --cc=christian.koenig-5C7GfCeVMHo@public.gmane.org \
    --cc=david1.zhou-5C7GfCeVMHo@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox