From: "Zhang, Jerry(Junwei)" <Jerry.Zhang-5C7GfCeVMHo@public.gmane.org>
To: "Zhou1, Tao" <Tao.Zhou1-5C7GfCeVMHo@public.gmane.org>,
"amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org"
<amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
Cc: "Li, Yukun1" <Yukun1.Li-5C7GfCeVMHo@public.gmane.org>
Subject: Re: [PATCH] drm/amdgpu: fix CPDMA hang in PRT mode for VEGA20
Date: Wed, 9 Jan 2019 10:26:21 +0800 [thread overview]
Message-ID: <21c5472f-b702-614f-eaf7-e01f0227539d@amd.com> (raw)
In-Reply-To: <MWHPR1201MB00319C4CA5173B44790BB8AFB08B0-3iK1xFAIwjpOCgnjW8YtvWrFom/aUZj6nBOFsp37pqbUKgpGm//BTAC/G2K4zDHf@public.gmane.org>
On 1/9/19 10:23 AM, Zhou1, Tao wrote:
>
>> -----Original Message-----
>> From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of
>> Zhang, Jerry(Junwei)
>> Sent: 2019年1月9日 9:39
>> To: Zhou1, Tao <Tao.Zhou1@amd.com>; amd-gfx@lists.freedesktop.org
>> Cc: Li, Yukun1 <Yukun1.Li@amd.com>
>> Subject: Re: [PATCH] drm/amdgpu: fix CPDMA hang in PRT mode for VEGA20
>>
>> On 1/8/19 6:55 PM, Tao Zhou wrote:
>>> Fix CPDMA hang in PRT mode for both of VEGA10 and VEGA20
>>>
>>> Change-Id: I0e5e089d2192063c4a04fa6dbd534f25eb0177be
>>> Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
>>> Tested-by: Yukun.Li <yukun1.li@amd.com>
>>> ---
>>> drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 10 +++++-----
>>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
>>> b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
>>> index 968b127c6c8f..fbca0494f871 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
>>> @@ -113,7 +113,10 @@ static const struct soc15_reg_golden
>> golden_settings_gc_9_0[] =
>>> SOC15_REG_GOLDEN_VALUE(GC, 0, mmTCP_CHAN_STEER_HI,
>> 0xffffffff, 0x4a2c0e68),
>>> SOC15_REG_GOLDEN_VALUE(GC, 0, mmTCP_CHAN_STEER_LO,
>> 0xffffffff, 0xb5d3f197),
>>> SOC15_REG_GOLDEN_VALUE(GC, 0, mmVGT_CACHE_INVALIDATION,
>> 0x3fff3af3, 0x19200000),
>>> - SOC15_REG_GOLDEN_VALUE(GC, 0, mmVGT_GS_MAX_WAVE_ID,
>> 0x00000fff, 0x000003ff)
>>> + SOC15_REG_GOLDEN_VALUE(GC, 0, mmVGT_GS_MAX_WAVE_ID,
>> 0x00000fff, 0x000003ff),
>>> + SOC15_REG_GOLDEN_VALUE(GC, 0, mmCP_MEC1_F32_INT_DIS,
>> 0x00000000, 0x00000800),
>>> + SOC15_REG_GOLDEN_VALUE(GC, 0, mmCP_MEC2_F32_INT_DIS,
>> 0x00000000, 0x00000800),
>>> + SOC15_REG_GOLDEN_VALUE(GC, 0, mmCP_DEBUG, 0x00000000,
>> 0x00008000)
>> IIRC, the CP_DEBUG is the key to fix the CPDMA hang, do we need other
>> settings?
>> or just to align the settings with latest status?
>>
>> Jerry
>>
> Set CPF_INT_DMA in reg CP_MECx_F32_INT_DIS for Compute and set
> DISABLE_GFX_HALT_ON_UTCL1_ERROR in CP_DEBUG for GFX.
>
> All the settings are needed.
Thanks for confirmation. Almost forgot compute. That's fine.
BTW, not sure PRT is used for compute as well.
Jerry
>
> Tao
>
>>> };
>>>
>>> static const struct soc15_reg_golden golden_settings_gc_9_0_vg10[] =
>>> @@ -135,10 +138,7 @@ static const struct soc15_reg_golden
>> golden_settings_gc_9_0_vg10[] =
>>> SOC15_REG_GOLDEN_VALUE(GC, 0, mmRMI_UTCL1_CNTL2,
>> 0x00030000, 0x00020000),
>>> SOC15_REG_GOLDEN_VALUE(GC, 0, mmSPI_CONFIG_CNTL_1,
>> 0x0000000f, 0x01000107),
>>> SOC15_REG_GOLDEN_VALUE(GC, 0, mmTD_CNTL, 0x00001800,
>> 0x00000800),
>>> - SOC15_REG_GOLDEN_VALUE(GC, 0, mmWD_UTCL1_CNTL,
>> 0x08000000, 0x08000080),
>>> - SOC15_REG_GOLDEN_VALUE(GC, 0, mmCP_MEC1_F32_INT_DIS,
>> 0x00000000, 0x00000800),
>>> - SOC15_REG_GOLDEN_VALUE(GC, 0, mmCP_MEC2_F32_INT_DIS,
>> 0x00000000, 0x00000800),
>>> - SOC15_REG_GOLDEN_VALUE(GC, 0, mmCP_DEBUG, 0x00000000,
>> 0x00008000)
>>> + SOC15_REG_GOLDEN_VALUE(GC, 0, mmWD_UTCL1_CNTL,
>> 0x08000000,
>>> +0x08000080)
>>> };
>>>
>>> static const struct soc15_reg_golden golden_settings_gc_9_0_vg20[] =
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
prev parent reply other threads:[~2019-01-09 2:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-08 10:55 [PATCH] drm/amdgpu: fix CPDMA hang in PRT mode for VEGA20 Tao Zhou
[not found] ` <20190108105536.3068-1-tao.zhou1-5C7GfCeVMHo@public.gmane.org>
2019-01-08 14:36 ` Alex Deucher
2019-01-09 1:39 ` Zhang, Jerry(Junwei)
[not found] ` <8689099b-60f7-5fbe-41a0-bcc6556ed8ed-5C7GfCeVMHo@public.gmane.org>
2019-01-09 2:23 ` Zhou1, Tao
[not found] ` <MWHPR1201MB00319C4CA5173B44790BB8AFB08B0-3iK1xFAIwjpOCgnjW8YtvWrFom/aUZj6nBOFsp37pqbUKgpGm//BTAC/G2K4zDHf@public.gmane.org>
2019-01-09 2:26 ` Zhang, Jerry(Junwei) [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=21c5472f-b702-614f-eaf7-e01f0227539d@amd.com \
--to=jerry.zhang-5c7gfcevmho@public.gmane.org \
--cc=Tao.Zhou1-5C7GfCeVMHo@public.gmane.org \
--cc=Yukun1.Li-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