drm/amdgpu: Read vram width from integrated system info table
Subsystems (2)
PATCH 1/1 drm/amdgpu: Read vram width from integrated system info table
On KB, KV, CZ we should read the vram width from integrated system table, if we can. The NOOFCHAN in MC_SHARED_CHMAP is not accurate.
With this change we can enable two 4k displays on CZ again. This use case was broken sometime in January when we started looking at vram_width for bandwidth calculations instead of hardcoding this value.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 27 +++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 2 + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 87 +++++++++++++++------------- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 87 +++++++++++++++------------- 4 files changed, 121 insertions(+), 82 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +27 -0
@@ -754,6 +754,33 @@ union igp_info {struct _ATOM_INTEGRATED_SYSTEM_INFO_V1_9 info_9; }; +/* +* Return vram width from integrated system info table, if available, +* or 0 if not. +*/ +int amdgpu_atombios_get_vram_width (struct amdgpu_device *adev) +{ +struct amdgpu_mode_info *mode_info = &adev->mode_info; +int index =GetIndexIntoMasterTable (DATA , IntegratedSystemInfo); +u16 data_offset, size; +union igp_info *igp_info; +u8 frev, crev; + +/* get any igp specific overrides */ +if (amdgpu_atom_parse_data_header (mode_info->atom_context, index, &size, + &frev, &crev, &data_offset)) { + igp_info = (union igp_info *) + (mode_info->atom_context->bios + data_offset); +switch (crev) { +case 8 : +case 9 : +return igp_info->info_8.ucUMAChannelNumber *64 ; +default : +return 0 ; + } + } +} +static void amdgpu_atombios_get_igp_ss_overrides (struct amdgpu_device *adev,struct amdgpu_atom_ss *ss,int id)
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h +2 -0
@@ -148,6 +148,8 @@ int amdgpu_atombios_get_clock_info(struct amdgpu_device *adev);int amdgpu_atombios_get_gfx_info (struct amdgpu_device *adev); +int amdgpu_atombios_get_vram_width (struct amdgpu_device *adev); +bool amdgpu_atombios_get_asic_ss_info (struct amdgpu_device *adev,struct amdgpu_atom_ss *ss,int id,u32 clock);
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +46 -41
100 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +46 -41
100 lines not on this page · raw message
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20170401001958.22137-1-harry.wentland-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 53 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Harry Wentland
Sent: Friday, March 31, 2017 8:20 PM
To: [email protected]
Cc: Wentland, Harry
Subject: [PATCH] drm/amdgpu: Read vram width from integrated system info tableOn KB, KV, CZ we should read the vram width from integrated system table, if we can. The NOOFCHAN in
MC_SHARED_CHMAPis not accurate.With this change we can enable two 4k displays on CZ again. This use case was broken sometime in January when we started looking at
vram_widthfor bandwidth calculations instead of hardcoding this value.Tested-by Roman Li <[email protected]>Signed-off-by Harry Wentland <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 27 +++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 2 + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 87 +++++++++++++++----- -------- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 87 +++++++++++++++----- -------- 4 files changed, 121 insertions(+), 82 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +16
-0@@ -754,6 +754,33 @@ union igp_info {struct _ATOM_INTEGRATED_SYSTEM_INFO_V1_9 info_9; }; +/* +* Return vram width from integrated system info table, if available, +* or 0 if not. +*/ +int amdgpu_atombios_get_vram_width (struct amdgpu_device *adev) +{ +struct amdgpu_mode_info *mode_info = &adev->mode_info; +int index =GetIndexIntoMasterTable (DATA , IntegratedSystemInfo); +u16 data_offset, size; +union igp_info *igp_info; +u8 frev, crev; + +/* get any igp specific overrides */ +if (amdgpu_atom_parse_data_header (mode_info->atom_context, index, &size, + &frev, &crev, &data_offset)) { + igp_info = (union igp_info *)
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c union igp_info { · line 783
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +9
-0+ (mode_info->atom_context->bios + data_offset); +switch (crev) { +case 8 : +case 9 : +return igp_info->info_8.ucUMAChannelNumber *64 ; +default : +return 0 ; + } + }
I think you need a return here in case the table doesn't exist (e.g., dGPUS). With that fixed:
Alex
Quoted 242 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +2
-0+} + static void amdgpu_atombios_get_igp_ss_overrides(struct amdgpu_device*adev,
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +0
-0struct amdgpu_atom_ss *ss, int id)drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h +2
-0@@ -148,6 +148,8 @@ int amdgpu_atombios_get_clock_info(struct amdgpu_device *adev);int amdgpu_atombios_get_gfx_info (struct amdgpu_device *adev); +int amdgpu_atombios_get_vram_width (struct amdgpu_device *adev); + bool amdgpu_atombios_get_asic_ss_info(struct amdgpu_device *adev, struct amdgpu_atom_ss *ss,drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h +0
-0int id, u32 clock);drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +46
-41@@ -37,6 +37,8 @@#include "oss/oss_2_0_d.h" #include "oss/oss_2_0_sh_mask.h" +#include "amdgpu_atombios.h" +static void gmc_v7_0_set_gart_funcs (struct amdgpu_device *adev);static void gmc_v7_0_set_irq_funcs (struct amdgpu_device *adev);static int gmc_v7_0_wait_for_idle (void *handle);@@ -325,48 +327,51 @@ static void gmc_v7_0_mc_program(structamdgpu_device *adev) */ static int gmc_v7_0_mc_init (struct amdgpu_device *adev) { -u32 tmp; -int chansize, numchan; - -/* Get VRAM informations */ - tmp =RREG32 (mmMC_ARB_RAMCFG); -if (REG_GET_FIELD (tmp,MC_ARB_RAMCFG ,CHANSIZE )) { - chansize =64 ; - }else { - chansize =32 ; - } - tmp =RREG32 (mmMC_SHARED_CHMAP); -switch (REG_GET_FIELD (tmp,MC_SHARED_CHMAP ,NOOFCHAN )) { -case 0 : -default : - numchan =1 ; -break ; -case 1 : - numchan =2 ; -break ; -case 2 : - numchan =4 ; -break ; -case 3 : - numchan =8 ; -break ; -case 4 : - numchan =3 ; -break ; -case 5 : - numchan =6 ; -break ; -case 6 : - numchan =10 ; -break ; -case 7 : - numchan =12 ; -break ; -case 8 : - numchan =16 ; -break ; + adev->mc.vram_width =amdgpu_atombios_get_vram_width (adev); +if (!adev->mc.vram_width) { +u32 tmp; +int chansize, numchan; + +/* Get VRAM informations */ + tmp =RREG32 (mmMC_ARB_RAMCFG); +if (REG_GET_FIELD (tmp,MC_ARB_RAMCFG ,CHANSIZE )) { + chansize =64 ; + }else { + chansize =32 ; + } + tmp =RREG32 (mmMC_SHARED_CHMAP); +switch (REG_GET_FIELD (tmp,MC_SHARED_CHMAP ,NOOFCHAN )) { +case 0 : +default : + numchan =1 ; +break ; +case 1 : + numchan =2 ; +break ; +case 2 : + numchan =4 ; +break ; +case 3 : + numchan =8 ; +break ; +case 4 : + numchan =3 ; +break ; +case 5 : + numchan =6 ; +break ; +case 6 : + numchan =10 ; +break ; +case 7 : + numchan =12 ; +break ; +case 8 : + numchan =16 ; +break ; + } + adev->mc.vram_width = numchan * chansize; } - adev->mc.vram_width = numchan * chansize;/* Could aper size report 0 ? */ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +0
-0adev->mc.aper_base =pci_resource_start (adev->pdev,0 ); adev->mc.aper_size =pci_resource_len (adev->pdev,0 );drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +46
-41@@ -38,6 +38,8 @@#include "vid.h" #include "vi.h" +#include "amdgpu_atombios.h" +static void gmc_v8_0_set_gart_funcs (struct amdgpu_device *adev);static void gmc_v8_0_set_irq_funcs (struct amdgpu_device *adev);@@ -487,48 +489,51 @@ static void gmc_v8_0_mc_program(structamdgpu_device *adev) */ static int gmc_v8_0_mc_init (struct amdgpu_device *adev) { -u32 tmp; -int chansize, numchan; - -/* Get VRAM informations */ - tmp =RREG32 (mmMC_ARB_RAMCFG); -if (REG_GET_FIELD (tmp,MC_ARB_RAMCFG ,CHANSIZE )) { - chansize =64 ; - }else { - chansize =32 ; - } - tmp =RREG32 (mmMC_SHARED_CHMAP); -switch (REG_GET_FIELD (tmp,MC_SHARED_CHMAP ,NOOFCHAN )) { -case 0 : -default : - numchan =1 ; -break ; -case 1 : - numchan =2 ; -break ; -case 2 : - numchan =4 ; -break ; -case 3 : - numchan =8 ; -break ; -case 4 : - numchan =3 ; -break ; -case 5 : - numchan =6 ; -break ; -case 6 : - numchan =10 ; -break ; -case 7 : - numchan =12 ; -break ; -case 8 : - numchan =16 ; -break ; + adev->mc.vram_width =amdgpu_atombios_get_vram_width (adev); +if (!adev->mc.vram_width) { +u32 tmp; +int chansize, numchan; + +/* Get VRAM informations */ + tmp =RREG32 (mmMC_ARB_RAMCFG); +if (REG_GET_FIELD (tmp,MC_ARB_RAMCFG ,CHANSIZE )) { + chansize =64 ; + }else { + chansize =32 ; + } + tmp =RREG32 (mmMC_SHARED_CHMAP); +switch (REG_GET_FIELD (tmp,MC_SHARED_CHMAP ,NOOFCHAN )) { +case 0 : +default : + numchan =1 ; +break ; +case 1 : + numchan =2 ; +break ; +case 2 : + numchan =4 ; +break ; +case 3 : + numchan =8 ; +break ; +case 4 : + numchan =3 ; +break ; +case 5 : + numchan =6 ; +break ; +case 6 : + numchan =10 ; +break ; +case 7 : + numchan =12 ; +break ; +case 8 : + numchan =16 ; +break ; + } + adev->mc.vram_width = numchan * chansize; } - adev->mc.vram_width = numchan * chansize;/* Could aper size report 0 ? */ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +0
-1adev->mc.aper_base =pci_resource_start (adev->pdev,0 ); adev->mc.aper_size =pci_resource_len (adev->pdev,0 ); --2.11.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx