Re: [PATCH] drm/amdgpu: fix modprobe failure of the 2nd GPU when GDDR6 training enabled
[AMD Official Use Only - Internal Distribution Only] Hi Christian, Thanks very much for your suggestions, I checked the original version of gmc_v10_0.c on branch origin/ruihuang/amd-temp-navi10-part1, amdgpu_bo_late_init() is not invoked by gmc_v10_0_late_init(), so I think it was missed from the beginning time. Yes, it seems we all have ever met the VRAM overwritten issue, but it's not easy to figure out who did it. Are there some source that we can get this kind of information? If there is a place gathered this kind of information, it should save us much debug time. Thanks! Rico From: Christian König Sent: Thursday, January 9, 2020 18:29 To: Yin, Tianci (Rico) ; Alex Deucher Cc: Koenig, Christian ; Long, Gang ; Wang, Kevin(Yang) ; Xu, Feifei ; amd-gfx list ; Tuikov, Luben ; Deucher, Alexander ; Yuan, Xiaojie ; Zhang, Hawking Subject: Re: [PATCH] drm/amdgpu: fix modprobe failure of the 2nd GPU when GDDR6 training enabled Hi Rico, maybe it is a good idea to look into the git history and/or google the mailing list history a bit more. I do briefly remember that we disabled freeing up the stolen VGA memory on some hardware generations because somebody was accessing that memory even after VGA was turned off. At that time we couldn't figure out what was going wrong, but it is perfectly possible that those memory training fixes your are working on here are related to that issue. On the other hand if you can't find anything immediately feel free to go with Alex suggestion, if something goes wrong we can still revert the change. Regards, Christian. Am 09.01.20 um 04:15 schrieb Yin, Tianci (Rico): [AMD Official Use Only - Internal Distribution Only] Ok, thanks very much Alex! From: Alex Deucher <mailto:alexdeuc...@gmail.com> Sent: Thursday, January 9, 2020 11:12 To: Yin, Tianci (Rico) <mailto:tianci@amd.com> Cc: Christian König <mailto:ckoenig.leichtzumer...@gmail.com>; Koenig, Christian <mailto:christian.koe...@amd.com>; Long, Gang <mailto:gang.l...@amd.com>; Wang, Kevin(Yang) <mailto:kevin1.w...@amd.com>; Xu, Feifei <mailto:feifei...@amd.com>; amd-gfx list <mailto:amd-gfx@lists.freedesktop.org>; Tuikov, Luben <mailto:luben.tui...@amd.com>; Deucher, Alexander <mailto:alexander.deuc...@amd.com>; Yuan, Xiaojie <mailto:xiaojie.y...@amd.com>; Zhang, Hawking <mailto:hawking.zh...@amd.com> Subject: Re: [PATCH] drm/amdgpu: fix modprobe failure of the 2nd GPU when GDDR6 training enabled On Wed, Jan 8, 2020 at 10:07 PM Yin, Tianci (Rico) <mailto:tianci@amd.com> wrote: > > [AMD Official Use Only - Internal Distribution Only] > > > Thanks Alex and Christian! > > Hi Christian, > > On ASICs with gmc v10, I find amdgpu_bo_late_init() is not invoked, so stolen > memory never get free, on other ASICs with gmc v9/v8/v7/v6, stolen memory was > freed in gmc_v*_0_late_init(). I don't know why, are there some special > reasons or just missed by coding? > Looks like it should be added. Possibly got lost when we merged the navi code from the topic branch. Alex > Thanks! > > Rico > > > From: Christian König > <mailto:ckoenig.leichtzumer...@gmail.com> > Sent: Wednesday, January 8, 2020 23:04 > To: Alex Deucher <mailto:alexdeuc...@gmail.com>; > Koenig, Christian <mailto:christian.koe...@amd.com> > Cc: Long, Gang <mailto:gang.l...@amd.com>; Wang, > Kevin(Yang) <mailto:kevin1.w...@amd.com>; Xu, Feifei > <mailto:feifei...@amd.com>; Yin, Tianci (Rico) > <mailto:tianci@amd.com>; amd-gfx list > <mailto:amd-gfx@lists.freedesktop.org>; > Tuikov, Luben <mailto:luben.tui...@amd.com>; Deucher, > Alexander <mailto:alexander.deuc...@amd.com>; > Yuan, Xiaojie <mailto:xiaojie.y...@amd.com>; Zhang, > Hawking <mailto:hawking.zh...@amd.com> > Subject: Re: [PATCH] drm/amdgpu: fix modprobe failure of the 2nd GPU when > GDDR6 training enabled > > Am 08.01.20 um 15:49 schrieb Alex Deucher: > > On Wed, Jan 8, 2020 at 7:52 AM Christian König > > <mailto:christian.koe...@amd.com> wrote: > >> Am 08.01.20 um 13:36 schrieb Tianci Yin: > >>> From: "Tianci.Yin" <mailto:tianci@amd.com> > >>> > >>> [why] > >>> In dual GPUs scenario, stolen_size is assigned to zero on the 2nd GPU, > >>> then the bottom region of VRAM was allocated as GTT, unfortunately > >>> a small region of bottom VRAM was encroached by UMC firmware during > >>> GDDR6 BIST training, this cause pagefault. > >> What I'm missing here is why is the stolen size zero on the 2nd GPU? > >> > >> Maybe we need to read the stole
Re: [PATCH] drm/amdgpu: fix modprobe failure of the 2nd GPU when GDDR6 training enabled
Hi Rico, maybe it is a good idea to look into the git history and/or google the mailing list history a bit more. I do briefly remember that we disabled freeing up the stolen VGA memory on some hardware generations because somebody was accessing that memory even after VGA was turned off. At that time we couldn't figure out what was going wrong, but it is perfectly possible that those memory training fixes your are working on here are related to that issue. On the other hand if you can't find anything immediately feel free to go with Alex suggestion, if something goes wrong we can still revert the change. Regards, Christian. Am 09.01.20 um 04:15 schrieb Yin, Tianci (Rico): [AMD Official Use Only - Internal Distribution Only] Ok, thanks very much Alex! *From:* Alex Deucher *Sent:* Thursday, January 9, 2020 11:12 *To:* Yin, Tianci (Rico) *Cc:* Christian König ; Koenig, Christian ; Long, Gang ; Wang, Kevin(Yang) ; Xu, Feifei ; amd-gfx list ; Tuikov, Luben ; Deucher, Alexander ; Yuan, Xiaojie ; Zhang, Hawking *Subject:* Re: [PATCH] drm/amdgpu: fix modprobe failure of the 2nd GPU when GDDR6 training enabled On Wed, Jan 8, 2020 at 10:07 PM Yin, Tianci (Rico) wrote: > > [AMD Official Use Only - Internal Distribution Only] > > > Thanks Alex and Christian! > > Hi Christian, > > On ASICs with gmc v10, I find amdgpu_bo_late_init() is not invoked, so stolen memory never get free, on other ASICs with gmc v9/v8/v7/v6, stolen memory was freed in gmc_v*_0_late_init(). I don't know why, are there some special reasons or just missed by coding? > Looks like it should be added. Possibly got lost when we merged the navi code from the topic branch. Alex > Thanks! > > Rico > > > From: Christian König > Sent: Wednesday, January 8, 2020 23:04 > To: Alex Deucher ; Koenig, Christian > Cc: Long, Gang ; Wang, Kevin(Yang) ; Xu, Feifei ; Yin, Tianci (Rico) ; amd-gfx list ; Tuikov, Luben ; Deucher, Alexander ; Yuan, Xiaojie ; Zhang, Hawking > Subject: Re: [PATCH] drm/amdgpu: fix modprobe failure of the 2nd GPU when GDDR6 training enabled > > Am 08.01.20 um 15:49 schrieb Alex Deucher: > > On Wed, Jan 8, 2020 at 7:52 AM Christian König wrote: > >> Am 08.01.20 um 13:36 schrieb Tianci Yin: > >>> From: "Tianci.Yin" > >>> > >>> [why] > >>> In dual GPUs scenario, stolen_size is assigned to zero on the 2nd GPU, > >>> then the bottom region of VRAM was allocated as GTT, unfortunately > >>> a small region of bottom VRAM was encroached by UMC firmware during > >>> GDDR6 BIST training, this cause pagefault. > >> What I'm missing here is why is the stolen size zero on the 2nd GPU? > >> > >> Maybe we need to read the stolen size after posting the GPU instead? > > There is no stolen memory on secondary GPUs because there is no pre-OS > > console using that memory. > > Ah! Yeah that makes sense. > > But in this case I would say we should change the patch like the following: > > adev->gmc.stolen_size = min(adev->gmc.stolen_size, > AMDGPU_STOLEN_VGA_DEFAULT_SIZE); > > And in amdgpu_ttm_late_init(): > > /* Can't free the stolen VGA memory when it might be used for memory > training again. */ > if (!adev->fw_vram_usage.mem_train_support) > amdgpu_bo_free_kernel( > > > Regards, > Christian. > > > > > > Alex > > > >> Regards, > >> Christian. > >> > >>> [how] > >>> Forcing stolen_size to 3MB, then the bottom region of VRAM was > >>> allocated as stolen memory, GTT corruption avoid. > >>> The stolen memory of the 2nd GPU will be free in late_init phase, > >>> no memory wasted. > >>> > >>> Change-Id: Icd0ad7de41333282949bb1e3e676c6c307ddd081 > >>> Signed-off-by: Tianci.Yin > >>> --- > >>> drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 6 ++ > >>> drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 21 + > >>> 2 files changed, 27 insertions(+) > >>> > >>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h > >>> index c91dd602d5f1..440b793316df 100644 > >>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h > >>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h > >>> @@ -60,6 +60,11 @@ > >>> */ > >>> #define AMDGPU_GMC_FAULT_TIMEOUT 5000ULL > >>> > >>> +/* > >>> + * Default stolen memory size, 1024 * 768 * 4 > >>> + */ > >&g
Re: [PATCH] drm/amdgpu: fix modprobe failure of the 2nd GPU when GDDR6 training enabled
[AMD Official Use Only - Internal Distribution Only]
Ok, thanks very much Alex!
From: Alex Deucher
Sent: Thursday, January 9, 2020 11:12
To: Yin, Tianci (Rico)
Cc: Christian König ; Koenig, Christian
; Long, Gang ; Wang, Kevin(Yang)
; Xu, Feifei ; amd-gfx list
; Tuikov, Luben ; Deucher,
Alexander ; Yuan, Xiaojie ;
Zhang, Hawking
Subject: Re: [PATCH] drm/amdgpu: fix modprobe failure of the 2nd GPU when GDDR6
training enabled
On Wed, Jan 8, 2020 at 10:07 PM Yin, Tianci (Rico) wrote:
>
> [AMD Official Use Only - Internal Distribution Only]
>
>
> Thanks Alex and Christian!
>
> Hi Christian,
>
> On ASICs with gmc v10, I find amdgpu_bo_late_init() is not invoked, so stolen
> memory never get free, on other ASICs with gmc v9/v8/v7/v6, stolen memory was
> freed in gmc_v*_0_late_init(). I don't know why, are there some special
> reasons or just missed by coding?
>
Looks like it should be added. Possibly got lost when we merged the
navi code from the topic branch.
Alex
> Thanks!
>
> Rico
>
>
> From: Christian König
> Sent: Wednesday, January 8, 2020 23:04
> To: Alex Deucher ; Koenig, Christian
>
> Cc: Long, Gang ; Wang, Kevin(Yang) ;
> Xu, Feifei ; Yin, Tianci (Rico) ;
> amd-gfx list ; Tuikov, Luben
> ; Deucher, Alexander ; Yuan,
> Xiaojie ; Zhang, Hawking
> Subject: Re: [PATCH] drm/amdgpu: fix modprobe failure of the 2nd GPU when
> GDDR6 training enabled
>
> Am 08.01.20 um 15:49 schrieb Alex Deucher:
> > On Wed, Jan 8, 2020 at 7:52 AM Christian König
> > wrote:
> >> Am 08.01.20 um 13:36 schrieb Tianci Yin:
> >>> From: "Tianci.Yin"
> >>>
> >>> [why]
> >>> In dual GPUs scenario, stolen_size is assigned to zero on the 2nd GPU,
> >>> then the bottom region of VRAM was allocated as GTT, unfortunately
> >>> a small region of bottom VRAM was encroached by UMC firmware during
> >>> GDDR6 BIST training, this cause pagefault.
> >> What I'm missing here is why is the stolen size zero on the 2nd GPU?
> >>
> >> Maybe we need to read the stolen size after posting the GPU instead?
> > There is no stolen memory on secondary GPUs because there is no pre-OS
> > console using that memory.
>
> Ah! Yeah that makes sense.
>
> But in this case I would say we should change the patch like the following:
>
> adev->gmc.stolen_size = min(adev->gmc.stolen_size,
> AMDGPU_STOLEN_VGA_DEFAULT_SIZE);
>
> And in amdgpu_ttm_late_init():
>
> /* Can't free the stolen VGA memory when it might be used for memory
> training again. */
> if (!adev->fw_vram_usage.mem_train_support)
> amdgpu_bo_free_kernel(
>
>
> Regards,
> Christian.
>
>
> >
> > Alex
> >
> >> Regards,
> >> Christian.
> >>
> >>> [how]
> >>> Forcing stolen_size to 3MB, then the bottom region of VRAM was
> >>> allocated as stolen memory, GTT corruption avoid.
> >>> The stolen memory of the 2nd GPU will be free in late_init phase,
> >>> no memory wasted.
> >>>
> >>> Change-Id: Icd0ad7de41333282949bb1e3e676c6c307ddd081
> >>> Signed-off-by: Tianci.Yin
> >>> ---
> >>>drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 6 ++
> >>>drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 21 +
> >>>2 files changed, 27 insertions(+)
> >>>
> >>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
> >>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
> >>> index c91dd602d5f1..440b793316df 100644
> >>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
> >>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
> >>> @@ -60,6 +60,11 @@
> >>> */
> >>>#define AMDGPU_GMC_FAULT_TIMEOUT5000ULL
> >>>
> >>> +/*
> >>> + * Default stolen memory size, 1024 * 768 * 4
> >>> + */
> >>> +#define AMDGPU_STOLEN_VGA_DEFAULT_SIZE 0x30
> >>> +
> >>>struct firmware;
> >>>
> >>>/*
> >>> @@ -192,6 +197,7 @@ struct amdgpu_gmc {
> >>>uint32_tsrbm_soft_reset;
> >>>boolprt_warning;
> >>>uint64_tstolen_size;
> >>> + boolstolen_temp_reserved;
> >>>/* apertures */
> >>>u64 shared_aperture_start;
> >>>u64 shared_aperture_end;
> >>>
Re: [PATCH] drm/amdgpu: fix modprobe failure of the 2nd GPU when GDDR6 training enabled
On Wed, Jan 8, 2020 at 10:07 PM Yin, Tianci (Rico) wrote:
>
> [AMD Official Use Only - Internal Distribution Only]
>
>
> Thanks Alex and Christian!
>
> Hi Christian,
>
> On ASICs with gmc v10, I find amdgpu_bo_late_init() is not invoked, so stolen
> memory never get free, on other ASICs with gmc v9/v8/v7/v6, stolen memory was
> freed in gmc_v*_0_late_init(). I don't know why, are there some special
> reasons or just missed by coding?
>
Looks like it should be added. Possibly got lost when we merged the
navi code from the topic branch.
Alex
> Thanks!
>
> Rico
>
>
> From: Christian König
> Sent: Wednesday, January 8, 2020 23:04
> To: Alex Deucher ; Koenig, Christian
>
> Cc: Long, Gang ; Wang, Kevin(Yang) ;
> Xu, Feifei ; Yin, Tianci (Rico) ;
> amd-gfx list ; Tuikov, Luben
> ; Deucher, Alexander ; Yuan,
> Xiaojie ; Zhang, Hawking
> Subject: Re: [PATCH] drm/amdgpu: fix modprobe failure of the 2nd GPU when
> GDDR6 training enabled
>
> Am 08.01.20 um 15:49 schrieb Alex Deucher:
> > On Wed, Jan 8, 2020 at 7:52 AM Christian König
> > wrote:
> >> Am 08.01.20 um 13:36 schrieb Tianci Yin:
> >>> From: "Tianci.Yin"
> >>>
> >>> [why]
> >>> In dual GPUs scenario, stolen_size is assigned to zero on the 2nd GPU,
> >>> then the bottom region of VRAM was allocated as GTT, unfortunately
> >>> a small region of bottom VRAM was encroached by UMC firmware during
> >>> GDDR6 BIST training, this cause pagefault.
> >> What I'm missing here is why is the stolen size zero on the 2nd GPU?
> >>
> >> Maybe we need to read the stolen size after posting the GPU instead?
> > There is no stolen memory on secondary GPUs because there is no pre-OS
> > console using that memory.
>
> Ah! Yeah that makes sense.
>
> But in this case I would say we should change the patch like the following:
>
> adev->gmc.stolen_size = min(adev->gmc.stolen_size,
> AMDGPU_STOLEN_VGA_DEFAULT_SIZE);
>
> And in amdgpu_ttm_late_init():
>
> /* Can't free the stolen VGA memory when it might be used for memory
> training again. */
> if (!adev->fw_vram_usage.mem_train_support)
> amdgpu_bo_free_kernel(
>
>
> Regards,
> Christian.
>
>
> >
> > Alex
> >
> >> Regards,
> >> Christian.
> >>
> >>> [how]
> >>> Forcing stolen_size to 3MB, then the bottom region of VRAM was
> >>> allocated as stolen memory, GTT corruption avoid.
> >>> The stolen memory of the 2nd GPU will be free in late_init phase,
> >>> no memory wasted.
> >>>
> >>> Change-Id: Icd0ad7de41333282949bb1e3e676c6c307ddd081
> >>> Signed-off-by: Tianci.Yin
> >>> ---
> >>>drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 6 ++
> >>>drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 21 +
> >>>2 files changed, 27 insertions(+)
> >>>
> >>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
> >>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
> >>> index c91dd602d5f1..440b793316df 100644
> >>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
> >>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
> >>> @@ -60,6 +60,11 @@
> >>> */
> >>>#define AMDGPU_GMC_FAULT_TIMEOUT5000ULL
> >>>
> >>> +/*
> >>> + * Default stolen memory size, 1024 * 768 * 4
> >>> + */
> >>> +#define AMDGPU_STOLEN_VGA_DEFAULT_SIZE 0x30
> >>> +
> >>>struct firmware;
> >>>
> >>>/*
> >>> @@ -192,6 +197,7 @@ struct amdgpu_gmc {
> >>>uint32_tsrbm_soft_reset;
> >>>boolprt_warning;
> >>>uint64_tstolen_size;
> >>> + boolstolen_temp_reserved;
> >>>/* apertures */
> >>>u64 shared_aperture_start;
> >>>u64 shared_aperture_end;
> >>> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> >>> b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> >>> index 7dc8c068c62a..0c96b67d6ca7 100644
> >>> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> >>> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> >>> @@ -566,6 +566,11 @@ static int gmc_v10_0_late_init(void *handle)
> >>>struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> &
Re: [PATCH] drm/amdgpu: fix modprobe failure of the 2nd GPU when GDDR6 training enabled
[AMD Official Use Only - Internal Distribution Only]
Thanks Alex and Christian!
Hi Christian,
On ASICs with gmc v10, I find amdgpu_bo_late_init() is not invoked, so stolen
memory never get free, on other ASICs with gmc v9/v8/v7/v6, stolen memory was
freed in gmc_v*_0_late_init(). I don't know why, are there some special reasons
or just missed by coding?
Thanks!
Rico
From: Christian König
Sent: Wednesday, January 8, 2020 23:04
To: Alex Deucher ; Koenig, Christian
Cc: Long, Gang ; Wang, Kevin(Yang) ;
Xu, Feifei ; Yin, Tianci (Rico) ;
amd-gfx list ; Tuikov, Luben
; Deucher, Alexander ; Yuan,
Xiaojie ; Zhang, Hawking
Subject: Re: [PATCH] drm/amdgpu: fix modprobe failure of the 2nd GPU when GDDR6
training enabled
Am 08.01.20 um 15:49 schrieb Alex Deucher:
> On Wed, Jan 8, 2020 at 7:52 AM Christian König
> wrote:
>> Am 08.01.20 um 13:36 schrieb Tianci Yin:
>>> From: "Tianci.Yin"
>>>
>>> [why]
>>> In dual GPUs scenario, stolen_size is assigned to zero on the 2nd GPU,
>>> then the bottom region of VRAM was allocated as GTT, unfortunately
>>> a small region of bottom VRAM was encroached by UMC firmware during
>>> GDDR6 BIST training, this cause pagefault.
>> What I'm missing here is why is the stolen size zero on the 2nd GPU?
>>
>> Maybe we need to read the stolen size after posting the GPU instead?
> There is no stolen memory on secondary GPUs because there is no pre-OS
> console using that memory.
Ah! Yeah that makes sense.
But in this case I would say we should change the patch like the following:
adev->gmc.stolen_size = min(adev->gmc.stolen_size,
AMDGPU_STOLEN_VGA_DEFAULT_SIZE);
And in amdgpu_ttm_late_init():
/* Can't free the stolen VGA memory when it might be used for memory
training again. */
if (!adev->fw_vram_usage.mem_train_support)
amdgpu_bo_free_kernel(
Regards,
Christian.
>
> Alex
>
>> Regards,
>> Christian.
>>
>>> [how]
>>> Forcing stolen_size to 3MB, then the bottom region of VRAM was
>>> allocated as stolen memory, GTT corruption avoid.
>>> The stolen memory of the 2nd GPU will be free in late_init phase,
>>> no memory wasted.
>>>
>>> Change-Id: Icd0ad7de41333282949bb1e3e676c6c307ddd081
>>> Signed-off-by: Tianci.Yin
>>> ---
>>>drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 6 ++
>>>drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 21 +
>>>2 files changed, 27 insertions(+)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
>>> index c91dd602d5f1..440b793316df 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
>>> @@ -60,6 +60,11 @@
>>> */
>>>#define AMDGPU_GMC_FAULT_TIMEOUT5000ULL
>>>
>>> +/*
>>> + * Default stolen memory size, 1024 * 768 * 4
>>> + */
>>> +#define AMDGPU_STOLEN_VGA_DEFAULT_SIZE 0x30
>>> +
>>>struct firmware;
>>>
>>>/*
>>> @@ -192,6 +197,7 @@ struct amdgpu_gmc {
>>>uint32_tsrbm_soft_reset;
>>>boolprt_warning;
>>>uint64_tstolen_size;
>>> + boolstolen_temp_reserved;
>>>/* apertures */
>>>u64 shared_aperture_start;
>>>u64 shared_aperture_end;
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
>>> b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
>>> index 7dc8c068c62a..0c96b67d6ca7 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
>>> @@ -566,6 +566,11 @@ static int gmc_v10_0_late_init(void *handle)
>>>struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>>>int r;
>>>
>>> + if (adev->gmc.stolen_temp_reserved) {
>>> + amdgpu_bo_late_init(adev);
>>> + adev->gmc.stolen_temp_reserved = false;
>>> + }
>>> +
>>>r = amdgpu_gmc_allocate_vm_inv_eng(adev);
>>>if (r)
>>>return r;
>>> @@ -756,6 +761,22 @@ static int gmc_v10_0_sw_init(void *handle)
>>>return r;
>>>
>>>adev->gmc.stolen_size = gmc_v10_0_get_vbios_fb_size(adev);
>>> + /*
>>> + * In dual GPUs scenario, stolen_size is assigned to zero on the 2nd
>>> GPU,
>>
Re: [PATCH] drm/amdgpu: fix modprobe failure of the 2nd GPU when GDDR6 training enabled
Am 08.01.20 um 15:49 schrieb Alex Deucher:
On Wed, Jan 8, 2020 at 7:52 AM Christian König wrote:
Am 08.01.20 um 13:36 schrieb Tianci Yin:
From: "Tianci.Yin"
[why]
In dual GPUs scenario, stolen_size is assigned to zero on the 2nd GPU,
then the bottom region of VRAM was allocated as GTT, unfortunately
a small region of bottom VRAM was encroached by UMC firmware during
GDDR6 BIST training, this cause pagefault.
What I'm missing here is why is the stolen size zero on the 2nd GPU?
Maybe we need to read the stolen size after posting the GPU instead?
There is no stolen memory on secondary GPUs because there is no pre-OS
console using that memory.
Ah! Yeah that makes sense.
But in this case I would say we should change the patch like the following:
adev->gmc.stolen_size = min(adev->gmc.stolen_size,
AMDGPU_STOLEN_VGA_DEFAULT_SIZE);
And in amdgpu_ttm_late_init():
/* Can't free the stolen VGA memory when it might be used for memory
training again. */
if (!adev->fw_vram_usage.mem_train_support)
amdgpu_bo_free_kernel(
Regards,
Christian.
Alex
Regards,
Christian.
[how]
Forcing stolen_size to 3MB, then the bottom region of VRAM was
allocated as stolen memory, GTT corruption avoid.
The stolen memory of the 2nd GPU will be free in late_init phase,
no memory wasted.
Change-Id: Icd0ad7de41333282949bb1e3e676c6c307ddd081
Signed-off-by: Tianci.Yin
---
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 6 ++
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 21 +
2 files changed, 27 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
index c91dd602d5f1..440b793316df 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
@@ -60,6 +60,11 @@
*/
#define AMDGPU_GMC_FAULT_TIMEOUT5000ULL
+/*
+ * Default stolen memory size, 1024 * 768 * 4
+ */
+#define AMDGPU_STOLEN_VGA_DEFAULT_SIZE 0x30
+
struct firmware;
/*
@@ -192,6 +197,7 @@ struct amdgpu_gmc {
uint32_tsrbm_soft_reset;
boolprt_warning;
uint64_tstolen_size;
+ boolstolen_temp_reserved;
/* apertures */
u64 shared_aperture_start;
u64 shared_aperture_end;
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
index 7dc8c068c62a..0c96b67d6ca7 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
@@ -566,6 +566,11 @@ static int gmc_v10_0_late_init(void *handle)
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
int r;
+ if (adev->gmc.stolen_temp_reserved) {
+ amdgpu_bo_late_init(adev);
+ adev->gmc.stolen_temp_reserved = false;
+ }
+
r = amdgpu_gmc_allocate_vm_inv_eng(adev);
if (r)
return r;
@@ -756,6 +761,22 @@ static int gmc_v10_0_sw_init(void *handle)
return r;
adev->gmc.stolen_size = gmc_v10_0_get_vbios_fb_size(adev);
+ /*
+ * In dual GPUs scenario, stolen_size is assigned to zero on the 2nd GPU,
+ * then the bottom region of VRAM was allocated as GTT, unfortunately
+ * a small region of bottom VRAM was encroached by UMC firmware during
+ * GDDR6 BIST training, this cause pagefault.
+ * The page fault can be fixed by forcing stolen_size to 3MB, then the
bottom
+ * region of VRAM was allocated as stolen memory, GTT corruption avoid.
+ * The stolen memory of the 2nd GPU will be free in late_init phase,
+ * no memory wasted.
+ */
+ if (adev->fw_vram_usage.mem_train_support &&
+ adev->gmc.stolen_size == 0) {
+ adev->gmc.stolen_size = AMDGPU_STOLEN_VGA_DEFAULT_SIZE;
+ adev->gmc.stolen_temp_reserved = true;
+ } else
+ adev->gmc.stolen_temp_reserved = false;
/* Memory manager */
r = amdgpu_bo_init(adev);
___
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
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH] drm/amdgpu: fix modprobe failure of the 2nd GPU when GDDR6 training enabled
On Wed, Jan 8, 2020 at 7:52 AM Christian König wrote:
>
> Am 08.01.20 um 13:36 schrieb Tianci Yin:
> > From: "Tianci.Yin"
> >
> > [why]
> > In dual GPUs scenario, stolen_size is assigned to zero on the 2nd GPU,
> > then the bottom region of VRAM was allocated as GTT, unfortunately
> > a small region of bottom VRAM was encroached by UMC firmware during
> > GDDR6 BIST training, this cause pagefault.
>
> What I'm missing here is why is the stolen size zero on the 2nd GPU?
>
> Maybe we need to read the stolen size after posting the GPU instead?
There is no stolen memory on secondary GPUs because there is no pre-OS
console using that memory.
Alex
>
> Regards,
> Christian.
>
> >
> > [how]
> > Forcing stolen_size to 3MB, then the bottom region of VRAM was
> > allocated as stolen memory, GTT corruption avoid.
> > The stolen memory of the 2nd GPU will be free in late_init phase,
> > no memory wasted.
> >
> > Change-Id: Icd0ad7de41333282949bb1e3e676c6c307ddd081
> > Signed-off-by: Tianci.Yin
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 6 ++
> > drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 21 +
> > 2 files changed, 27 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
> > index c91dd602d5f1..440b793316df 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
> > @@ -60,6 +60,11 @@
> >*/
> > #define AMDGPU_GMC_FAULT_TIMEOUT5000ULL
> >
> > +/*
> > + * Default stolen memory size, 1024 * 768 * 4
> > + */
> > +#define AMDGPU_STOLEN_VGA_DEFAULT_SIZE 0x30
> > +
> > struct firmware;
> >
> > /*
> > @@ -192,6 +197,7 @@ struct amdgpu_gmc {
> > uint32_tsrbm_soft_reset;
> > boolprt_warning;
> > uint64_tstolen_size;
> > + boolstolen_temp_reserved;
> > /* apertures */
> > u64 shared_aperture_start;
> > u64 shared_aperture_end;
> > diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> > b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> > index 7dc8c068c62a..0c96b67d6ca7 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> > @@ -566,6 +566,11 @@ static int gmc_v10_0_late_init(void *handle)
> > struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> > int r;
> >
> > + if (adev->gmc.stolen_temp_reserved) {
> > + amdgpu_bo_late_init(adev);
> > + adev->gmc.stolen_temp_reserved = false;
> > + }
> > +
> > r = amdgpu_gmc_allocate_vm_inv_eng(adev);
> > if (r)
> > return r;
> > @@ -756,6 +761,22 @@ static int gmc_v10_0_sw_init(void *handle)
> > return r;
> >
> > adev->gmc.stolen_size = gmc_v10_0_get_vbios_fb_size(adev);
> > + /*
> > + * In dual GPUs scenario, stolen_size is assigned to zero on the 2nd
> > GPU,
> > + * then the bottom region of VRAM was allocated as GTT, unfortunately
> > + * a small region of bottom VRAM was encroached by UMC firmware during
> > + * GDDR6 BIST training, this cause pagefault.
> > + * The page fault can be fixed by forcing stolen_size to 3MB, then
> > the bottom
> > + * region of VRAM was allocated as stolen memory, GTT corruption
> > avoid.
> > + * The stolen memory of the 2nd GPU will be free in late_init phase,
> > + * no memory wasted.
> > + */
> > + if (adev->fw_vram_usage.mem_train_support &&
> > + adev->gmc.stolen_size == 0) {
> > + adev->gmc.stolen_size = AMDGPU_STOLEN_VGA_DEFAULT_SIZE;
> > + adev->gmc.stolen_temp_reserved = true;
> > + } else
> > + adev->gmc.stolen_temp_reserved = false;
> >
> > /* Memory manager */
> > r = amdgpu_bo_init(adev);
>
> ___
> 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
Re: [PATCH] drm/amdgpu: fix modprobe failure of the 2nd GPU when GDDR6 training enabled
Am 08.01.20 um 13:36 schrieb Tianci Yin:
From: "Tianci.Yin"
[why]
In dual GPUs scenario, stolen_size is assigned to zero on the 2nd GPU,
then the bottom region of VRAM was allocated as GTT, unfortunately
a small region of bottom VRAM was encroached by UMC firmware during
GDDR6 BIST training, this cause pagefault.
What I'm missing here is why is the stolen size zero on the 2nd GPU?
Maybe we need to read the stolen size after posting the GPU instead?
Regards,
Christian.
[how]
Forcing stolen_size to 3MB, then the bottom region of VRAM was
allocated as stolen memory, GTT corruption avoid.
The stolen memory of the 2nd GPU will be free in late_init phase,
no memory wasted.
Change-Id: Icd0ad7de41333282949bb1e3e676c6c307ddd081
Signed-off-by: Tianci.Yin
---
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 6 ++
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 21 +
2 files changed, 27 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
index c91dd602d5f1..440b793316df 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
@@ -60,6 +60,11 @@
*/
#define AMDGPU_GMC_FAULT_TIMEOUT 5000ULL
+/*
+ * Default stolen memory size, 1024 * 768 * 4
+ */
+#define AMDGPU_STOLEN_VGA_DEFAULT_SIZE 0x30
+
struct firmware;
/*
@@ -192,6 +197,7 @@ struct amdgpu_gmc {
uint32_tsrbm_soft_reset;
boolprt_warning;
uint64_tstolen_size;
+ boolstolen_temp_reserved;
/* apertures */
u64 shared_aperture_start;
u64 shared_aperture_end;
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
index 7dc8c068c62a..0c96b67d6ca7 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
@@ -566,6 +566,11 @@ static int gmc_v10_0_late_init(void *handle)
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
int r;
+ if (adev->gmc.stolen_temp_reserved) {
+ amdgpu_bo_late_init(adev);
+ adev->gmc.stolen_temp_reserved = false;
+ }
+
r = amdgpu_gmc_allocate_vm_inv_eng(adev);
if (r)
return r;
@@ -756,6 +761,22 @@ static int gmc_v10_0_sw_init(void *handle)
return r;
adev->gmc.stolen_size = gmc_v10_0_get_vbios_fb_size(adev);
+ /*
+* In dual GPUs scenario, stolen_size is assigned to zero on the 2nd
GPU,
+* then the bottom region of VRAM was allocated as GTT, unfortunately
+* a small region of bottom VRAM was encroached by UMC firmware during
+* GDDR6 BIST training, this cause pagefault.
+* The page fault can be fixed by forcing stolen_size to 3MB, then the
bottom
+* region of VRAM was allocated as stolen memory, GTT corruption avoid.
+* The stolen memory of the 2nd GPU will be free in late_init phase,
+* no memory wasted.
+*/
+ if (adev->fw_vram_usage.mem_train_support &&
+ adev->gmc.stolen_size == 0) {
+ adev->gmc.stolen_size = AMDGPU_STOLEN_VGA_DEFAULT_SIZE;
+ adev->gmc.stolen_temp_reserved = true;
+ } else
+ adev->gmc.stolen_temp_reserved = false;
/* Memory manager */
r = amdgpu_bo_init(adev);
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[PATCH] drm/amdgpu: fix modprobe failure of the 2nd GPU when GDDR6 training enabled
From: "Tianci.Yin"
[why]
In dual GPUs scenario, stolen_size is assigned to zero on the 2nd GPU,
then the bottom region of VRAM was allocated as GTT, unfortunately
a small region of bottom VRAM was encroached by UMC firmware during
GDDR6 BIST training, this cause pagefault.
[how]
Forcing stolen_size to 3MB, then the bottom region of VRAM was
allocated as stolen memory, GTT corruption avoid.
The stolen memory of the 2nd GPU will be free in late_init phase,
no memory wasted.
Change-Id: Icd0ad7de41333282949bb1e3e676c6c307ddd081
Signed-off-by: Tianci.Yin
---
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 6 ++
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 21 +
2 files changed, 27 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
index c91dd602d5f1..440b793316df 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
@@ -60,6 +60,11 @@
*/
#define AMDGPU_GMC_FAULT_TIMEOUT 5000ULL
+/*
+ * Default stolen memory size, 1024 * 768 * 4
+ */
+#define AMDGPU_STOLEN_VGA_DEFAULT_SIZE 0x30
+
struct firmware;
/*
@@ -192,6 +197,7 @@ struct amdgpu_gmc {
uint32_tsrbm_soft_reset;
boolprt_warning;
uint64_tstolen_size;
+ boolstolen_temp_reserved;
/* apertures */
u64 shared_aperture_start;
u64 shared_aperture_end;
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
index 7dc8c068c62a..0c96b67d6ca7 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
@@ -566,6 +566,11 @@ static int gmc_v10_0_late_init(void *handle)
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
int r;
+ if (adev->gmc.stolen_temp_reserved) {
+ amdgpu_bo_late_init(adev);
+ adev->gmc.stolen_temp_reserved = false;
+ }
+
r = amdgpu_gmc_allocate_vm_inv_eng(adev);
if (r)
return r;
@@ -756,6 +761,22 @@ static int gmc_v10_0_sw_init(void *handle)
return r;
adev->gmc.stolen_size = gmc_v10_0_get_vbios_fb_size(adev);
+ /*
+* In dual GPUs scenario, stolen_size is assigned to zero on the 2nd
GPU,
+* then the bottom region of VRAM was allocated as GTT, unfortunately
+* a small region of bottom VRAM was encroached by UMC firmware during
+* GDDR6 BIST training, this cause pagefault.
+* The page fault can be fixed by forcing stolen_size to 3MB, then the
bottom
+* region of VRAM was allocated as stolen memory, GTT corruption avoid.
+* The stolen memory of the 2nd GPU will be free in late_init phase,
+* no memory wasted.
+*/
+ if (adev->fw_vram_usage.mem_train_support &&
+ adev->gmc.stolen_size == 0) {
+ adev->gmc.stolen_size = AMDGPU_STOLEN_VGA_DEFAULT_SIZE;
+ adev->gmc.stolen_temp_reserved = true;
+ } else
+ adev->gmc.stolen_temp_reserved = false;
/* Memory manager */
r = amdgpu_bo_init(adev);
--
2.17.1
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
