drm/amdgpu: Read vram width from integrated system info table
Subsystems (2)
PATCH v2 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.
v2:
Return 0 if integrated system info table is not available.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 29 ++++++++++ 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, 123 insertions(+), 82 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +29 -0
@@ -754,6 +754,35 @@ 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 ; + } + } + +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): 20170403150107.13253-1-harry.wentland-5C7GfCeVMHo@public.gmane.org
Dear Harry,
Harry Wentland wrote on 03.04.2017 17:01:
Quoted 269 lines
On 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.v2:
Return 0 if integrated system info table is not available.Tested-by Roman Li <[email protected]>Signed-off-by Harry Wentland <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 29 ++++++++++ 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, 123 insertions(+), 82 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +29
-0@@ -754,6 +754,35 @@ 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 ; + } + } + +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@@ -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(struct amdgpu_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 ? */ adev->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 +36
-40@@ -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(struct amdgpu_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 :
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c static void gmc_v8_0_mc_program(struct amdgpu_device *adev) · line 535
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +10
-0+ numchan =10 ; +break ; +case 7 : + numchan =12 ; +break ; +case 8 : + numchan =16 ; +break ; + } + adev->mc.vram_width = numchan * chansize;
I might miss something subtle here, but after reading this a couple of times, I've convinced myself this is exactly the same switch statement as in gmc_v7_0_mc_init() above, right? If so: why not move that part to common code as well?
Cheers,
Kai
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c static void gmc_v8_0_mc_program(struct amdgpu_device *adev) · line 539
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +0
-1} - adev->mc.vram_width = numchan * chansize;/* Could aper size report 0 ? */ adev->mc.aper_base =pci_resource_start (adev->pdev,0 ); adev->mc.aper_size =pci_resource_len (adev->pdev,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): 8623a5d4-1e10-fc46-aaa2-0777b500c3a2-1ZKVMVCtJ2dx9oSEVPI0kiST3g8Odh+X@public.gmane.org
Quoted 278 lines · Kai Wasserbäch
Dear Harry,
Harry Wentland wrote on 03.04.2017 17:01:Quoted 276 lines
On 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.v2:
Return 0 if integrated system info table is not available.Tested-by Roman Li <[email protected]>Signed-off-by Harry Wentland <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 29 ++++++++++ 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, 123 insertions(+), 82 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +29
-0@@ -754,6 +754,35 @@ 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 ; + } + } + +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@@ -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(struct amdgpu_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 ? */ adev->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 +43
-40@@ -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(struct amdgpu_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 ;
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c static void gmc_v8_0_mc_program(struct amdgpu_device *adev) · line 535
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +3
-0+break ; + } + adev->mc.vram_width = numchan * chansize;I might miss something subtle here, but after reading this a couple of times, I've convinced myself this is exactly the same switch statement as in
gmc_v7_0_mc_init()above, right? If so: why not move that part to common code as well?
My patch isn't adding (or removing) any duplication, just wrapping the whole thing in a call to atombios.
I'd rather not change the design of the GMC component with this patch. It could very well have been a design decisions to have this duplication, in part because of the register access. mmMC_ARB_RAMCFG could be defined differently for v7 and v8. The different defines are pulled in through different register header includes, gmc_7_1_d.h vs gmc/gmc_8_1_d.h.
Harry
Quoted 11 lines
Cheers,
Kaidrivers/gpu/drm/amd/amdgpu/gmc_v8_0.c static void gmc_v8_0_mc_program(struct amdgpu_device *adev) · line 539
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +0
-1} - adev->mc.vram_width = numchan * chansize;/* Could aper size report 0 ? */ adev->mc.aper_base =pci_resource_start (adev->pdev,0 ); adev->mc.aper_size =pci_resource_len (adev->pdev,0 );
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 301 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Kai Wasserbäch
Sent: Monday, April 03, 2017 11:20 AM
To: Wentland, Harry; amd-gfx list
Subject: Re: [PATCH v2] drm/amdgpu: Read vram width from integrated system info tableDear Harry,
Harry Wentland wrote on 03.04.2017 17:01:Quoted 10 lines
On 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.v2:
Return 0 if integrated system info table is not available.Quoted 6 lines
Tested-by Roman Li <[email protected]>Signed-off-by Harry Wentland <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 29 ++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 2 + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 87 +++++++++++++++-------------
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 87 +++++++++++++++-------------
Review
Quoted 3 lines
4 files changed, 123 insertions(+), 82 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.cQuoted 11 lines
index
f52b1bf3d3d9..ad4329922f79100644drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +4
-0@@ -754,6 +754,35 @@ 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. +*/ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c union igp_info { · line 770
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +10
-0+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,
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c union igp_info {
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +7
-0+ &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;
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c union igp_info {
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +8
-0+default : +return 0 ; + } + } + +return 0 ; +} + static void amdgpu_atombios_get_igp_ss_overrides(struct
amdgpu_device*adev,Review
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +0
-0struct amdgpu_atom_ss *ss, int id)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.hdrivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h int amdgpu_atombios_get_clock_info(struct
Quoted 4 lines
index
4e0f488487f3..38d0fe32e5cd100644drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h +0
-0@@ -148,6 +148,8 @@ int amdgpu_atombios_get_clock_info(struct
amdgpu_device*adev);Review
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h +2
-0int 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);(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.cdrivers/gpu/drm/amd/amdgpu/gmc_v7_0.c static void gmc_v7_0_mc_program(struct
Quoted 13 lines
index
0c0a6015cca5..78643a1baa5c100644drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +2
-0@@ -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(struct
amdgpu_device*adev)Quoted 47 lines
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +4
-40*/ 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;drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c static void gmc_v7_0_mc_program(struct amdgpu_device *adev)
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +10
-0+ +/* 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)) {
Review
Quoted 36 lines
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +30
-1+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 ? */ adev->mc.aper_base =pci_resource_start (adev->pdev,0 ); adev->mc.aper_size =pci_resource_len (adev->pdev,0 );(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.cdrivers/gpu/drm/amd/amdgpu/gmc_v8_0.c static void gmc_v8_0_mc_program(struct
Quoted 13 lines
index
d19d1c5e2847..42b2f357a799100644drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +2
-0@@ -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(struct
amdgpu_device*adev)Quoted 47 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +4
-40*/ 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;drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c static void gmc_v8_0_mc_program(struct amdgpu_device *adev)
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +10
-0+ +/* 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)) {
Quoted 28 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +28
-0+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 ;
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c static void gmc_v8_0_mc_program(struct · line 535
Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +2
-0+ } + adev->mc.vram_width = numchan * chansize;I might miss something subtle here, but after reading this a couple of times, I've convinced myself this is exactly the same switch statement as in
gmc_v7_0_mc_init()above, right? If so: why not move that part to common code as
well?
The register offsets and bitfields may change across different IP revisions. The actual switch statement itself could be common I guess (minus the registers), but I'm not sure if it's worth the effort.
Alex
Quoted 11 lines
Cheers,
Kaidrivers/gpu/drm/amd/amdgpu/gmc_v8_0.c static void gmc_v8_0_mc_program(struct · line 539
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +0
-1} - adev->mc.vram_width = numchan * chansize;/* Could aper size report 0 ? */ adev->mc.aper_base =pci_resource_start (adev->pdev,0 ); adev->mc.aper_size =pci_resource_len (adev->pdev,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): BN6PR12MB1652CE82ACBFD409F3829D35F7080-/b2+HYfkarQqUD6E6FAiowdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Deucher, Alexander wrote on 03.04.2017 17:43:
Quoted 10 lines
Quoted 10 lines
-----Original Message-----
From: amd-gfx [mailto:amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org] On Behalf Of Kai Wasserbäch
Sent: Monday, April 03, 2017 11:20 AM
To: Wentland, Harry; amd-gfx list
Subject: Re: [PATCH v2] drm/amdgpu: Read vram width from integrated
system info table[...]
Quoted 7 lines
Quoted 5 lines
I might miss something subtle here, but after reading this a couple of times, I've convinced myself this is exactly the same switch statement as in
gmc_v7_0_mc_init()above, right? If so: why not move that part to common code as
well?The register offsets and bitfields may change across different IP revisions. The actual switch statement itself could be common I guess (minus the registers), but I'm not sure if it's worth the effort.
Thanks to both of you for the explanation. Since everything was named exactly the same I assumed the definitions for the registers matched as well. Still if large chunks of code are common helpers might still be nice and reduce the overall LOCs. Anyway, that's obviously your decision.
Cheers,
Kai
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 16 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Harry Wentland
Sent: Monday, April 03, 2017 11:01 AM
To: [email protected]
Cc: Wentland, Harry
Subject: [PATCH v2] 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.
Quoted 5 lines
v2:
Return 0 if integrated system info table is not available.Tested-by Roman Li <[email protected]>Signed-off-by Harry Wentland <[email protected]>
Quoted 289 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 29 ++++++++++ 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, 123 insertions(+), 82 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +29
-0@@ -754,6 +754,35 @@ 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 ; + } + } + +return 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