drm/amdgpu: Fixup bad vram size on gmc v6 and v7
Subsystems (2)
PATCH 1/1 drm/amdgpu: Fixup bad vram size on gmc v6 and v7
Some boards(like Oland PRO: 0x1002:0x6613) seem to have garbage in the upper 16 bits of the vram size register, kern log as follows:
[ 6.000000] [drm] Detected VRAM RAM=2256537600M, BAR=256M [ 6.007812] [drm] RAM width 64bits GDDR5 [ 6.031250] [drm] amdgpu: 2256537600M of VRAM memory ready
This is obviously not true, check for this and clamp the size properly. Fixes boards reporting bogus amounts of vram, kern log as follows:
[ 2.789062] [drm] Probable bad vram size: 0x86800800 [ 2.789062] [drm] Detected VRAM RAM=2048M, BAR=256M [ 2.789062] [drm] RAM width 64bits GDDR5 [ 2.789062] [drm] amdgpu: 2048M of VRAM memory ready
--- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 11 +++++++++-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 13 ++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +9 -2
@@ -309,8 +309,15 @@ static int gmc_v6_0_mc_init(struct amdgpu_device *adev) } adev->gmc.vram_width = numchan * chansize;/* size in MB on si */ - adev->gmc.mc_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; - adev->gmc.real_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; + tmp =RREG32 (mmCONFIG_MEMSIZE); +/* some boards may have garbage in the upper 16 bits */ +if (tmp &0xffff0000 ) { +DRM_INFO ("Probable bad vram size: 0x%08x\n" , tmp); +if (tmp &0xffff ) + tmp &=0xffff ; + } + adev->gmc.mc_vram_size = tmp *1024ULL *1024ULL ; + adev->gmc.real_vram_size = adev->gmc.mc_vram_size;if (!(adev->flags &AMD_IS_APU )) { r =amdgpu_device_resize_fb_bar (adev);
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +10 -3
@@ -316,10 +316,10 @@ static void gmc_v7_0_mc_program(struct amdgpu_device *adev)static int gmc_v7_0_mc_init (struct amdgpu_device *adev) {int r; +u32 tmp; adev->gmc.vram_width =amdgpu_atombios_get_vram_width (adev);if (!adev->gmc.vram_width) { -u32 tmp;int chansize, numchan;/* Get VRAM informations */
@@ -363,8 +363,15 @@ static int gmc_v7_0_mc_init(struct amdgpu_device *adev) adev->gmc.vram_width = numchan * chansize; }/* size in MB on si */ - adev->gmc.mc_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; - adev->gmc.real_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; + tmp =RREG32 (mmCONFIG_MEMSIZE); +/* some boards may have garbage in the upper 16 bits */ +if (tmp &0xffff0000 ) { +DRM_INFO ("Probable bad vram size: 0x%08x\n" , tmp); +if (tmp &0xffff ) + tmp &=0xffff ; + } + adev->gmc.mc_vram_size = tmp *1024ULL *1024ULL ; + adev->gmc.real_vram_size = adev->gmc.mc_vram_size;if (!(adev->flags &AMD_IS_APU )) { r =amdgpu_device_resize_fb_bar (adev);
Signature · 1 line
2.20.1
Christian König
maintainerAm 22.04.24 um 07:26 schrieb Qiang Ma:
Quoted 8 lines
Some boards(like Oland PRO: 0x1002:0x6613) seem to have garbage in the upper 16 bits of the vram size register, kern log as follows:
[ 6.000000] [drm] Detected VRAM RAM=2256537600M, BAR=256M [ 6.007812] [drm] RAM width 64bits GDDR5 [ 6.031250] [drm] amdgpu: 2256537600M of VRAM memory ready
Quoted 8 lines
This is obviously not true, check for this and clamp the size properly. Fixes boards reporting bogus amounts of vram, kern log as follows:
[ 2.789062] [drm] Probable bad vram size: 0x86800800 [ 2.789062] [drm] Detected VRAM RAM=2048M, BAR=256M [ 2.789062] [drm] RAM width 64bits GDDR5 [ 2.789062] [drm] amdgpu: 2048M of VRAM memory ready
Well we had patches like this one here before and so far we always rejected them.
When the mmCONFIG_MEMSIZE register isn't properly initialized then there is something wrong with your hardware.
Working around that in the software driver is not going to fly.
Regards,
Christian.
Quoted 62 lines
Signed-off-by Qiang Ma <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 11 +++++++++-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 13 ++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-)drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +9
-2@@ -309,8 +309,15 @@ static int gmc_v6_0_mc_init(struct amdgpu_device *adev) } adev->gmc.vram_width = numchan * chansize;/* size in MB on si */ - adev->gmc.mc_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; - adev->gmc.real_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; + tmp =RREG32 (mmCONFIG_MEMSIZE); +/* some boards may have garbage in the upper 16 bits */ +if (tmp &0xffff0000 ) { +DRM_INFO ("Probable bad vram size: 0x%08x\n" , tmp); +if (tmp &0xffff ) + tmp &=0xffff ; + } + adev->gmc.mc_vram_size = tmp *1024ULL *1024ULL ; + adev->gmc.real_vram_size = adev->gmc.mc_vram_size;if (!(adev->flags &AMD_IS_APU )) { r =amdgpu_device_resize_fb_bar (adev);drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +10
-3@@ -316,10 +316,10 @@ static void gmc_v7_0_mc_program(struct amdgpu_device *adev)static int gmc_v7_0_mc_init (struct amdgpu_device *adev) {int r; +u32 tmp; adev->gmc.vram_width =amdgpu_atombios_get_vram_width (adev);if (!adev->gmc.vram_width) { -u32 tmp;int chansize, numchan;/* Get VRAM informations */ @@ -363,8 +363,15 @@ static int gmc_v7_0_mc_init(struct amdgpu_device *adev) adev->gmc.vram_width = numchan * chansize; }/* size in MB on si */ - adev->gmc.mc_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; - adev->gmc.real_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; + tmp =RREG32 (mmCONFIG_MEMSIZE); +/* some boards may have garbage in the upper 16 bits */ +if (tmp &0xffff0000 ) { +DRM_INFO ("Probable bad vram size: 0x%08x\n" , tmp); +if (tmp &0xffff ) + tmp &=0xffff ; + } + adev->gmc.mc_vram_size = tmp *1024ULL *1024ULL ; + adev->gmc.real_vram_size = adev->gmc.mc_vram_size;if (!(adev->flags &AMD_IS_APU )) { r =amdgpu_device_resize_fb_bar (adev);
Quoted 21 lines · On Mon, 22 Apr 2024 11:40:26 +0200 Christian König <[email protected]>…
Am 22.04.24 um 07:26 schrieb Qiang Ma:
Quoted 8 lines
Some boards(like Oland PRO: 0x1002:0x6613) seem to have garbage in the upper 16 bits of the vram size register, kern log as follows:
[ 6.000000] [drm] Detected VRAM RAM=2256537600M, BAR=256M [ 6.007812] [drm] RAM width 64bits GDDR5 [ 6.031250] [drm] amdgpu: 2256537600M of VRAM memory readyQuoted 8 lines
This is obviously not true, check for this and clamp the size properly. Fixes boards reporting bogus amounts of vram, kern log as follows:
[ 2.789062] [drm] Probable bad vram size: 0x86800800 [ 2.789062] [drm] Detected VRAM RAM=2048M, BAR=256M [ 2.789062] [drm] RAM width 64bits GDDR5 [ 2.789062] [drm] amdgpu: 2048M of VRAM memory readyWell we had patches like this one here before and so far we always rejected them.
Quoted 8 lines
When the
mmCONFIG_MEMSIZEregister isn't properly initialized then there is something wrong with your hardware.Working around that in the software driver is not going to fly.
Regards,
Christian.
Hi Christian:
I see that two patches for this issue have been merged, and the patches are as follows:
11544d77e397 drm/amdgpu: fixup bad vram size on gmc v8 0ca223b029a2 drm/radeon: fixup bad vram size on SI
Qiang Ma
Quoted 68 lines
Quoted 66 lines
Signed-off-by Qiang Ma <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 11 +++++++++-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 13 ++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.cindex23b478639921..3703695f7789100644 ---a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c+++b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c@@ -309,8 +309,15 @@ static intgmc_v6_0_mc_init(struct amdgpu_device *adev)}
adev->gmc.vram_width= numchan * chansize;
/* size in MB on si */(quoted diff) +0
-1- adev->gmc.mc_vram_size = RREG32(mmCONFIG_MEMSIZE) *1024ULL * 1024ULL;
(quoted diff) +0
-1- adev->gmc.real_vram_size = RREG32(mmCONFIG_MEMSIZE) *1024ULL * 1024ULL;
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +9
-0+ tmp =RREG32 (mmCONFIG_MEMSIZE); +/* some boards may have garbage in the upper 16 bits */ +if (tmp &0xffff0000 ) { +DRM_INFO ("Probable bad vram size: 0x%08x\n" , tmp); +if (tmp &0xffff ) + tmp &=0xffff ; + } + adev->gmc.mc_vram_size = tmp *1024ULL *1024ULL ; + adev->gmc.real_vram_size = adev->gmc.mc_vram_size;if (!(adev->flags &AMD_IS_APU )) { r =amdgpu_device_resize_fb_bar (adev);(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.cindex3da7b6a2b00d..1df1fc578ff6100644 ---a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c+++b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c@@ -316,10 +316,10 @@ static voidgmc_v7_0_mc_program(struct amdgpu_device *adev)static intgmc_v7_0_mc_init(struct amdgpu_device *adev){
int r;drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +1
-0+u32 tmp; adev->gmc.vram_width =
amdgpu_atombios_get_vram_width(adev); if (!adev->gmc.vram_width) {drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +9
-3-u32 tmp;int chansize, numchan;/* Get VRAM informations */ @@ -363,8 +363,15 @@ static int gmc_v7_0_mc_init(struct amdgpu_device *adev) adev->gmc.vram_width = numchan * chansize; }/* size in MB on si */ - adev->gmc.mc_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; - adev->gmc.real_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; + tmp =RREG32 (mmCONFIG_MEMSIZE); +/* some boards may have garbage in the upper 16 bits */ +if (tmp &0xffff0000 ) { +DRM_INFO ("Probable bad vram size: 0x%08x\n" , tmp); +if (tmp &0xffff ) + tmp &=0xffff ; + } + adev->gmc.mc_vram_size = tmp *1024ULL *1024ULL ; + adev->gmc.real_vram_size = adev->gmc.mc_vram_size;if (!(adev->flags & AMD_IS_APU)) { r = amdgpu_device_resize_fb_bar(adev);
Christian König
maintainerAm 22.04.24 um 14:33 schrieb Qiang Ma:
Quoted 31 lines
Quoted 20 lines · On Mon, 22 Apr 2024 11:40:26 +0200 Christian König <[email protected]>…
Am 22.04.24 um 07:26 schrieb Qiang Ma:
Quoted 8 lines
Some boards(like Oland PRO: 0x1002:0x6613) seem to have garbage in the upper 16 bits of the vram size register, kern log as follows:
[ 6.000000] [drm] Detected VRAM RAM=2256537600M, BAR=256M [ 6.007812] [drm] RAM width 64bits GDDR5 [ 6.031250] [drm] amdgpu: 2256537600M of VRAM memory readyQuoted 8 lines
This is obviously not true, check for this and clamp the size properly. Fixes boards reporting bogus amounts of vram, kern log as follows:
[ 2.789062] [drm] Probable bad vram size: 0x86800800 [ 2.789062] [drm] Detected VRAM RAM=2048M, BAR=256M [ 2.789062] [drm] RAM width 64bits GDDR5 [ 2.789062] [drm] amdgpu: 2048M of VRAM memory readyWell we had patches like this one here before and so far we always rejected them.
Quoted 8 lines
When the
mmCONFIG_MEMSIZEregister isn't properly initialized then there is something wrong with your hardware.Working around that in the software driver is not going to fly.
Regards,
Christian.
Quoted 6 lines
Hi Christian:
I see that two patches for this issue have been merged, and the patches are as follows:
11544d77e397drm/amdgpu: fixup bad vram size on gmc v80ca223b029a2drm/radeon: fixup bad vram size on SI
Mhm, I remember that we discussed reverting those but it looks like that never happened. I need to ask around internally.
Question is do you see any other problems with the board? E.g. incorrect connector or harvesting configuration?
Regards,
Christian.
Quoted 70 lines
Qiang Ma
Quoted 67 lines
Quoted 66 lines
Signed-off-by Qiang Ma <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 11 +++++++++-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 13 ++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.cindex23b478639921..3703695f7789100644 ---a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c+++b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c@@ -309,8 +309,15 @@ static intgmc_v6_0_mc_init(struct amdgpu_device *adev)}adev->gmc.vram_width = numchan * chansize; /* size in MB on si */(quoted diff) +0
-1- adev->gmc.mc_vram_size = RREG32(mmCONFIG_MEMSIZE) *1024ULL * 1024ULL;
(quoted diff) +0
-1- adev->gmc.real_vram_size = RREG32(mmCONFIG_MEMSIZE) *1024ULL * 1024ULL;
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +9
-0+ tmp =RREG32 (mmCONFIG_MEMSIZE); +/* some boards may have garbage in the upper 16 bits */ +if (tmp &0xffff0000 ) { +DRM_INFO ("Probable bad vram size: 0x%08x\n" , tmp); +if (tmp &0xffff ) + tmp &=0xffff ; + } + adev->gmc.mc_vram_size = tmp *1024ULL *1024ULL ; + adev->gmc.real_vram_size = adev->gmc.mc_vram_size;if (!(adev->flags &AMD_IS_APU )) { r =amdgpu_device_resize_fb_bar (adev);(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.cindex3da7b6a2b00d..1df1fc578ff6100644 ---a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c+++b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c@@ -316,10 +316,10 @@ static voidgmc_v7_0_mc_program(struct amdgpu_device *adev)staticint gmc_v7_0_mc_init(struct amdgpu_device *adev) { int r;drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +1
-0+u32 tmp; adev->gmc.vram_width =
amdgpu_atombios_get_vram_width(adev); if (!adev->gmc.vram_width) {drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +9
-3-u32 tmp;int chansize, numchan;/* Get VRAM informations */ @@ -363,8 +363,15 @@ static int gmc_v7_0_mc_init(struct amdgpu_device *adev) adev->gmc.vram_width = numchan * chansize; }/* size in MB on si */ - adev->gmc.mc_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; - adev->gmc.real_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; + tmp =RREG32 (mmCONFIG_MEMSIZE); +/* some boards may have garbage in the upper 16 bits */ +if (tmp &0xffff0000 ) { +DRM_INFO ("Probable bad vram size: 0x%08x\n" , tmp); +if (tmp &0xffff ) + tmp &=0xffff ; + } + adev->gmc.mc_vram_size = tmp *1024ULL *1024ULL ; + adev->gmc.real_vram_size = adev->gmc.mc_vram_size;if (!(adev->flags & AMD_IS_APU)) { r = amdgpu_device_resize_fb_bar(adev);
Quoted 39 lines · On Mon, 22 Apr 2024 14:59:36 +0200 Christian König <[email protected]>…
Am 22.04.24 um 14:33 schrieb Qiang Ma:
Quoted 31 lines
Quoted 20 lines · On Mon, 22 Apr 2024 11:40:26 +0200 Christian König <[email protected]>…
Am 22.04.24 um 07:26 schrieb Qiang Ma:
Quoted 8 lines
Some boards(like Oland PRO: 0x1002:0x6613) seem to have garbage in the upper 16 bits of the vram size register, kern log as follows:
[ 6.000000] [drm] Detected VRAM RAM=2256537600M, BAR=256M [ 6.007812] [drm] RAM width 64bits GDDR5 [ 6.031250] [drm] amdgpu: 2256537600M of VRAM memory readyQuoted 8 lines
This is obviously not true, check for this and clamp the size properly. Fixes boards reporting bogus amounts of vram, kern log as follows:
[ 2.789062] [drm] Probable bad vram size: 0x86800800 [ 2.789062] [drm] Detected VRAM RAM=2048M, BAR=256M [ 2.789062] [drm] RAM width 64bits GDDR5 [ 2.789062] [drm] amdgpu: 2048M of VRAM memory readyWell we had patches like this one here before and so far we always rejected them.
Quoted 8 lines
When the
mmCONFIG_MEMSIZEregister isn't properly initialized then there is something wrong with your hardware.Working around that in the software driver is not going to fly.
Regards,
Christian.Quoted 6 lines
Hi Christian:
I see that two patches for this issue have been merged, and the patches are as follows:
11544d77e397drm/amdgpu: fixup bad vram size on gmc v80ca223b029a2drm/radeon: fixup bad vram size on SI
Quoted 9 lines
Mhm, I remember that we discussed reverting those but it looks like that never happened. I need to ask around internally.
Question is do you see any other problems with the board? E.g. incorrect connector or harvesting configuration?
Regards,
Christian.
At present, no other problems have been found. Configured as radeon driver, display is normal.
But this problem is found when I switch to amdgpu driver, and the startup fails with black screen.
After add the patch, the startup was successful, display is normal.
Qiang Ma
Quoted 74 lines
Quoted 72 lines
Qiang Ma
Quoted 69 lines
Quoted 68 lines
Signed-off-by Qiang Ma <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 11 +++++++++-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 13 ++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.cindex23b478639921..3703695f7789100644 ---a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c+++b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c@@ -309,8 +309,15 @@ static intgmc_v6_0_mc_init(struct amdgpu_device *adev)}adev->gmc.vram_width = numchan * chansize; /* size in MB on si */(quoted diff) +0
-1- adev->gmc.mc_vram_size = RREG32(mmCONFIG_MEMSIZE) *1024ULL * 1024ULL;
(quoted diff) +0
-1- adev->gmc.real_vram_size = RREG32(mmCONFIG_MEMSIZE) *1024ULL * 1024ULL;
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +4
-0+ tmp =RREG32 (mmCONFIG_MEMSIZE); +/* some boards may have garbage in the upper 16 bits */ +if (tmp &0xffff0000 ) { + DRM_INFO("Probable bad vram size: 0x%08x\n",tmp);
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +5
-0+if (tmp &0xffff ) + tmp &=0xffff ; + } + adev->gmc.mc_vram_size = tmp *1024ULL *1024ULL ; + adev->gmc.real_vram_size = adev->gmc.mc_vram_size;if (!(adev->flags &AMD_IS_APU )) { r =amdgpu_device_resize_fb_bar (adev);(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.cindex3da7b6a2b00d..1df1fc578ff6100644 ---a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c+++b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c@@ -316,10 +316,10 @@ static voidgmc_v7_0_mc_program(struct amdgpu_device *adev)staticint gmc_v7_0_mc_init(struct amdgpu_device *adev) { int r;drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +1
-0+u32 tmp; adev->gmc.vram_width =
amdgpu_atombios_get_vram_width(adev); if (!adev->gmc.vram_width) {drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +9
-3-u32 tmp;int chansize, numchan;/* Get VRAM informations */ @@ -363,8 +363,15 @@ static int gmc_v7_0_mc_init(struct amdgpu_device *adev) adev->gmc.vram_width = numchan * chansize; }/* size in MB on si */ - adev->gmc.mc_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; - adev->gmc.real_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; + tmp =RREG32 (mmCONFIG_MEMSIZE); +/* some boards may have garbage in the upper 16 bits */ +if (tmp &0xffff0000 ) { +DRM_INFO ("Probable bad vram size: 0x%08x\n" , tmp); +if (tmp &0xffff ) + tmp &=0xffff ; + } + adev->gmc.mc_vram_size = tmp *1024ULL *1024ULL ; + adev->gmc.real_vram_size = adev->gmc.mc_vram_size;if (!(adev->flags & AMD_IS_APU)) { r = amdgpu_device_resize_fb_bar(adev);
Quoted 37 lines · Christian König
Am 22.04.24 um 14:33 schrieb Qiang Ma:
Quoted 35 lines
Quoted 20 lines · On Mon, 22 Apr 2024 11:40:26 +0200 Christian König <[email protected]>…
Am 22.04.24 um 07:26 schrieb Qiang Ma:
Quoted 8 lines
Some boards(like Oland PRO: 0x1002:0x6613) seem to have garbage in the upper 16 bits of the vram size register, kern log as follows:
[ 6.000000] [drm] Detected VRAM RAM=2256537600M, BAR=256M [ 6.007812] [drm] RAM width 64bits GDDR5 [ 6.031250] [drm] amdgpu: 2256537600M of VRAM memory readyQuoted 8 lines
This is obviously not true, check for this and clamp the size properly. Fixes boards reporting bogus amounts of vram, kern log as follows:
[ 2.789062] [drm] Probable bad vram size: 0x86800800 [ 2.789062] [drm] Detected VRAM RAM=2048M, BAR=256M [ 2.789062] [drm] RAM width 64bits GDDR5 [ 2.789062] [drm] amdgpu: 2048M of VRAM memory readyWell we had patches like this one here before and so far we always rejected them.
Quoted 8 lines
When the
mmCONFIG_MEMSIZEregister isn't properly initialized then there is something wrong with your hardware.Working around that in the software driver is not going to fly.
Regards,
Christian.Hi Christian:
I see that two patches for this issue have been merged, and the patches are as follows:
Quoted 8 lines
Quoted 2 lines
11544d77e397drm/amdgpu: fixup bad vram size on gmc v80ca223b029a2drm/radeon: fixup bad vram size on SIMhm, I remember that we discussed reverting those but it looks like that never happened. I need to ask around internally.
Question is do you see any other problems with the board? E.g. incorrect connector or harvesting configuration?
I'll need to dig up the past discussion again, but IIRC, the issue was only seen on some non-x86 platforms. Maybe something specific to MMIO on those?
Alex
Quoted 75 lines
Regards,
Christian.Quoted 70 lines
Qiang Ma
Quoted 67 lines
Quoted 66 lines
Signed-off-by Qiang Ma <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 11 +++++++++-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 13 ++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.cindex23b478639921..3703695f7789100644 ---a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c+++b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c@@ -309,8 +309,15 @@ static intgmc_v6_0_mc_init(struct amdgpu_device *adev)}adev->gmc.vram_width = numchan * chansize; /* size in MB on si */-
adev->gmc.mc_vram_size=RREG32(mmCONFIG_MEMSIZE)*
1024ULL * 1024ULL;
-adev->gmc.real_vram_size=RREG32(mmCONFIG_MEMSIZE)*
1024ULL * 1024ULL;drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +9
-0+ tmp =RREG32 (mmCONFIG_MEMSIZE); +/* some boards may have garbage in the upper 16 bits */ +if (tmp &0xffff0000 ) { +DRM_INFO ("Probable bad vram size: 0x%08x\n" , tmp); +if (tmp &0xffff ) + tmp &=0xffff ; + } + adev->gmc.mc_vram_size = tmp *1024ULL *1024ULL ; + adev->gmc.real_vram_size = adev->gmc.mc_vram_size;if (!(adev->flags &AMD_IS_APU )) { r =amdgpu_device_resize_fb_bar (adev);(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.cindex3da7b6a2b00d..1df1fc578ff6100644 ---a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c+++b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c@@ -316,10 +316,10 @@ static voidgmc_v7_0_mc_program(struct amdgpu_device *adev)staticint gmc_v7_0_mc_init(struct amdgpu_device *adev) { int r;+ u32 tmp;
adev->gmc.vram_width =
amdgpu_atombios_get_vram_width(adev); if (!adev->gmc.vram_width) {drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +9
-3-u32 tmp;int chansize, numchan;/* Get VRAM informations */ @@ -363,8 +363,15 @@ static int gmc_v7_0_mc_init(struct amdgpu_device *adev) adev->gmc.vram_width = numchan * chansize; }/* size in MB on si */ - adev->gmc.mc_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; - adev->gmc.real_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; + tmp =RREG32 (mmCONFIG_MEMSIZE); +/* some boards may have garbage in the upper 16 bits */ +if (tmp &0xffff0000 ) { +DRM_INFO ("Probable bad vram size: 0x%08x\n" , tmp); +if (tmp &0xffff ) + tmp &=0xffff ; + } + adev->gmc.mc_vram_size = tmp *1024ULL *1024ULL ; + adev->gmc.real_vram_size = adev->gmc.mc_vram_size;if (!(adev->flags & AMD_IS_APU)) { r = amdgpu_device_resize_fb_bar(adev);
Christian König
maintainerAm 22.04.24 um 16:40 schrieb Alex Deucher:
Quoted 40 lines
Quoted 38 lines · Christian König
Am 22.04.24 um 14:33 schrieb Qiang Ma:
Quoted 37 lines
Quoted 20 lines · On Mon, 22 Apr 2024 11:40:26 +0200 Christian König <[email protected]>…
Am 22.04.24 um 07:26 schrieb Qiang Ma:
Quoted 8 lines
Some boards(like Oland PRO: 0x1002:0x6613) seem to have garbage in the upper 16 bits of the vram size register, kern log as follows:
[ 6.000000] [drm] Detected VRAM RAM=2256537600M, BAR=256M [ 6.007812] [drm] RAM width 64bits GDDR5 [ 6.031250] [drm] amdgpu: 2256537600M of VRAM memory readyQuoted 8 lines
This is obviously not true, check for this and clamp the size properly. Fixes boards reporting bogus amounts of vram, kern log as follows:
[ 2.789062] [drm] Probable bad vram size: 0x86800800 [ 2.789062] [drm] Detected VRAM RAM=2048M, BAR=256M [ 2.789062] [drm] RAM width 64bits GDDR5 [ 2.789062] [drm] amdgpu: 2048M of VRAM memory readyWell we had patches like this one here before and so far we always rejected them.
Quoted 8 lines
When the
mmCONFIG_MEMSIZEregister isn't properly initialized then there is something wrong with your hardware.Working around that in the software driver is not going to fly.
Regards,
Christian.Hi Christian:
I see that two patches for this issue have been merged, and the patches are as follows:
11544d77e397drm/amdgpu: fixup bad vram size on gmc v80ca223b029a2drm/radeon: fixup bad vram size on SI
Quoted 8 lines
Quoted 5 lines
Mhm, I remember that we discussed reverting those but it looks like that never happened. I need to ask around internally.
Question is do you see any other problems with the board? E.g. incorrect connector or harvesting configuration?
I'll need to dig up the past discussion again, but IIRC, the issue was only seen on some non-x86 platforms. Maybe something specific to MMIO on those?
I honestly doesn't remember it either, but in general it's the job of the VBIOS to init this register.
So if we see the upper bits mangled the VBIOS hasn't done that correctly and it's quite likely that this is only the tip of the iceberg of problems.
Christian.
Quoted 75 lines
Alex
Quoted 71 lines
Regards,
Christian.Quoted 68 lines
Qiang Ma
Quoted 66 lines
Quoted 66 lines
Signed-off-by Qiang Ma <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 11 +++++++++-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 13 ++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.cindex23b478639921..3703695f7789100644 ---a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c+++b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c@@ -309,8 +309,15 @@ static intgmc_v6_0_mc_init(struct amdgpu_device *adev)}adev->gmc.vram_width = numchan * chansize; /* size in MB on si */-
adev->gmc.mc_vram_size=RREG32(mmCONFIG_MEMSIZE)*
1024ULL * 1024ULL;
-adev->gmc.real_vram_size=RREG32(mmCONFIG_MEMSIZE)*
1024ULL * 1024ULL;drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +9
-0+ tmp =RREG32 (mmCONFIG_MEMSIZE); +/* some boards may have garbage in the upper 16 bits */ +if (tmp &0xffff0000 ) { +DRM_INFO ("Probable bad vram size: 0x%08x\n" , tmp); +if (tmp &0xffff ) + tmp &=0xffff ; + } + adev->gmc.mc_vram_size = tmp *1024ULL *1024ULL ; + adev->gmc.real_vram_size = adev->gmc.mc_vram_size;if (!(adev->flags &AMD_IS_APU )) { r =amdgpu_device_resize_fb_bar (adev);(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.cindex3da7b6a2b00d..1df1fc578ff6100644 ---a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c+++b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c@@ -316,10 +316,10 @@ static voidgmc_v7_0_mc_program(struct amdgpu_device *adev)staticint gmc_v7_0_mc_init(struct amdgpu_device *adev) { int r;+ u32 tmp;
adev->gmc.vram_width =
amdgpu_atombios_get_vram_width(adev); if (!adev->gmc.vram_width) {drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +9
-3-u32 tmp;int chansize, numchan;/* Get VRAM informations */ @@ -363,8 +363,15 @@ static int gmc_v7_0_mc_init(struct amdgpu_device *adev) adev->gmc.vram_width = numchan * chansize; }/* size in MB on si */ - adev->gmc.mc_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; - adev->gmc.real_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; + tmp =RREG32 (mmCONFIG_MEMSIZE); +/* some boards may have garbage in the upper 16 bits */ +if (tmp &0xffff0000 ) { +DRM_INFO ("Probable bad vram size: 0x%08x\n" , tmp); +if (tmp &0xffff ) + tmp &=0xffff ; + } + adev->gmc.mc_vram_size = tmp *1024ULL *1024ULL ; + adev->gmc.real_vram_size = adev->gmc.mc_vram_size;if (!(adev->flags & AMD_IS_APU)) { r = amdgpu_device_resize_fb_bar(adev);
Quoted 50 lines · On Mon, 22 Apr 2024 16:47:36 +0200 Christian König <[email protected]>…
Am 22.04.24 um 16:40 schrieb Alex Deucher:
Quoted 40 lines
Quoted 38 lines · Christian König
Am 22.04.24 um 14:33 schrieb Qiang Ma:
Quoted 37 lines
Quoted 20 lines · On Mon, 22 Apr 2024 11:40:26 +0200 Christian König <[email protected]>…
Am 22.04.24 um 07:26 schrieb Qiang Ma:
Quoted 8 lines
Some boards(like Oland PRO: 0x1002:0x6613) seem to have garbage in the upper 16 bits of the vram size register, kern log as follows:
[ 6.000000] [drm] Detected VRAM RAM=2256537600M, BAR=256M [ 6.007812] [drm] RAM width 64bits GDDR5 [ 6.031250] [drm] amdgpu: 2256537600M of VRAM memory readyQuoted 8 lines
This is obviously not true, check for this and clamp the size properly. Fixes boards reporting bogus amounts of vram, kern log as follows:
[ 2.789062] [drm] Probable bad vram size: 0x86800800 [ 2.789062] [drm] Detected VRAM RAM=2048M, BAR=256M [ 2.789062] [drm] RAM width 64bits GDDR5 [ 2.789062] [drm] amdgpu: 2048M of VRAM memory readyWell we had patches like this one here before and so far we always rejected them.
Quoted 8 lines
When the
mmCONFIG_MEMSIZEregister isn't properly initialized then there is something wrong with your hardware.Working around that in the software driver is not going to fly.
Regards,
Christian.Hi Christian:
I see that two patches for this issue have been merged, and the patches are as follows:
11544d77e397drm/amdgpu: fixup bad vram size on gmc v80ca223b029a2drm/radeon: fixup bad vram size on SIQuoted 8 lines
Quoted 5 lines
Mhm, I remember that we discussed reverting those but it looks like that never happened. I need to ask around internally.
Question is do you see any other problems with the board? E.g. incorrect connector or harvesting configuration?
I'll need to dig up the past discussion again, but IIRC, the issue was only seen on some non-x86 platforms. Maybe something specific to MMIO on those?
Quoted 7 lines
I honestly doesn't remember it either, but in general it's the job of the VBIOS to init this register.
So if we see the upper bits mangled the VBIOS hasn't done that correctly and it's quite likely that this is only the tip of the iceberg of problems.
Yes, this problem was found on the mips notebook. Check log vbios signature incorrect, I don't know if it has any influence. After add patch, drm logs are as follows:
[ 2.554687] [drm] amdgpu kernel modesetting enabled. [ 2.558593] [drm] initializing kernel modesetting (OLAND 0x1002:0x6613 0x1028:0x1002 0x00). [ 2.558593] [drm] register mmio base: 0x45400000 [ 2.558593] [drm] register mmio size: 262144 [ 2.558593] [drm] add ip block number 0 <si_common> [ 2.558593] [drm] add ip block number 1 <gmc_v6_0> [ 2.558593] [drm] add ip block number 2 <si_ih> [ 2.558593] [drm] add ip block number 3 <si_dpm> [ 2.558593] [drm] add ip block number 4 <dce_v6_0> [ 2.558593] [drm] add ip block number 5 <gfx_v6_0> [ 2.558593] [drm] add ip block number 6 <si_dma> [ 2.578125] [drm] BIOS signature incorrect 0 0 [ 2.746093] [drm] vm size is 64 GB, 2 levels, block size is 10-bit, fragment size is 9-bit [ 2.746093] [drm] Probable bad vram size: 0x86800800 [ 2.746093] [drm] Detected VRAM RAM=2048M, BAR=256M [ 2.746093] [drm] RAM width 64bits GDDR5 [ 2.750000] [drm] amdgpu: 2048M of VRAM memory ready [ 2.750000] [drm] amdgpu: 3072M of GTT memory ready. [ 2.750000] [drm] GART: num cpu pages 65536, num gpu pages 262144 [ 2.750000] [drm] Supports vblank timestamp caching Rev 2 (21.10.2013). [ 2.750000] [drm] Driver supports precise vblank timestamp query. [ 2.750000] [drm] Internal thermal controller with fan control [ 2.750000] [drm] amdgpu: dpm initialized [ 2.750000] [drm] amdgpu atom DIG backlight initialized [ 2.750000] [drm] AMDGPU Display Connectors [ 2.750000] [drm] Connector 0: [ 2.750000] [drm] DP-1 [ 2.750000] [drm] HPD2 [ 2.750000] [drm] DDC: 0x1950 0x1950 0x1951 0x1951 0x1952 0x1952 0x1953 0x1953 [ 2.750000] [drm] Encoders: [ 2.750000] [drm] LCD1: INTERNAL_UNIPHY [ 2.750000] [drm] Connector 1: [ 2.750000] [drm] HDMI-A-1 [ 2.750000] [drm] HPD1 [ 2.750000] [drm] DDC: 0x194c 0x194c 0x194d 0x194d 0x194e 0x194e 0x194f 0x194f [ 2.750000] [drm] Encoders: [ 2.750000] [drm] DFP1: INTERNAL_UNIPHY [ 2.753906] [drm] PCIE gen 2 link speeds already enabled [ 3.507812] [drm] fb mappable at 0x503E4000 [ 3.507812] [drm] vram apper at 0x50000000 [ 3.507812] [drm] size 8306688 [ 3.507812] [drm] fb depth is 24 [ 3.507812] [drm] pitch is 7680 [ 4.632812] amdgpu 0000:05:00.0: fb0: amdgpudrmfb frame buffer device [ 5.023437] [drm] Initialized amdgpu 3.27.0 20150101 for
0000:05:00.0 on minor 0
Qiang Ma
Quoted 80 lines
Christian.
Quoted 76 lines
Alex
Quoted 72 lines
Regards,
Christian.Quoted 69 lines
Qiang Ma
Quoted 67 lines
Quoted 67 lines
Signed-off-by Qiang Ma <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 11 +++++++++-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 13 ++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.cindex23b478639921..3703695f7789100644 ---a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c+++b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c@@ -309,8 +309,15 @@ static intgmc_v6_0_mc_init(struct amdgpu_device *adev)}adev->gmc.vram_width = numchan * chansize; /* size in MB on si */-
adev->gmc.mc_vram_size=RREG32(mmCONFIG_MEMSIZE)*
1024ULL * 1024ULL;
-adev->gmc.real_vram_size=RREG32(mmCONFIG_MEMSIZE)*
1024ULL * 1024ULL;drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +9
-0+ tmp =RREG32 (mmCONFIG_MEMSIZE); +/* some boards may have garbage in the upper 16 bits */ +if (tmp &0xffff0000 ) { +DRM_INFO ("Probable bad vram size: 0x%08x\n" , tmp); +if (tmp &0xffff ) + tmp &=0xffff ; + } + adev->gmc.mc_vram_size = tmp *1024ULL *1024ULL ; + adev->gmc.real_vram_size = adev->gmc.mc_vram_size;if (!(adev->flags &AMD_IS_APU )) { r =amdgpu_device_resize_fb_bar (adev);(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.cindex3da7b6a2b00d..1df1fc578ff6100644 ---a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c+++b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c@@ -316,10 +316,10 @@ static voidgmc_v7_0_mc_program(struct amdgpu_device *adev)static int gmc_v7_0_mc_init(struct amdgpu_device *adev) { int r;+ u32 tmp;
adev->gmc.vram_width =
amdgpu_atombios_get_vram_width(adev); if
(!adev->gmc.vram_width) {drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +9
-3-u32 tmp;int chansize, numchan;/* Get VRAM informations */ @@ -363,8 +363,15 @@ static int gmc_v7_0_mc_init(struct amdgpu_device *adev) adev->gmc.vram_width = numchan * chansize; }/* size in MB on si */ - adev->gmc.mc_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; - adev->gmc.real_vram_size =RREG32 (mmCONFIG_MEMSIZE) *1024ULL *1024ULL ; + tmp =RREG32 (mmCONFIG_MEMSIZE); +/* some boards may have garbage in the upper 16 bits */ +if (tmp &0xffff0000 ) { +DRM_INFO ("Probable bad vram size: 0x%08x\n" , tmp); +if (tmp &0xffff ) + tmp &=0xffff ; + } + adev->gmc.mc_vram_size = tmp *1024ULL *1024ULL ; + adev->gmc.real_vram_size = adev->gmc.mc_vram_size;if (!(adev->flags & AMD_IS_APU)) { r = amdgpu_device_resize_fb_bar(adev);
Quoted 57 lines · Qiang Ma
Quoted 53 lines · On Mon, 22 Apr 2024 16:47:36 +0200 Christian König <[email protected]>…
Am 22.04.24 um 16:40 schrieb Alex Deucher:
Quoted 40 lines
Quoted 38 lines · Christian König
Am 22.04.24 um 14:33 schrieb Qiang Ma:
Quoted 37 lines
Quoted 20 lines · On Mon, 22 Apr 2024 11:40:26 +0200 Christian König <[email protected]>…
Am 22.04.24 um 07:26 schrieb Qiang Ma:
Quoted 8 lines
Some boards(like Oland PRO: 0x1002:0x6613) seem to have garbage in the upper 16 bits of the vram size register, kern log as follows:
[ 6.000000] [drm] Detected VRAM RAM=2256537600M, BAR=256M [ 6.007812] [drm] RAM width 64bits GDDR5 [ 6.031250] [drm] amdgpu: 2256537600M of VRAM memory readyQuoted 8 lines
This is obviously not true, check for this and clamp the size properly. Fixes boards reporting bogus amounts of vram, kern log as follows:
[ 2.789062] [drm] Probable bad vram size: 0x86800800 [ 2.789062] [drm] Detected VRAM RAM=2048M, BAR=256M [ 2.789062] [drm] RAM width 64bits GDDR5 [ 2.789062] [drm] amdgpu: 2048M of VRAM memory readyWell we had patches like this one here before and so far we always rejected them.
Quoted 8 lines
When the
mmCONFIG_MEMSIZEregister isn't properly initialized then there is something wrong with your hardware.Working around that in the software driver is not going to fly.
Regards,
Christian.Hi Christian:
I see that two patches for this issue have been merged, and the patches are as follows:
11544d77e397drm/amdgpu: fixup bad vram size on gmc v80ca223b029a2drm/radeon: fixup bad vram size on SIQuoted 8 lines
Quoted 5 lines
Mhm, I remember that we discussed reverting those but it looks like that never happened. I need to ask around internally.
Question is do you see any other problems with the board? E.g. incorrect connector or harvesting configuration?
I'll need to dig up the past discussion again, but IIRC, the issue was only seen on some non-x86 platforms. Maybe something specific to MMIO on those?
I honestly doesn't remember it either, but in general it's the job of the VBIOS to init this register.
Quoted 8 lines
Quoted 4 lines
So if we see the upper bits mangled the VBIOS hasn't done that correctly and it's quite likely that this is only the tip of the iceberg of problems.
Yes, this problem was found on the mips notebook. Check log vbios signature incorrect, I don't know if it has any influence. After add patch, drm logs are as follows:
IIRC, the patches for the other generations were on similar less mainstream platforms. I've never seen anything like this on x86. I suspect this is something platform specific. Does this platform have an x86 real mode emulator to post the GPU? If so, I wonder if the problem lies somewhere in there? Can you disable that or test with a secondary board which does not post the GPU? The driver can post it itself. Another thing to try would be to call the atombios asic_init sequence and check if the value is correctly written in that case. The asic_init sequence should write the mem config register as part of the sequence. Since asic_init is just a programming sequence stored in the vbios (and interpreted by the driver), you should be able to audit it to find out what is going wrong. You can use atomdis
(https://cgit.freedesktop.org/~mhopf/AtomDis/) to print out the programming sequences in the atom command tables.
Alex
Quoted 132 lines
[ 2.554687] [drm] amdgpu kernel modesetting enabled. [ 2.558593] [drm] initializing kernel modesetting (OLAND 0x1002:0x6613 0x1028:0x1002 0x00). [ 2.558593] [drm] register mmio base: 0x45400000 [ 2.558593] [drm] register mmio size: 262144 [ 2.558593] [drm] add ip block number 0 <si_common> [ 2.558593] [drm] add ip block number 1 <gmc_v6_0> [ 2.558593] [drm] add ip block number 2 <si_ih> [ 2.558593] [drm] add ip block number 3 <si_dpm> [ 2.558593] [drm] add ip block number 4 <dce_v6_0> [ 2.558593] [drm] add ip block number 5 <gfx_v6_0> [ 2.558593] [drm] add ip block number 6 <si_dma> [ 2.578125] [drm] BIOS signature incorrect 0 0 [ 2.746093] [drm] vm size is 64 GB, 2 levels, block size is 10-bit, fragment size is 9-bit [ 2.746093] [drm] Probable bad vram size: 0x86800800 [ 2.746093] [drm] Detected VRAM RAM=2048M, BAR=256M [ 2.746093] [drm] RAM width 64bits GDDR5 [ 2.750000] [drm] amdgpu: 2048M of VRAM memory ready [ 2.750000] [drm] amdgpu: 3072M of GTT memory ready. [ 2.750000] [drm] GART: num cpu pages 65536, num gpu pages 262144 [ 2.750000] [drm] Supports vblank timestamp caching Rev 2 (21.10.2013). [ 2.750000] [drm] Driver supports precise vblank timestamp query. [ 2.750000] [drm] Internal thermal controller with fan control [ 2.750000] [drm] amdgpu: dpm initialized [ 2.750000] [drm] amdgpu atom DIG backlight initialized [ 2.750000] [drm] AMDGPU Display Connectors [ 2.750000] [drm] Connector 0: [ 2.750000] [drm] DP-1 [ 2.750000] [drm] HPD2 [ 2.750000] [drm] DDC: 0x1950 0x1950 0x1951 0x1951 0x1952 0x1952 0x1953 0x1953 [ 2.750000] [drm] Encoders: [ 2.750000] [drm] LCD1: INTERNAL_UNIPHY [ 2.750000] [drm] Connector 1: [ 2.750000] [drm] HDMI-A-1 [ 2.750000] [drm] HPD1 [ 2.750000] [drm] DDC: 0x194c 0x194c 0x194d 0x194d 0x194e 0x194e 0x194f 0x194f [ 2.750000] [drm] Encoders: [ 2.750000] [drm] DFP1: INTERNAL_UNIPHY [ 2.753906] [drm] PCIE gen 2 link speeds already enabled [ 3.507812] [drm] fb mappable at 0x503E4000 [ 3.507812] [drm] vram apper at 0x50000000 [ 3.507812] [drm] size 8306688 [ 3.507812] [drm] fb depth is 24 [ 3.507812] [drm] pitch is 7680 [ 4.632812] amdgpu 0000:05:00.0: fb0: amdgpudrmfb frame buffer device [ 5.023437] [drm] Initialized amdgpu 3.27.0 20150101 for0000:05:00.0 on minor 0
Qiang Ma
Quoted 80 lines
Christian.
Quoted 76 lines
Alex
Quoted 72 lines
Regards,
Christian.Quoted 69 lines
Qiang Ma
Quoted 67 lines
Quoted 67 lines
Signed-off-by Qiang Ma <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 11 +++++++++-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 13 ++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.cindex23b478639921..3703695f7789100644 ---a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c+++b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c@@ -309,8 +309,15 @@ static intgmc_v6_0_mc_init(struct amdgpu_device *adev)}adev->gmc.vram_width = numchan * chansize; /* size in MB on si */-
adev->gmc.mc_vram_size=RREG32(mmCONFIG_MEMSIZE)*
1024ULL * 1024ULL;
-adev->gmc.real_vram_size=RREG32(mmCONFIG_MEMSIZE)*
1024ULL * 1024ULL;(quoted diff) +9
-0+ tmp = RREG32(mmCONFIG_MEMSIZE); + /* some boards may have garbage in the upper 16 bits */ + if (tmp & 0xffff0000) { + DRM_INFO("Probable bad vram size: 0x%08x\n", tmp); + if (tmp & 0xffff) + tmp &= 0xffff; + } + adev->gmc.mc_vram_size = tmp * 1024ULL * 1024ULL; + adev->gmc.real_vram_size = adev->gmc.mc_vram_size; if (!(adev->flags & AMD_IS_APU)) { r = amdgpu_device_resize_fb_bar(adev);(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.cindex3da7b6a2b00d..1df1fc578ff6100644 ---a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c+++b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c@@ -316,10 +316,10 @@ static voidgmc_v7_0_mc_program(struct amdgpu_device *adev)static int gmc_v7_0_mc_init(struct amdgpu_device *adev) { int r;+ u32 tmp;
adev->gmc.vram_width =
amdgpu_atombios_get_vram_width(adev); if
(!adev->gmc.vram_width) {(quoted diff) +9
-3- u32 tmp; int chansize, numchan; /* Get VRAM informations */@@ -363,8 +363,15 @@ static int gmc_v7_0_mc_init(struct amdgpu_device *adev) adev->gmc.vram_width = numchan * chansize; } /* size in MB on si */ - adev->gmc.mc_vram_size = RREG32(mmCONFIG_MEMSIZE) * 1024ULL * 1024ULL; - adev->gmc.real_vram_size = RREG32(mmCONFIG_MEMSIZE) * 1024ULL * 1024ULL; + tmp = RREG32(mmCONFIG_MEMSIZE); + /* some boards may have garbage in the upper 16 bits */ + if (tmp & 0xffff0000) { + DRM_INFO("Probable bad vram size: 0x%08x\n", tmp); + if (tmp & 0xffff) + tmp &= 0xffff; + } + adev->gmc.mc_vram_size = tmp * 1024ULL * 1024ULL; + adev->gmc.real_vram_size = adev->gmc.mc_vram_size;if (!(adev->flags & AMD_IS_APU)) { r = amdgpu_device_resize_fb_bar(adev);