drm/amdgpu: add get_clock_info for atomfirmware
Subsystems (2)
PATCH 1/2 drm/amdgpu: add get_clock_info for atomfirmware
The information has moved to different tables, notably smu_info for core refclk and umc_info for mem refclk.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 93 ++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 1 + 2 files changed, 94 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +93 -0
@@ -128,3 +128,96 @@ int amdgpu_atomfirmware_get_vram_width(struct amdgpu_device *adev)return 0 ; } + +union firmware_info { +struct atom_firmware_info_v3_1 v31; +}; + +union smu_info { +struct atom_smu_info_v3_1 v31; +}; + +union umc_info { +struct atom_umc_info_v3_1 v31; +}; + +int amdgpu_atomfirmware_get_clock_info (struct amdgpu_device *adev) +{ +struct amdgpu_mode_info *mode_info = &adev->mode_info; +struct amdgpu_pll *spll = &adev->clock.spll; +struct amdgpu_pll *mpll = &adev->clock.mpll; +uint8_t frev, crev; +uint16_t data_offset; +int ret = -EINVAL , index; + + index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, + firmwareinfo); +if (amdgpu_atom_parse_data_header (mode_info->atom_context, index,NULL , + &frev, &crev, &data_offset)) { +union firmware_info *firmware_info = + (union firmware_info *)(mode_info->atom_context->bios + + data_offset); + + adev->clock.default_sclk = +le32_to_cpu (firmware_info->v31.bootup_sclk_in10khz); + adev->clock.default_mclk = +le32_to_cpu (firmware_info->v31.bootup_mclk_in10khz); + + adev->pm.current_sclk = adev->clock.default_sclk; + adev->pm.current_mclk = adev->clock.default_mclk; + +/* not technically a clock, but... */ + adev->mode_info.firmware_flags = +le32_to_cpu (firmware_info->v31.firmware_capability); + + ret =0 ; + } + + index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, + smu_info); +if (amdgpu_atom_parse_data_header (mode_info->atom_context, index,NULL , + &frev, &crev, &data_offset)) { +union smu_info *smu_info = + (union smu_info *)(mode_info->atom_context->bios + + data_offset); + +/* system clock */ + spll->reference_freq =le32_to_cpu (smu_info->v31.core_refclk_10khz); + + spll->reference_div =0 ; + spll->min_post_div =1 ; + spll->max_post_div =1 ; + spll->min_ref_div =2 ; + spll->max_ref_div =0xff ; + spll->min_feedback_div =4 ; + spll->max_feedback_div =0xff ; + spll->best_vco =0 ; + + ret =0 ; + } + + index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, + umc_info); +if (amdgpu_atom_parse_data_header (mode_info->atom_context, index,NULL , + &frev, &crev, &data_offset)) { +union umc_info *umc_info = + (union umc_info *)(mode_info->atom_context->bios + + data_offset); + +/* memory clock */ + mpll->reference_freq =le32_to_cpu (umc_info->v31.mem_refclk_10khz); + + mpll->reference_div =0 ; + mpll->min_post_div =1 ; + mpll->max_post_div =1 ; + mpll->min_ref_div =2 ; + mpll->max_ref_div =0xff ; + mpll->min_feedback_div =4 ; + mpll->max_feedback_div =0xff ; + mpll->best_vco =0 ; + + ret =0 ; + } + +return ret; +}
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h +1 -0
@@ -28,5 +28,6 @@ bool amdgpu_atomfirmware_gpu_supports_virtualization(struct amdgpu_device *adev)void amdgpu_atomfirmware_scratch_regs_init (struct amdgpu_device *adev);int amdgpu_atomfirmware_allocate_fb_scratch (struct amdgpu_device *adev);int amdgpu_atomfirmware_get_vram_width (struct amdgpu_device *adev); +int amdgpu_atomfirmware_get_clock_info (struct amdgpu_device *adev);#endif
Signature · 6 lines
2.5.5 _______________________________________________ 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): 1499721334-4520-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amdgpu: call atomfirmware get_clock_info for atomfirmware systems
Rather than the legacy atombios version.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +9 -1
@@ -2231,7 +2231,15 @@ int amdgpu_device_init(struct amdgpu_device *adev,DRM_INFO ("GPU post is not needed\n" ); } -if (!adev->is_atom_fw) { +if (adev->is_atom_fw) { +/* Initialize clocks */ + r =amdgpu_atomfirmware_get_clock_info (adev); +if (r) { +dev_err (adev->dev,"amdgpu_atomfirmware_get_clock_info failed\n" ); +amdgpu_vf_error_put (AMDGIM_ERROR_VF_ATOMBIOS_GET_CLOCK_FAIL ,0 ,0 ); + goto failed; + } + }else {/* Initialize clocks */ r =amdgpu_atombios_get_clock_info (adev);if (r) {
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 4 lines · Alex Deucher
The information has moved to different tables, notably
smu_infofor core refclk andumc_infofor mem refclk.Signed-off-by Alex Deucher <[email protected]>
ping? this fixes looking up the reference clocks on vega10 and raven.
Alex
Quoted 118 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 93 ++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 1 + 2 files changed, 94 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +93
-0@@ -128,3 +128,96 @@ int amdgpu_atomfirmware_get_vram_width(struct amdgpu_device *adev)return 0 ; } + +union firmware_info { +struct atom_firmware_info_v3_1 v31; +}; + +union smu_info { +struct atom_smu_info_v3_1 v31; +}; + +union umc_info { +struct atom_umc_info_v3_1 v31; +}; + +int amdgpu_atomfirmware_get_clock_info (struct amdgpu_device *adev) +{ +struct amdgpu_mode_info *mode_info = &adev->mode_info; +struct amdgpu_pll *spll = &adev->clock.spll; +struct amdgpu_pll *mpll = &adev->clock.mpll; +uint8_t frev, crev; +uint16_t data_offset; +int ret = -EINVAL , index; + + index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, + firmwareinfo); +if (amdgpu_atom_parse_data_header (mode_info->atom_context, index,NULL , + &frev, &crev, &data_offset)) { +union firmware_info *firmware_info = + (union firmware_info *)(mode_info->atom_context->bios + + data_offset); + + adev->clock.default_sclk = +le32_to_cpu (firmware_info->v31.bootup_sclk_in10khz); + adev->clock.default_mclk = +le32_to_cpu (firmware_info->v31.bootup_mclk_in10khz); + + adev->pm.current_sclk = adev->clock.default_sclk; + adev->pm.current_mclk = adev->clock.default_mclk; + +/* not technically a clock, but... */ + adev->mode_info.firmware_flags = +le32_to_cpu (firmware_info->v31.firmware_capability); + + ret =0 ; + } + + index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, + smu_info); +if (amdgpu_atom_parse_data_header (mode_info->atom_context, index,NULL , + &frev, &crev, &data_offset)) { +union smu_info *smu_info = + (union smu_info *)(mode_info->atom_context->bios + + data_offset); + +/* system clock */ + spll->reference_freq =le32_to_cpu (smu_info->v31.core_refclk_10khz); + + spll->reference_div =0 ; + spll->min_post_div =1 ; + spll->max_post_div =1 ; + spll->min_ref_div =2 ; + spll->max_ref_div =0xff ; + spll->min_feedback_div =4 ; + spll->max_feedback_div =0xff ; + spll->best_vco =0 ; + + ret =0 ; + } + + index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, + umc_info); +if (amdgpu_atom_parse_data_header (mode_info->atom_context, index,NULL , + &frev, &crev, &data_offset)) { +union umc_info *umc_info = + (union umc_info *)(mode_info->atom_context->bios + + data_offset); + +/* memory clock */ + mpll->reference_freq =le32_to_cpu (umc_info->v31.mem_refclk_10khz); + + mpll->reference_div =0 ; + mpll->min_post_div =1 ; + mpll->max_post_div =1 ; + mpll->min_ref_div =2 ; + mpll->max_ref_div =0xff ; + mpll->min_feedback_div =4 ; + mpll->max_feedback_div =0xff ; + mpll->best_vco =0 ; + + ret =0 ; + } + +return ret; +}drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h +1
-1@@ -28,5 +28,6 @@ bool amdgpu_atomfirmware_gpu_supports_virtualization(struct amdgpu_device *adev)void amdgpu_atomfirmware_scratch_regs_init (struct amdgpu_device *adev);int amdgpu_atomfirmware_allocate_fb_scratch (struct amdgpu_device *adev);int amdgpu_atomfirmware_get_vram_width (struct amdgpu_device *adev); +int amdgpu_atomfirmware_get_clock_info (struct amdgpu_device *adev);#endif --
Quoted 2 lines
2.5.5
_______________________________________________
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): CADnq5_PK_wTPiL43Do+nEVPS_rEixqojeg0ZrthxRz_UT95BCw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Quoted 6 lines · Alex Deucher
Quoted 4 lines · Alex Deucher
The information has moved to different tables, notably
smu_infofor core refclk andumc_infofor mem refclk.Signed-off-by Alex Deucher <[email protected]>ping? this fixes looking up the reference clocks on vega10 and raven.
The both two are Acked-by: Chunming Zhou <[email protected]>
Quoted 120 lines
Alex
Quoted 116 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 93 ++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 1 + 2 files changed, 94 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +93
-0@@ -128,3 +128,96 @@ int amdgpu_atomfirmware_get_vram_width(struct amdgpu_device *adev)return 0 ; } + +union firmware_info { +struct atom_firmware_info_v3_1 v31; +}; + +union smu_info { +struct atom_smu_info_v3_1 v31; +}; + +union umc_info { +struct atom_umc_info_v3_1 v31; +}; + +int amdgpu_atomfirmware_get_clock_info (struct amdgpu_device *adev) +{ +struct amdgpu_mode_info *mode_info = &adev->mode_info; +struct amdgpu_pll *spll = &adev->clock.spll; +struct amdgpu_pll *mpll = &adev->clock.mpll; +uint8_t frev, crev; +uint16_t data_offset; +int ret = -EINVAL , index; + + index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, + firmwareinfo); +if (amdgpu_atom_parse_data_header (mode_info->atom_context, index,NULL , + &frev, &crev, &data_offset)) { +union firmware_info *firmware_info = + (union firmware_info *)(mode_info->atom_context->bios + + data_offset); + + adev->clock.default_sclk = +le32_to_cpu (firmware_info->v31.bootup_sclk_in10khz); + adev->clock.default_mclk = +le32_to_cpu (firmware_info->v31.bootup_mclk_in10khz); + + adev->pm.current_sclk = adev->clock.default_sclk; + adev->pm.current_mclk = adev->clock.default_mclk; + +/* not technically a clock, but... */ + adev->mode_info.firmware_flags = +le32_to_cpu (firmware_info->v31.firmware_capability); + + ret =0 ; + } + + index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, + smu_info); +if (amdgpu_atom_parse_data_header (mode_info->atom_context, index,NULL , + &frev, &crev, &data_offset)) { +union smu_info *smu_info = + (union smu_info *)(mode_info->atom_context->bios + + data_offset); + +/* system clock */ + spll->reference_freq =le32_to_cpu (smu_info->v31.core_refclk_10khz); + + spll->reference_div =0 ; + spll->min_post_div =1 ; + spll->max_post_div =1 ; + spll->min_ref_div =2 ; + spll->max_ref_div =0xff ; + spll->min_feedback_div =4 ; + spll->max_feedback_div =0xff ; + spll->best_vco =0 ; + + ret =0 ; + } + + index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, + umc_info); +if (amdgpu_atom_parse_data_header (mode_info->atom_context, index,NULL , + &frev, &crev, &data_offset)) { +union umc_info *umc_info = + (union umc_info *)(mode_info->atom_context->bios + + data_offset); + +/* memory clock */ + mpll->reference_freq =le32_to_cpu (umc_info->v31.mem_refclk_10khz); + + mpll->reference_div =0 ; + mpll->min_post_div =1 ; + mpll->max_post_div =1 ; + mpll->min_ref_div =2 ; + mpll->max_ref_div =0xff ; + mpll->min_feedback_div =4 ; + mpll->max_feedback_div =0xff ; + mpll->best_vco =0 ; + + ret =0 ; + } + +return ret; +}drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h +1
-0@@ -28,5 +28,6 @@ bool amdgpu_atomfirmware_gpu_supports_virtualization(struct amdgpu_device *adev)void amdgpu_atomfirmware_scratch_regs_init (struct amdgpu_device *adev);int amdgpu_atomfirmware_allocate_fb_scratch (struct amdgpu_device *adev);int amdgpu_atomfirmware_get_vram_width (struct amdgpu_device *adev); +int amdgpu_atomfirmware_get_clock_info (struct amdgpu_device *adev);
Quoted 8 lines
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h +0
-1#endif --2.5.5
_______________________________________________
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
A message that is not in the archive (sent off-list or not yet received): [email protected]
Christian König
Acked-byAm 12.07.2017 um 04:48 schrieb zhoucm1:
Quoted 10 lines · Alex Deucher
Quoted 6 lines · Alex Deucher
Quoted 4 lines
The information has moved to different tables, notably
smu_infofor core refclk andumc_infofor mem refclk.Signed-off-by Alex Deucher <[email protected]>ping? this fixes looking up the reference clocks on vega10 and raven.
The both two are Acked-by: Chunming Zhou <[email protected]>
I think somebody else should dig into the AtomBIOS/AtomFirmware stuff as well, otherwise Alex becomes our single point of failure one more (ok that sounds funny, but I think you know what I mean).
Christian.
Quoted 145 lines
Quoted 136 lines
Alex
Quoted 132 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 93 ++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 1 + 2 files changed, 94 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +23
-0@@ -128,3 +128,96 @@ int amdgpu_atomfirmware_get_vram_width(struct amdgpu_device *adev)return 0 ; } + +union firmware_info { +struct atom_firmware_info_v3_1 v31; +}; + +union smu_info { +struct atom_smu_info_v3_1 v31; +}; + +union umc_info { +struct atom_umc_info_v3_1 v31; +}; + +int amdgpu_atomfirmware_get_clock_info (struct amdgpu_device *adev) +{ +struct amdgpu_mode_info *mode_info = &adev->mode_info; +struct amdgpu_pll *spll = &adev->clock.spll; +struct amdgpu_pll *mpll = &adev->clock.mpll; +uint8_t frev, crev; +uint16_t data_offset; +int ret = -EINVAL , index; + + index =get_index_into_master_table(atom_master_list_of_data_tables_v2_1,
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +2
-0+ firmwareinfo); + if (amdgpu_atom_parse_data_header(mode_info->atom_context,index, NULL,
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +3
-0+ &frev, &crev, &data_offset)) { + union firmware_info *firmware_info = + (union firmware_info*)(mode_info->atom_context->bios +
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +18
-0+ data_offset); + + adev->clock.default_sclk = +le32_to_cpu (firmware_info->v31.bootup_sclk_in10khz); + adev->clock.default_mclk = +le32_to_cpu (firmware_info->v31.bootup_mclk_in10khz); + + adev->pm.current_sclk = adev->clock.default_sclk; + adev->pm.current_mclk = adev->clock.default_mclk; + +/* not technically a clock, but... */ + adev->mode_info.firmware_flags = +le32_to_cpu (firmware_info->v31.firmware_capability); + + ret =0 ; + } + + index =get_index_into_master_table(atom_master_list_of_data_tables_v2_1,
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +2
-0+ smu_info); + if (amdgpu_atom_parse_data_header(mode_info->atom_context,index, NULL,
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +3
-0+ &frev, &crev, &data_offset)) { + union smu_info *smu_info = + (union smu_info*)(mode_info->atom_context->bios +
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +4
-0+ data_offset); + +/* system clock */ + spll->reference_freq =
le32_to_cpu(smu_info->v31.core_refclk_10khz);drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +14
-0+ + spll->reference_div =0 ; + spll->min_post_div =1 ; + spll->max_post_div =1 ; + spll->min_ref_div =2 ; + spll->max_ref_div =0xff ; + spll->min_feedback_div =4 ; + spll->max_feedback_div =0xff ; + spll->best_vco =0 ; + + ret =0 ; + } + + index =get_index_into_master_table(atom_master_list_of_data_tables_v2_1,
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +2
-0+ umc_info); + if (amdgpu_atom_parse_data_header(mode_info->atom_context,index, NULL,
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +3
-0+ &frev, &crev, &data_offset)) { + union umc_info *umc_info = + (union umc_info*)(mode_info->atom_context->bios +
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +4
-0+ data_offset); + +/* memory clock */ + mpll->reference_freq =
le32_to_cpu(umc_info->v31.mem_refclk_10khz);drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +15
-0+ + mpll->reference_div =0 ; + mpll->min_post_div =1 ; + mpll->max_post_div =1 ; + mpll->min_ref_div =2 ; + mpll->max_ref_div =0xff ; + mpll->min_feedback_div =4 ; + mpll->max_feedback_div =0xff ; + mpll->best_vco =0 ; + + ret =0 ; + } + +return ret; +}drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h +1
-0@@ -28,5 +28,6 @@ bool amdgpu_atomfirmware_gpu_supports_virtualization(struct amdgpu_device *adev) void amdgpu_atomfirmware_scratch_regs_init(struct amdgpu_device *adev);int amdgpu_atomfirmware_allocate_fb_scratch (struct amdgpu_device *adev);int amdgpu_atomfirmware_get_vram_width (struct amdgpu_device *adev); +int amdgpu_atomfirmware_get_clock_info (struct amdgpu_device *adev);Quoted 8 lines
Quoted 4 lines
#endif
Signature · 1 line
2.5.5_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
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