AMD-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Zhang, Jerry (Junwei)" <Jerry.Zhang-5C7GfCeVMHo@public.gmane.org>
To: "Michel Dänzer" <michel-otUistvHUpPR7s880joybQ@public.gmane.org>,
	amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Subject: Re: [PATCH] drm/amdgpu: Reserve shared fence slot in amdgpu_vm_update_directories
Date: Mon, 25 Jun 2018 10:15:30 +0800	[thread overview]
Message-ID: <5B305042.2060202@amd.com> (raw)
In-Reply-To: <20180622164235.30770-1-michel-otUistvHUpPR7s880joybQ@public.gmane.org>

On 06/23/2018 12:42 AM, Michel Dänzer wrote:
> From: Michel Dänzer <michel.daenzer@amd.com>
>
> Without this, there could not be enough slots, which could trigger the
> BUG_ON in reservation_object_add_shared_fence.
>
> Cc: stable@vger.kernel.org
> Bugzilla: https://bugs.freedesktop.org/106418
> Reported-by: mikhail.v.gavrilov@gmail.com
> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index 590db78b8c72..75579200f4a6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -1111,6 +1111,10 @@ int amdgpu_vm_update_directories(struct amdgpu_device *adev,
>   		struct amdgpu_ring *ring;
>   		struct dma_fence *fence;
>
> +		r = reservation_object_reserve_shared(root->tbo.resv);
> +		if (r)
> +			return r;

Good catch.

But we may "goto error" here to do some cleanup.

Jerry

> +
>   		ring = container_of(vm->entity.sched, struct amdgpu_ring,
>   				    sched);
>
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

  parent reply	other threads:[~2018-06-25  2:15 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-22 16:42 [PATCH] drm/amdgpu: Reserve shared fence slot in amdgpu_vm_update_directories Michel Dänzer
     [not found] ` <20180622164235.30770-1-michel-otUistvHUpPR7s880joybQ@public.gmane.org>
2018-06-25  2:15   ` Zhang, Jerry (Junwei) [this message]
     [not found]     ` <5B305042.2060202-5C7GfCeVMHo@public.gmane.org>
2018-06-25  9:08       ` Michel Dänzer
2018-06-25  9:07   ` [PATCH v2] " Michel Dänzer
     [not found]     ` <20180625090717.28522-1-michel-otUistvHUpPR7s880joybQ@public.gmane.org>
2018-06-25  9:45       ` Zhang, Jerry (Junwei)
2018-07-02  9:23       ` Christian König
     [not found]         ` <15c3905c-8e69-9d03-e506-929e4d9176e3-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-07-03  1:59           ` Zhang, Jerry (Junwei)
     [not found]             ` <5B3AD88D.2010604-5C7GfCeVMHo@public.gmane.org>
2018-07-03  6:58               ` Christian König
     [not found]                 ` <a95367bc-1181-649d-eca0-64ec0380c6c2-5C7GfCeVMHo@public.gmane.org>
2018-07-03  8:12                   ` Zhang, Jerry (Junwei)
     [not found]                     ` <5B3B2FE9.1000402-5C7GfCeVMHo@public.gmane.org>
2018-07-03  8:28                       ` Michel Dänzer
     [not found]                         ` <78dcd991-2406-59f3-199a-721797a32c2c-otUistvHUpPR7s880joybQ@public.gmane.org>
2018-07-03  8:37                           ` Zhang, Jerry (Junwei)
2018-07-03  8:42                       ` Christian König
     [not found]                         ` <f6dc6a5b-f6c4-5693-6bad-b2ce29ea54bc-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-07-03  9:03                           ` Zhang, Jerry (Junwei)

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=5B305042.2060202@amd.com \
    --to=jerry.zhang-5c7gfcevmho@public.gmane.org \
    --cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    --cc=michel-otUistvHUpPR7s880joybQ@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