From: "Christian König" <ckoenig.leichtzumerken-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: wentalou <Wentao.Lou-5C7GfCeVMHo@public.gmane.org>,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Subject: Re: [PATCH] drm/amdgpu: Skip ring soft recovery when fence was NULL
Date: Thu, 6 Dec 2018 10:31:49 +0100 [thread overview]
Message-ID: <f8e8e438-cffa-db99-a693-a97abe88576f@gmail.com> (raw)
In-Reply-To: <1544064170-12834-1-git-send-email-Wentao.Lou-5C7GfCeVMHo@public.gmane.org>
Am 06.12.18 um 03:42 schrieb wentalou:
> amdgpu_ring_soft_recovery would have Call-Trace,
> when s_fence->parent was NULL inside amdgpu_job_timedout.
> Check fence first, as drm_sched_hw_job_reset did.
>
> Change-Id: Ibb062e36feb4e2522a59641fe0d2d76b9773cda7
> Signed-off-by: Wentao Lou <Wentao.Lou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> index 5b75bdc..335a0ed 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> @@ -397,7 +397,7 @@ bool amdgpu_ring_soft_recovery(struct amdgpu_ring *ring, unsigned int vmid,
> {
> ktime_t deadline = ktime_add_us(ktime_get(), 10000);
>
> - if (!ring->funcs->soft_recovery)
> + if (!ring->funcs->soft_recovery || !fence)
> return false;
>
> atomic_inc(&ring->adev->gpu_reset_counter);
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
prev parent reply other threads:[~2018-12-06 9:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-06 2:42 [PATCH] drm/amdgpu: Skip ring soft recovery when fence was NULL wentalou
[not found] ` <1544064170-12834-1-git-send-email-Wentao.Lou-5C7GfCeVMHo@public.gmane.org>
2018-12-06 9:31 ` Christian König [this message]
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=f8e8e438-cffa-db99-a693-a97abe88576f@gmail.com \
--to=ckoenig.leichtzumerken-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=Wentao.Lou-5C7GfCeVMHo@public.gmane.org \
--cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
--cc=christian.koenig-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