From: "Grodzovsky, Andrey" <Andrey.Grodzovsky-5C7GfCeVMHo@public.gmane.org>
To: "Lou, Wentao" <Wentao.Lou-5C7GfCeVMHo@public.gmane.org>,
"amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org"
<amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
Subject: Re: [PATCH] drm/amdgpu: tighten gpu_recover in mailbox_flr to avoid duplicate recover in sriov
Date: Wed, 23 Jan 2019 16:26:38 +0000 [thread overview]
Message-ID: <609eec03-4d51-c2e2-8e1f-aefb996c5efa@amd.com> (raw)
In-Reply-To: <1548237051-31881-1-git-send-email-Wentao.Lou-5C7GfCeVMHo@public.gmane.org>
On 01/23/2019 04:50 AM, wentalou wrote:
> sriov's gpu_recover inside xgpu_ai_mailbox_flr_work would cause duplicate recover in TDR.
> TDR's gpu_recover would be triggered by amdgpu_job_timedout,
> that could avoid vk-cts failure by unexpected recover.
>
> Change-Id: Ifcba4ac43a0229ae19061aad3b0ddc96957ff9c6
> Signed-off-by: wentalou <Wentao.Lou@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c b/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
> index b11a1c17..f227633 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
> @@ -266,7 +266,7 @@ static void xgpu_ai_mailbox_flr_work(struct work_struct *work)
> }
>
> /* Trigger recovery for world switch failure if no TDR */
> - if (amdgpu_device_should_recover_gpu(adev))
> + if (amdgpu_device_should_recover_gpu(adev) && amdgpu_lockup_timeout == 0)
Not sure I fully understand the intent here but amdgpu_lockup_timeout == 0 is forced to 10000 in amdgpu_device_check_arguments and hence not an indication of disabled gpu recover - it will still happen.
Andrey
> amdgpu_device_gpu_recover(adev, NULL);
> }
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2019-01-23 16:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-23 9:50 [PATCH] drm/amdgpu: tighten gpu_recover in mailbox_flr to avoid duplicate recover in sriov wentalou
[not found] ` <1548237051-31881-1-git-send-email-Wentao.Lou-5C7GfCeVMHo@public.gmane.org>
2019-01-23 16:26 ` Grodzovsky, Andrey [this message]
[not found] ` <609eec03-4d51-c2e2-8e1f-aefb996c5efa-5C7GfCeVMHo@public.gmane.org>
2019-01-24 7:18 ` Lou, Wentao
[not found] ` <BYAPR12MB2742ED87810B57383393AACF839A0-ZGDeBxoHBPmbrehcvEBedAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2019-01-24 15:48 ` Grodzovsky, Andrey
-- strict thread matches above, loose matches on Subject: below --
2019-01-30 3:16 wentalou
[not found] ` <1548818214-18078-1-git-send-email-Wentao.Lou-5C7GfCeVMHo@public.gmane.org>
2019-01-30 15:19 ` Grodzovsky, Andrey
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=609eec03-4d51-c2e2-8e1f-aefb996c5efa@amd.com \
--to=andrey.grodzovsky-5c7gfcevmho@public.gmane.org \
--cc=Wentao.Lou-5C7GfCeVMHo@public.gmane.org \
--cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@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