Vega20 Updates
Subsystems (2)
cover Vega20 Updates
This patch set implements SMU and PSP support for vega20. Patches 1-4 are huge register headers updates so I didn't send them to the list. The whole series can be viewed here:
https://cgit.freedesktop.org/~agd5f/linux/log/?h=vega20_psp_smu
Thanks,
Alex
Alex Deucher (2):
Revert "drm/amdgpu: Add nbio support for vega20 (v2)" drm/amdgpu: remove experimental flag for vega20
Evan Quan (28):
drm/amdgpu/include: add thm 11.0.2 headers
drm/amdgpu: update atomfirmware.h
drm/amd/powerplay: add vega20_inc.h (v2) drm/amd/powerplay: add smu11_driver_if.h (v4) drm/amd/powerplay: add vega20_ppsmc.h (v2) drm/amd/powerplay: add vega20_pptable.h (v2) drm/amd/powerplay: add the smu manager for vega20 (v2) drm/amd/powerplay: new interfaces for ActivityMonitor table with SMU drm/amd/powerplay: add the hw manager for vega20 (v3) drm/amd/powerplay: support workload profile query and setup for vega20 drm/amd/powerplay: init vega20 uvd/vce powergate status on dpm setup drm/amd/powerplay: correct force clock level related settings for
vega20 (v2)
drm/amd/powerplay: export vega20 stable pstate clocks drm/amd/powerplay: add vega20 pre_display_config_changed callback drm/amd/powerplay: conv the vega20 pstate sclk/mclk into necessary
10KHz unit
drm/amd/powerplay: initialize vega20 overdrive settings drm/amd/powerplay: new interfaces for overdrive vega20 sclk and mclk drm/amd/powerplay: revise vega20 PPSMC_MSG_SetSoftMin/[Max]ByFreq
settings
drm/amd/powerplay: update vega20 clocks threshold settings on power
state adjust
drm/amdgpu: enable vega20 powerplay support drm/amd/powerplay: enable fclk ss by default drm/amd/powerplay: remove setting soc floor voltage before sending
pptable
drm/amd/powerplay: avoid enabling/disabling uvd/vce dpm twice drm/amd/powerplay: correct the argument for
PPSMC_MSG_SetUclkFastSwitch
drm/amd/powerplay: allow slow switch only if NBPState enabled drm/amd/powerplay: remove max DCEFCLK limitation drm/amd/powerplay: added voltage boot time calibration drm/amdgpu: update vega20 sdma golden settings
Feifei Xu (7):
drm/amdgpu/include: Add nbio 7.4 header files (v4) drm/amdgpu/include: Add sdma0/1 4.2 register headerfiles. (v3) drm/amdgpu/include: Add mp 11.0 header files. (v2) drm/amdgpu: Add nbio 7.4 support for vega20 (v2) drm/amdgpu: Add psp 11.0 support for vega20. (v2) drm/amdgpu/gfx9: Update gfx9 golden settings. drm/amdgpu/psp: Enlarge PSP TMR SIZE from 3M to 4M.
Likun Gao (1):
drm/amdgpu/vg20: Change the load type of vega20 to psp (v2)
drivers/gpu/drm/amd/amdgpu/Makefile | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 20 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 3 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 18 +- drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 237 + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h | 31 + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 565 + drivers/gpu/drm/amd/amdgpu/psp_v11_0.h | 30 + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 2 - drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 68 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 11 +- drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + .../drm/amd/include/asic_reg/mp/mp_11_0_offset.h | 358 + .../drm/amd/include/asic_reg/mp/mp_11_0_sh_mask.h | 534 + .../amd/include/asic_reg/nbio/nbio_7_4_offset.h | 4627 ++ .../amd/include/asic_reg/nbio/nbio_7_4_sh_mask.h | 48436 +++++++++++++++++++ .../amd/include/asic_reg/sdma0/sdma0_4_2_offset.h | 1047 + .../amd/include/asic_reg/sdma0/sdma0_4_2_sh_mask.h | 2992 ++ .../amd/include/asic_reg/sdma1/sdma1_4_2_offset.h | 1039 + .../amd/include/asic_reg/sdma1/sdma1_4_2_sh_mask.h | 2948 ++ .../amd/include/asic_reg/thm/thm_11_0_2_offset.h | 37 + .../amd/include/asic_reg/thm/thm_11_0_2_sh_mask.h | 86 + drivers/gpu/drm/amd/include/atomfirmware.h | 86 + drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 4 +- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 8 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 3021 ++ drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h | 569 + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_inc.h | 35 + .../gpu/drm/amd/powerplay/hwmgr/vega20_powertune.c | 70 + .../gpu/drm/amd/powerplay/hwmgr/vega20_powertune.h | 32 + .../gpu/drm/amd/powerplay/hwmgr/vega20_pptable.h | 140 + .../amd/powerplay/hwmgr/vega20_processpptables.c | 964 + .../amd/powerplay/hwmgr/vega20_processpptables.h | 31 + .../gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c | 212 + .../gpu/drm/amd/powerplay/hwmgr/vega20_thermal.h | 64 + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 2 + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + .../gpu/drm/amd/powerplay/inc/smu11_driver_if.h | 831 + drivers/gpu/drm/amd/powerplay/inc/vega20_ppsmc.h | 127 + drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 2 +- .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 587 + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.h | 65 + 45 files changed, 69910 insertions(+), 52 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v11_0.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_0_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_11_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_4_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_4_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_2_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_2_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_2_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_2_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/thm/thm_11_0_2_offset.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/thm/thm_11_0_2_sh_mask.h create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_inc.h create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_powertune.c create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_powertune.h create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_pptable.h create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_processpptables.c create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_processpptables.h create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_thermal.h create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if.h create mode 100644 drivers/gpu/drm/amd/powerplay/inc/vega20_ppsmc.h create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.h
Signature · 6 lines
2.13.6 _______________________________________________ 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): 20180814165248.27987-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 5/38 Revert "drm/amdgpu: Add nbio support for vega20 (v2)"
Revert this to add proper nbio 7.4 support.
This reverts commit f5b2e1fa321eff20a9418ebd497d8a466f024a85.
--- drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 18 +----------------- drivers/gpu/drm/amd/amdgpu/soc15.c | 2 -- 2 files changed, 1 insertion(+), 19 deletions(-)
drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c +1 -17
@@ -34,19 +34,10 @@#define smnCPM_CONTROL 0x11180460#define smnPCIE_CNTL2 0x11180070 -/* vega20 */ -#define mmRCC_DEV0_EPF0_STRAP0_VG20 0x0011 -#define mmRCC_DEV0_EPF0_STRAP0_VG20_BASE_IDX 2 -static u32 nbio_v7_0_get_rev_id (struct amdgpu_device *adev) {u32 tmp =RREG32_SOC15 (NBIO ,0 , mmRCC_DEV0_EPF0_STRAP0); -if (adev->asic_type ==CHIP_VEGA20 ) - tmp =RREG32_SOC15 (NBIO ,0 , mmRCC_DEV0_EPF0_STRAP0_VG20); -else - tmp =RREG32_SOC15 (NBIO ,0 , mmRCC_DEV0_EPF0_STRAP0); - tmp &=RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0_MASK ; tmp >>=RCC_DEV0_EPF0_STRAP0__STRAP_ATI_REV_ID_DEV0_F0__SHIFT ;
@@ -84,14 +75,10 @@ static void nbio_v7_0_sdma_doorbell_range(struct amdgpu_device *adev, int instanSOC15_REG_OFFSET (NBIO ,0 , mmBIF_SDMA1_DOORBELL_RANGE);u32 doorbell_range =RREG32 (reg); -u32 range =2 ; - -if (adev->asic_type ==CHIP_VEGA20 ) - range =8 ;if (use_doorbell) { doorbell_range =REG_SET_FIELD (doorbell_range,BIF_SDMA0_DOORBELL_RANGE ,OFFSET , doorbell_index); - doorbell_range =REG_SET_FIELD (doorbell_range,BIF_SDMA0_DOORBELL_RANGE ,SIZE , range); + doorbell_range =REG_SET_FIELD (doorbell_range,BIF_SDMA0_DOORBELL_RANGE ,SIZE ,2 ); }else doorbell_range =REG_SET_FIELD (doorbell_range,BIF_SDMA0_DOORBELL_RANGE ,SIZE ,0 );
@@ -146,9 +133,6 @@ static void nbio_v7_0_update_medium_grain_clock_gating(struct amdgpu_device *ade {uint32_t def, data; -if (adev->asic_type ==CHIP_VEGA20 ) -return ; -/* NBIF_MGCG_CTRL_LCLK */ def = data =RREG32_PCIE (smnNBIF_MGCG_CTRL_LCLK);
drivers/gpu/drm/amd/amdgpu/soc15.c +0 -2
@@ -497,8 +497,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)if (adev->flags &AMD_IS_APU ) adev->nbio_funcs = &nbio_v7_0_funcs; -else if (adev->asic_type ==CHIP_VEGA20 ) - adev->nbio_funcs = &nbio_v7_0_funcs;else adev->nbio_funcs = &nbio_v6_1_funcs;
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/38 drm/amdgpu: Add nbio 7.4 support for vega20 (v2)
In reply to a message not in the archiveFrom: Feifei Xu <[email protected]>
Some register offset in nbio v7.4 are different with v7.0. We need a seperate nbio_v7_4.c for vega20.
v2: fix doorbell range for sdma (Alex)
--- drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 237 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h | 31 +++++ drivers/gpu/drm/amd/amdgpu/soc15.c | 2 + drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + 5 files changed, 272 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h
drivers/gpu/drm/amd/amdgpu/Makefile +1 -1
@@ -62,7 +62,7 @@ amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.o gfx_v6_0.o si_ih.o si_dma.o dce amdgpu-y += \ vi.o mxgpu_vi.o nbio_v6_1.o soc15.o emu_soc.o mxgpu_ai.o nbio_v7_0.o vega10_reg_init.o \ - vega20_reg_init.o + vega20_reg_init.o nbio_v7_4.o # add DF block amdgpu-y += \
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c new file +237 -0
237 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.h new file +31 -0
@@ -0,0 +1,31 @@ +/* +* Copyright 2018 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +*/ + +#ifndef __NBIO_V7_4_H__ +#define __NBIO_V7_4_H__ + +#include "soc15_common.h" + +extern const struct amdgpu_nbio_funcs nbio_v7_4_funcs; + +#endif
drivers/gpu/drm/amd/amdgpu/soc15.c +2 -0
@@ -497,6 +497,8 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)if (adev->flags &AMD_IS_APU ) adev->nbio_funcs = &nbio_v7_0_funcs; +else if (adev->asic_type ==CHIP_VEGA20 ) + adev->nbio_funcs = &nbio_v7_4_funcs;else adev->nbio_funcs = &nbio_v6_1_funcs;
drivers/gpu/drm/amd/amdgpu/soc15.h +1 -0
@@ -26,6 +26,7 @@#include "nbio_v6_1.h" #include "nbio_v7_0.h" +#include "nbio_v7_4.h" #define SOC15_FLUSH_GPU_TLB_NUM_WREG 4#define SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT 1
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/38 drm/amdgpu: update atomfirmware.h
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Add struct atom_smc_dpm_info_v4_3
--- drivers/gpu/drm/amd/include/atomfirmware.h | 86 ++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+)
drivers/gpu/drm/amd/include/atomfirmware.h +86 -0
@@ -1446,6 +1446,92 @@ struct atom_smc_dpm_info_v4_1uint32_t boardreserved[9 ]; }; +/* +*************************************************************************** +Data Table smc_dpm_info structure +*************************************************************************** +*/ +struct atom_smc_dpm_info_v4_3 +{ +struct atom_common_table_header table_header; +uint8_t liquid1_i2c_address; +uint8_t liquid2_i2c_address; +uint8_t vr_i2c_address; +uint8_t plx_i2c_address; + +uint8_t liquid_i2c_linescl; +uint8_t liquid_i2c_linesda; +uint8_t vr_i2c_linescl; +uint8_t vr_i2c_linesda; + +uint8_t plx_i2c_linescl; +uint8_t plx_i2c_linesda; +uint8_t vrsensorpresent; +uint8_t liquidsensorpresent; + +uint16_t maxvoltagestepgfx; +uint16_t maxvoltagestepsoc; + +uint8_t vddgfxvrmapping; +uint8_t vddsocvrmapping; +uint8_t vddmem0vrmapping; +uint8_t vddmem1vrmapping; + +uint8_t gfxulvphasesheddingmask; +uint8_t soculvphasesheddingmask; +uint8_t externalsensorpresent; +uint8_t padding8_v; + +uint16_t gfxmaxcurrent; +uint8_t gfxoffset; +uint8_t padding_telemetrygfx; + +uint16_t socmaxcurrent; +uint8_t socoffset; +uint8_t padding_telemetrysoc; + +uint16_t mem0maxcurrent; +uint8_t mem0offset; +uint8_t padding_telemetrymem0; + +uint16_t mem1maxcurrent; +uint8_t mem1offset; +uint8_t padding_telemetrymem1; + +uint8_t acdcgpio; +uint8_t acdcpolarity; +uint8_t vr0hotgpio; +uint8_t vr0hotpolarity; + +uint8_t vr1hotgpio; +uint8_t vr1hotpolarity; +uint8_t padding1; +uint8_t padding2; + +uint8_t ledpin0; +uint8_t ledpin1; +uint8_t ledpin2; +uint8_t padding8_4; + +uint8_t pllgfxclkspreadenabled; +uint8_t pllgfxclkspreadpercent; +uint16_t pllgfxclkspreadfreq; + +uint8_t uclkspreadenabled; +uint8_t uclkspreadpercent; +uint16_t uclkspreadfreq; + +uint8_t fclkspreadenabled; +uint8_t fclkspreadpercent; +uint16_t fclkspreadfreq; + +uint8_t fllgfxclkspreadenabled; +uint8_t fllgfxclkspreadpercent; +uint16_t fllgfxclkspreadfreq; + +uint32_t boardreserved[10 ]; +}; +/* *************************************************************************** Data Table asic_profiling_info structure
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/38 drm/amd/powerplay: add vega20_inc.h (v2)
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
v2: use thm 11.0.2 headers
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_inc.h | 35 ++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_inc.h
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_inc.h new file +35 -0
@@ -0,0 +1,35 @@ +/* +* Copyright 2018 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +*/ + +#ifndef VEGA20_INC_H +#define VEGA20_INC_H + +#include "asic_reg/thm/thm_11_0_2_offset.h" +#include "asic_reg/thm/thm_11_0_2_sh_mask.h" + +#include "asic_reg/mp/mp_9_0_offset.h" +#include "asic_reg/mp/mp_9_0_sh_mask.h" + +#include "asic_reg/nbio/nbio_7_4_offset.h" + +#endif
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/38 drm/amd/powerplay: add smu11_driver_if.h (v4)
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
v2: cleanup
v3: fit the latest 40.6 smc fw
v4: update to latest.
--- .../gpu/drm/amd/powerplay/inc/smu11_driver_if.h | 831 +++++++++++++++++++++ 1 file changed, 831 insertions(+) create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if.h
drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if.h new file +831 -0
@@ -0,0 +1,831 @@ +/* +* Copyright 2018 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +*/ + +#ifndef SMU11_DRIVER_IF_H +#define SMU11_DRIVER_IF_H + +// *** IMPORTANT *** +// SMU TEAM: Always increment the interface version if +// any structure is changed in this file +#define SMU11_DRIVER_IF_VERSION 0x11 + +#define PPTABLE_V20_SMU_VERSION 2 + +#define NUM_GFXCLK_DPM_LEVELS 16 +#define NUM_VCLK_DPM_LEVELS 8 +#define NUM_DCLK_DPM_LEVELS 8 +#define NUM_ECLK_DPM_LEVELS 8 +#define NUM_MP0CLK_DPM_LEVELS 2 +#define NUM_SOCCLK_DPM_LEVELS 8 +#define NUM_UCLK_DPM_LEVELS 4 +#define NUM_FCLK_DPM_LEVELS 8 +#define NUM_DCEFCLK_DPM_LEVELS 8 +#define NUM_DISPCLK_DPM_LEVELS 8 +#define NUM_PIXCLK_DPM_LEVELS 8 +#define NUM_PHYCLK_DPM_LEVELS 8 +#define NUM_LINK_LEVELS 2 +#define NUM_XGMI_LEVELS 2 + +#define MAX_GFXCLK_DPM_LEVEL (NUM_GFXCLK_DPM_LEVELS - 1) +#define MAX_VCLK_DPM_LEVEL (NUM_VCLK_DPM_LEVELS - 1) +#define MAX_DCLK_DPM_LEVEL (NUM_DCLK_DPM_LEVELS - 1) +#define MAX_ECLK_DPM_LEVEL (NUM_ECLK_DPM_LEVELS - 1) +#define MAX_MP0CLK_DPM_LEVEL (NUM_MP0CLK_DPM_LEVELS - 1) +#define MAX_SOCCLK_DPM_LEVEL (NUM_SOCCLK_DPM_LEVELS - 1) +#define MAX_UCLK_DPM_LEVEL (NUM_UCLK_DPM_LEVELS - 1) +#define MAX_FCLK_DPM_LEVEL (NUM_FCLK_DPM_LEVELS - 1) +#define MAX_DCEFCLK_DPM_LEVEL (NUM_DCEFCLK_DPM_LEVELS - 1) +#define MAX_DISPCLK_DPM_LEVEL (NUM_DISPCLK_DPM_LEVELS - 1) +#define MAX_PIXCLK_DPM_LEVEL (NUM_PIXCLK_DPM_LEVELS - 1) +#define MAX_PHYCLK_DPM_LEVEL (NUM_PHYCLK_DPM_LEVELS - 1) +#define MAX_LINK_LEVEL (NUM_LINK_LEVELS - 1) +#define MAX_XGMI_LEVEL (NUM_XGMI_LEVELS - 1) + +#define PPSMC_GeminiModeNone 0 +#define PPSMC_GeminiModeMaster 1 +#define PPSMC_GeminiModeSlave 2 + + +#define FEATURE_DPM_PREFETCHER_BIT 0 +#define FEATURE_DPM_GFXCLK_BIT 1 +#define FEATURE_DPM_UCLK_BIT 2 +#define FEATURE_DPM_SOCCLK_BIT 3 +#define FEATURE_DPM_UVD_BIT 4 +#define FEATURE_DPM_VCE_BIT 5 +#define FEATURE_ULV_BIT 6 +#define FEATURE_DPM_MP0CLK_BIT 7 +#define FEATURE_DPM_LINK_BIT 8 +#define FEATURE_DPM_DCEFCLK_BIT 9 +#define FEATURE_DS_GFXCLK_BIT 10 +#define FEATURE_DS_SOCCLK_BIT 11 +#define FEATURE_DS_LCLK_BIT 12 +#define FEATURE_PPT_BIT 13 +#define FEATURE_TDC_BIT 14 +#define FEATURE_THERMAL_BIT 15 +#define FEATURE_GFX_PER_CU_CG_BIT 16 +#define FEATURE_RM_BIT 17 +#define FEATURE_DS_DCEFCLK_BIT 18 +#define FEATURE_ACDC_BIT 19 +#define FEATURE_VR0HOT_BIT 20 +#define FEATURE_VR1HOT_BIT 21 +#define FEATURE_FW_CTF_BIT 22 +#define FEATURE_LED_DISPLAY_BIT 23 +#define FEATURE_FAN_CONTROL_BIT 24 +#define FEATURE_GFX_EDC_BIT 25 +#define FEATURE_GFXOFF_BIT 26 +#define FEATURE_CG_BIT 27 +#define FEATURE_DPM_FCLK_BIT 28 +#define FEATURE_DS_FCLK_BIT 29 +#define FEATURE_DS_MP1CLK_BIT 30 +#define FEATURE_DS_MP0CLK_BIT 31 +#define FEATURE_XGMI_BIT 32 +#define FEATURE_SPARE_33_BIT 33 +#define FEATURE_SPARE_34_BIT 34 +#define FEATURE_SPARE_35_BIT 35 +#define FEATURE_SPARE_36_BIT 36 +#define FEATURE_SPARE_37_BIT 37 +#define FEATURE_SPARE_38_BIT 38 +#define FEATURE_SPARE_39_BIT 39 +#define FEATURE_SPARE_40_BIT 40 +#define FEATURE_SPARE_41_BIT 41 +#define FEATURE_SPARE_42_BIT 42 +#define FEATURE_SPARE_43_BIT 43 +#define FEATURE_SPARE_44_BIT 44 +#define FEATURE_SPARE_45_BIT 45 +#define FEATURE_SPARE_46_BIT 46 +#define FEATURE_SPARE_47_BIT 47 +#define FEATURE_SPARE_48_BIT 48 +#define FEATURE_SPARE_49_BIT 49 +#define FEATURE_SPARE_50_BIT 50 +#define FEATURE_SPARE_51_BIT 51 +#define FEATURE_SPARE_52_BIT 52 +#define FEATURE_SPARE_53_BIT 53 +#define FEATURE_SPARE_54_BIT 54 +#define FEATURE_SPARE_55_BIT 55 +#define FEATURE_SPARE_56_BIT 56 +#define FEATURE_SPARE_57_BIT 57 +#define FEATURE_SPARE_58_BIT 58 +#define FEATURE_SPARE_59_BIT 59 +#define FEATURE_SPARE_60_BIT 60 +#define FEATURE_SPARE_61_BIT 61 +#define FEATURE_SPARE_62_BIT 62 +#define FEATURE_SPARE_63_BIT 63 + +#define NUM_FEATURES 64 + +#define FEATURE_DPM_PREFETCHER_MASK (1 << FEATURE_DPM_PREFETCHER_BIT ) +#define FEATURE_DPM_GFXCLK_MASK (1 << FEATURE_DPM_GFXCLK_BIT ) +#define FEATURE_DPM_UCLK_MASK (1 << FEATURE_DPM_UCLK_BIT ) +#define FEATURE_DPM_SOCCLK_MASK (1 << FEATURE_DPM_SOCCLK_BIT ) +#define FEATURE_DPM_UVD_MASK (1 << FEATURE_DPM_UVD_BIT ) +#define FEATURE_DPM_VCE_MASK (1 << FEATURE_DPM_VCE_BIT ) +#define FEATURE_ULV_MASK (1 << FEATURE_ULV_BIT ) +#define FEATURE_DPM_MP0CLK_MASK (1 << FEATURE_DPM_MP0CLK_BIT ) +#define FEATURE_DPM_LINK_MASK (1 << FEATURE_DPM_LINK_BIT ) +#define FEATURE_DPM_DCEFCLK_MASK (1 << FEATURE_DPM_DCEFCLK_BIT ) +#define FEATURE_DS_GFXCLK_MASK (1 << FEATURE_DS_GFXCLK_BIT ) +#define FEATURE_DS_SOCCLK_MASK (1 << FEATURE_DS_SOCCLK_BIT ) +#define FEATURE_DS_LCLK_MASK (1 << FEATURE_DS_LCLK_BIT ) +#define FEATURE_PPT_MASK (1 << FEATURE_PPT_BIT ) +#define FEATURE_TDC_MASK (1 << FEATURE_TDC_BIT ) +#define FEATURE_THERMAL_MASK (1 << FEATURE_THERMAL_BIT ) +#define FEATURE_GFX_PER_CU_CG_MASK (1 << FEATURE_GFX_PER_CU_CG_BIT ) +#define FEATURE_RM_MASK (1 << FEATURE_RM_BIT ) +#define FEATURE_DS_DCEFCLK_MASK (1 << FEATURE_DS_DCEFCLK_BIT ) +#define FEATURE_ACDC_MASK (1 << FEATURE_ACDC_BIT ) +#define FEATURE_VR0HOT_MASK (1 << FEATURE_VR0HOT_BIT ) +#define FEATURE_VR1HOT_MASK (1 << FEATURE_VR1HOT_BIT ) +#define FEATURE_FW_CTF_MASK (1 << FEATURE_FW_CTF_BIT ) +#define FEATURE_LED_DISPLAY_MASK (1 << FEATURE_LED_DISPLAY_BIT ) +#define FEATURE_FAN_CONTROL_MASK (1 << FEATURE_FAN_CONTROL_BIT ) +#define FEATURE_GFX_EDC_MASK (1 << FEATURE_GFX_EDC_BIT ) +#define FEATURE_GFXOFF_MASK (1 << FEATURE_GFXOFF_BIT ) +#define FEATURE_CG_MASK (1 << FEATURE_CG_BIT ) +#define FEATURE_DPM_FCLK_MASK (1 << FEATURE_DPM_FCLK_BIT ) +#define FEATURE_DS_FCLK_MASK (1 << FEATURE_DS_FCLK_BIT ) +#define FEATURE_DS_MP1CLK_MASK (1 << FEATURE_DS_MP1CLK_BIT ) +#define FEATURE_DS_MP0CLK_MASK (1 << FEATURE_DS_MP0CLK_BIT ) + + +#define DPM_OVERRIDE_DISABLE_SOCCLK_PID 0x00000001 +#define DPM_OVERRIDE_DISABLE_UCLK_PID 0x00000002 +#define DPM_OVERRIDE_ENABLE_VOLT_LINK_UVD_SOCCLK 0x00000004 +#define DPM_OVERRIDE_ENABLE_VOLT_LINK_UVD_UCLK 0x00000008 +#define DPM_OVERRIDE_ENABLE_FREQ_LINK_VCLK_SOCCLK 0x00000010 +#define DPM_OVERRIDE_ENABLE_FREQ_LINK_VCLK_UCLK 0x00000020 +#define DPM_OVERRIDE_ENABLE_FREQ_LINK_DCLK_SOCCLK 0x00000040 +#define DPM_OVERRIDE_ENABLE_FREQ_LINK_DCLK_UCLK 0x00000080 +#define DPM_OVERRIDE_ENABLE_VOLT_LINK_VCE_SOCCLK 0x00000100 +#define DPM_OVERRIDE_ENABLE_VOLT_LINK_VCE_UCLK 0x00000200 +#define DPM_OVERRIDE_ENABLE_FREQ_LINK_ECLK_SOCCLK 0x00000400 +#define DPM_OVERRIDE_ENABLE_FREQ_LINK_ECLK_UCLK 0x00000800 +#define DPM_OVERRIDE_ENABLE_FREQ_LINK_GFXCLK_SOCCLK 0x00001000 +#define DPM_OVERRIDE_ENABLE_FREQ_LINK_GFXCLK_UCLK 0x00002000 +#define DPM_OVERRIDE_ENABLE_GFXOFF_GFXCLK_SWITCH 0x00004000 +#define DPM_OVERRIDE_ENABLE_GFXOFF_SOCCLK_SWITCH 0x00008000 +#define DPM_OVERRIDE_ENABLE_GFXOFF_UCLK_SWITCH 0x00010000 +#define DPM_OVERRIDE_ENABLE_GFXOFF_FCLK_SWITCH 0x00020000 + +#define VR_MAPPING_VR_SELECT_MASK 0x01 +#define VR_MAPPING_VR_SELECT_SHIFT 0x00 + +#define VR_MAPPING_PLANE_SELECT_MASK 0x02 +#define VR_MAPPING_PLANE_SELECT_SHIFT 0x01 + + +#define PSI_SEL_VR0_PLANE0_PSI0 0x01 +#define PSI_SEL_VR0_PLANE0_PSI1 0x02 +#define PSI_SEL_VR0_PLANE1_PSI0 0x04 +#define PSI_SEL_VR0_PLANE1_PSI1 0x08 +#define PSI_SEL_VR1_PLANE0_PSI0 0x10 +#define PSI_SEL_VR1_PLANE0_PSI1 0x20 +#define PSI_SEL_VR1_PLANE1_PSI0 0x40 +#define PSI_SEL_VR1_PLANE1_PSI1 0x80 + + +#define THROTTLER_STATUS_PADDING_BIT 0 +#define THROTTLER_STATUS_TEMP_EDGE_BIT 1 +#define THROTTLER_STATUS_TEMP_HOTSPOT_BIT 2 +#define THROTTLER_STATUS_TEMP_HBM_BIT 3 +#define THROTTLER_STATUS_TEMP_VR_GFX_BIT 4 +#define THROTTLER_STATUS_TEMP_VR_MEM_BIT 5 +#define THROTTLER_STATUS_TEMP_LIQUID_BIT 6 +#define THROTTLER_STATUS_TEMP_PLX_BIT 7 +#define THROTTLER_STATUS_TEMP_SKIN_BIT 8 +#define THROTTLER_STATUS_TDC_GFX_BIT 9 +#define THROTTLER_STATUS_TDC_SOC_BIT 10 +#define THROTTLER_STATUS_PPT_BIT 11 +#define THROTTLER_STATUS_FIT_BIT 12 +#define THROTTLER_STATUS_PPM_BIT 13 + + +#define TABLE_TRANSFER_OK 0x0 +#define TABLE_TRANSFER_FAILED 0xFF + + +#define WORKLOAD_DEFAULT_BIT 0 +#define WORKLOAD_PPLIB_FULL_SCREEN_3D_BIT 1 +#define WORKLOAD_PPLIB_POWER_SAVING_BIT 2 +#define WORKLOAD_PPLIB_VIDEO_BIT 3 +#define WORKLOAD_PPLIB_VR_BIT 4 +#define WORKLOAD_PPLIB_COMPUTE_BIT 5 +#define WORKLOAD_PPLIB_CUSTOM_BIT 6 +#define WORKLOAD_PPLIB_COUNT 7 + + +#define XGMI_STATE_D0 1 +#define XGMI_STATE_D3 0 + +typedef struct { +uint32_t a; +uint32_t b; +uint32_t c; +}QuadraticInt_t ; + +typedef struct { +uint32_t m; +uint32_t b; +}LinearInt_t ; + +typedef struct { +uint32_t a; +uint32_t b; +uint32_t c; +}DroopInt_t ; + +typedef enum { +PPCLK_GFXCLK , +PPCLK_VCLK , +PPCLK_DCLK , +PPCLK_ECLK , +PPCLK_SOCCLK , +PPCLK_UCLK , +PPCLK_DCEFCLK , +PPCLK_DISPCLK , +PPCLK_PIXCLK , +PPCLK_PHYCLK , +PPCLK_FCLK , +PPCLK_COUNT , +}PPCLK_e ; + +typedef enum { +VOLTAGE_MODE_AVFS =0 , +VOLTAGE_MODE_AVFS_SS , +VOLTAGE_MODE_SS , +VOLTAGE_MODE_COUNT , +}VOLTAGE_MODE_e ; + + +typedef enum { +AVFS_VOLTAGE_GFX =0 , +AVFS_VOLTAGE_SOC , +AVFS_VOLTAGE_COUNT , +}AVFS_VOLTAGE_TYPE_e ; + + +typedef struct { +uint8_t VoltageMode; +uint8_t SnapToDiscrete; +uint8_t NumDiscreteLevels; +uint8_t padding; +LinearInt_t ConversionToAvfsClk; +QuadraticInt_t SsCurve; +}DpmDescriptor_t ; + +typedef struct { +uint32_t Version; + + +uint32_t FeaturesToRun[2 ]; + + +uint16_t SocketPowerLimitAc0; +uint16_t SocketPowerLimitAc0Tau; +uint16_t SocketPowerLimitAc1; +uint16_t SocketPowerLimitAc1Tau; +uint16_t SocketPowerLimitAc2; +uint16_t SocketPowerLimitAc2Tau; +uint16_t SocketPowerLimitAc3; +uint16_t SocketPowerLimitAc3Tau; +uint16_t SocketPowerLimitDc; +uint16_t SocketPowerLimitDcTau; +uint16_t TdcLimitSoc; +uint16_t TdcLimitSocTau; +uint16_t TdcLimitGfx; +uint16_t TdcLimitGfxTau; + +uint16_t TedgeLimit; +uint16_t ThotspotLimit; +uint16_t ThbmLimit; +uint16_t Tvr_gfxLimit; +uint16_t Tvr_memLimit; +uint16_t Tliquid1Limit; +uint16_t Tliquid2Limit; +uint16_t TplxLimit; +uint32_t FitLimit; + +uint16_t PpmPowerLimit; +uint16_t PpmTemperatureThreshold; + +uint8_t MemoryOnPackage; +uint8_t padding8_limits[3 ]; + + +uint16_t UlvVoltageOffsetSoc; +uint16_t UlvVoltageOffsetGfx; + +uint8_t UlvSmnclkDid; +uint8_t UlvMp1clkDid; +uint8_t UlvGfxclkBypass; +uint8_t Padding234; + + +uint16_t MinVoltageGfx; +uint16_t MinVoltageSoc; +uint16_t MaxVoltageGfx; +uint16_t MaxVoltageSoc; + +uint16_t LoadLineResistanceGfx; +uint16_t LoadLineResistanceSoc; + +DpmDescriptor_t DpmDescriptor[PPCLK_COUNT ]; + +uint16_t FreqTableGfx [NUM_GFXCLK_DPM_LEVELS ]; +uint16_t FreqTableVclk [NUM_VCLK_DPM_LEVELS ]; +uint16_t FreqTableDclk [NUM_DCLK_DPM_LEVELS ]; +uint16_t FreqTableEclk [NUM_ECLK_DPM_LEVELS ]; +uint16_t FreqTableSocclk [NUM_SOCCLK_DPM_LEVELS ]; +uint16_t FreqTableUclk [NUM_UCLK_DPM_LEVELS ]; +uint16_t FreqTableFclk [NUM_FCLK_DPM_LEVELS ]; +uint16_t FreqTableDcefclk [NUM_DCEFCLK_DPM_LEVELS ]; +uint16_t FreqTableDispclk [NUM_DISPCLK_DPM_LEVELS ]; +uint16_t FreqTablePixclk [NUM_PIXCLK_DPM_LEVELS ]; +uint16_t FreqTablePhyclk [NUM_PHYCLK_DPM_LEVELS ]; + +uint16_t DcModeMaxFreq [PPCLK_COUNT ]; +uint16_t Padding8_Clks; + +uint16_t Mp0clkFreq [NUM_MP0CLK_DPM_LEVELS ]; +uint16_t Mp0DpmVoltage [NUM_MP0CLK_DPM_LEVELS ]; + + +uint16_t GfxclkFidle; +uint16_t GfxclkSlewRate; +uint16_t CksEnableFreq; +uint16_t Padding789; +QuadraticInt_t CksVoltageOffset; +uint8_t Padding567[4 ]; +uint16_t GfxclkDsMaxFreq; +uint8_t GfxclkSource; +uint8_t Padding456; + +uint8_t LowestUclkReservedForUlv; +uint8_t Padding8_Uclk[3 ]; + + +uint8_t PcieGenSpeed[NUM_LINK_LEVELS ]; +uint8_t PcieLaneCount[NUM_LINK_LEVELS ]; +uint16_t LclkFreq[NUM_LINK_LEVELS ]; + + +uint16_t EnableTdpm; +uint16_t TdpmHighHystTemperature; +uint16_t TdpmLowHystTemperature; +uint16_t GfxclkFreqHighTempLimit; + + +uint16_t FanStopTemp; +uint16_t FanStartTemp; + +uint16_t FanGainEdge; +uint16_t FanGainHotspot; +uint16_t FanGainLiquid; +uint16_t FanGainVrVddc; +uint16_t FanGainVrMvdd; +uint16_t FanGainPlx; +uint16_t FanGainHbm; +uint16_t FanPwmMin; +uint16_t FanAcousticLimitRpm; +uint16_t FanThrottlingRpm; +uint16_t FanMaximumRpm; +uint16_t FanTargetTemperature; +uint16_t FanTargetGfxclk; +uint8_t FanZeroRpmEnable; +uint8_t FanTachEdgePerRev; + + + +int16_t FuzzyFan_ErrorSetDelta; +int16_t FuzzyFan_ErrorRateSetDelta; +int16_t FuzzyFan_PwmSetDelta; +uint16_t FuzzyFan_Reserved; + + +uint8_t OverrideAvfsGb[AVFS_VOLTAGE_COUNT ]; +uint8_t Padding8_Avfs[2 ]; + +QuadraticInt_t qAvfsGb[AVFS_VOLTAGE_COUNT ]; +DroopInt_t dBtcGbGfxCksOn; +DroopInt_t dBtcGbGfxCksOff; +DroopInt_t dBtcGbGfxAfll; +DroopInt_t dBtcGbSoc; +LinearInt_t qAgingGb[AVFS_VOLTAGE_COUNT ]; + +QuadraticInt_t qStaticVoltageOffset[AVFS_VOLTAGE_COUNT ]; + +uint16_t DcTol[AVFS_VOLTAGE_COUNT ]; + +uint8_t DcBtcEnabled[AVFS_VOLTAGE_COUNT ]; +uint8_t Padding8_GfxBtc[2 ]; + +uint16_t DcBtcMin[AVFS_VOLTAGE_COUNT ]; +uint16_t DcBtcMax[AVFS_VOLTAGE_COUNT ]; + + +uint8_t XgmiLinkSpeed [NUM_XGMI_LEVELS ]; +uint8_t XgmiLinkWidth [NUM_XGMI_LEVELS ]; +uint16_t XgmiFclkFreq [NUM_XGMI_LEVELS ]; +uint16_t XgmiUclkFreq [NUM_XGMI_LEVELS ]; +uint16_t XgmiSocclkFreq [NUM_XGMI_LEVELS ]; +uint16_t XgmiSocVoltage [NUM_XGMI_LEVELS ]; + +uint32_t DebugOverrides; +QuadraticInt_t ReservedEquation0; +QuadraticInt_t ReservedEquation1; +QuadraticInt_t ReservedEquation2; +QuadraticInt_t ReservedEquation3; + +uint16_t MinVoltageUlvGfx; +uint16_t MinVoltageUlvSoc; + +uint16_t MGpuFanBoostLimitRpm; +uint16_t padding16_Fan; + +uint32_t Reserved[13 ]; + + + +uint8_t Liquid1_I2C_address; +uint8_t Liquid2_I2C_address; +uint8_t Vr_I2C_address; +uint8_t Plx_I2C_address; + +uint8_t Liquid_I2C_LineSCL; +uint8_t Liquid_I2C_LineSDA; +uint8_t Vr_I2C_LineSCL; +uint8_t Vr_I2C_LineSDA; + +uint8_t Plx_I2C_LineSCL; +uint8_t Plx_I2C_LineSDA; +uint8_t VrSensorPresent; +uint8_t LiquidSensorPresent; + +uint16_t MaxVoltageStepGfx; +uint16_t MaxVoltageStepSoc; + +uint8_t VddGfxVrMapping; +uint8_t VddSocVrMapping; +uint8_t VddMem0VrMapping; +uint8_t VddMem1VrMapping; + +uint8_t GfxUlvPhaseSheddingMask; +uint8_t SocUlvPhaseSheddingMask; +uint8_t ExternalSensorPresent; +uint8_t Padding8_V; + + +uint16_t GfxMaxCurrent; +int8_t GfxOffset; +uint8_t Padding_TelemetryGfx; + +uint16_t SocMaxCurrent; +int8_t SocOffset; +uint8_t Padding_TelemetrySoc; + +uint16_t Mem0MaxCurrent; +int8_t Mem0Offset; +uint8_t Padding_TelemetryMem0; + +uint16_t Mem1MaxCurrent; +int8_t Mem1Offset; +uint8_t Padding_TelemetryMem1; + + +uint8_t AcDcGpio; +uint8_t AcDcPolarity; +uint8_t VR0HotGpio; +uint8_t VR0HotPolarity; + +uint8_t VR1HotGpio; +uint8_t VR1HotPolarity; +uint8_t Padding1; +uint8_t Padding2; + + + +uint8_t LedPin0; +uint8_t LedPin1; +uint8_t LedPin2; +uint8_t padding8_4; + + +uint8_t PllGfxclkSpreadEnabled; +uint8_t PllGfxclkSpreadPercent; +uint16_t PllGfxclkSpreadFreq; + +uint8_t UclkSpreadEnabled; +uint8_t UclkSpreadPercent; +uint16_t UclkSpreadFreq; + +uint8_t FclkSpreadEnabled; +uint8_t FclkSpreadPercent; +uint16_t FclkSpreadFreq; + +uint8_t FllGfxclkSpreadEnabled; +uint8_t FllGfxclkSpreadPercent; +uint16_t FllGfxclkSpreadFreq; + +uint32_t BoardReserved[10 ]; + + +uint32_t MmHubPadding[8 ]; + +}PPTable_t ; + +typedef struct { + +uint16_t GfxclkAverageLpfTau; +uint16_t SocclkAverageLpfTau; +uint16_t UclkAverageLpfTau; +uint16_t GfxActivityLpfTau; +uint16_t UclkActivityLpfTau; + + +uint32_t MmHubPadding[8 ]; +}DriverSmuConfig_t ; + +typedef struct { + +uint16_t GfxclkFmin; +uint16_t GfxclkFmax; +uint16_t GfxclkFreq1; +uint16_t GfxclkOffsetVolt1; +uint16_t GfxclkFreq2; +uint16_t GfxclkOffsetVolt2; +uint16_t GfxclkFreq3; +uint16_t GfxclkOffsetVolt3; +uint16_t UclkFmax; +int16_t OverDrivePct; +uint16_t FanMaximumRpm; +uint16_t FanMinimumPwm; +uint16_t FanTargetTemperature; +uint16_t MaxOpTemp; +uint16_t FanZeroRpmEnable; +uint16_t Padding; + +}OverDriveTable_t ; + +typedef struct { +uint16_t CurrClock[PPCLK_COUNT ]; +uint16_t AverageGfxclkFrequency; +uint16_t AverageSocclkFrequency; +uint16_t AverageUclkFrequency ; +uint16_t AverageGfxActivity ; +uint16_t AverageUclkActivity ; +uint8_t CurrSocVoltageOffset ; +uint8_t CurrGfxVoltageOffset ; +uint8_t CurrMemVidOffset ; +uint8_t Padding8 ; +uint16_t CurrSocketPower ; +uint16_t TemperatureEdge ; +uint16_t TemperatureHotspot ; +uint16_t TemperatureHBM ; +uint16_t TemperatureVrGfx ; +uint16_t TemperatureVrMem ; +uint16_t TemperatureLiquid ; +uint16_t TemperaturePlx ; +uint32_t ThrottlerStatus ; + +uint8_t LinkDpmLevel; +uint8_t Padding[3 ]; + + +uint32_t MmHubPadding[7 ]; +}SmuMetrics_t ; + +typedef struct { +uint16_t MinClock; +uint16_t MaxClock; +uint16_t MinUclk; +uint16_t MaxUclk; + +uint8_t WmSetting; +uint8_t Padding[3 ]; +}WatermarkRowGeneric_t ; + +#define NUM_WM_RANGES 4 + +typedef enum { +WM_SOCCLK =0 , +WM_DCEFCLK , +WM_COUNT_PP , +}WM_CLOCK_e ; + +typedef struct { + +WatermarkRowGeneric_t WatermarkRow[WM_COUNT_PP ][NUM_WM_RANGES ]; + +uint32_t MmHubPadding[7 ]; +}Watermarks_t ; + +typedef struct { +uint16_t avgPsmCount[45 ]; +uint16_t minPsmCount[45 ]; +float avgPsmVoltage[45 ]; +float minPsmVoltage[45 ]; + +uint16_t avgScsPsmCount; +uint16_t minScsPsmCount; +float avgScsPsmVoltage; +float minScsPsmVoltage; + + +uint32_t MmHubPadding[6 ]; +}AvfsDebugTable_t ; + +typedef struct { +uint8_t AvfsVersion; +uint8_t AvfsEn[AVFS_VOLTAGE_COUNT ]; + +uint8_t OverrideVFT[AVFS_VOLTAGE_COUNT ]; +uint8_t OverrideAvfsGb[AVFS_VOLTAGE_COUNT ]; + +uint8_t OverrideTemperatures[AVFS_VOLTAGE_COUNT ]; +uint8_t OverrideVInversion[AVFS_VOLTAGE_COUNT ]; +uint8_t OverrideP2V[AVFS_VOLTAGE_COUNT ]; +uint8_t OverrideP2VCharzFreq[AVFS_VOLTAGE_COUNT ]; + +int32_t VFT0_m1[AVFS_VOLTAGE_COUNT ]; +int32_t VFT0_m2[AVFS_VOLTAGE_COUNT ]; +int32_t VFT0_b[AVFS_VOLTAGE_COUNT ]; + +int32_t VFT1_m1[AVFS_VOLTAGE_COUNT ]; +int32_t VFT1_m2[AVFS_VOLTAGE_COUNT ]; +int32_t VFT1_b[AVFS_VOLTAGE_COUNT ]; + +int32_t VFT2_m1[AVFS_VOLTAGE_COUNT ]; +int32_t VFT2_m2[AVFS_VOLTAGE_COUNT ]; +int32_t VFT2_b[AVFS_VOLTAGE_COUNT ]; + +int32_t AvfsGb0_m1[AVFS_VOLTAGE_COUNT ]; +int32_t AvfsGb0_m2[AVFS_VOLTAGE_COUNT ]; +int32_t AvfsGb0_b[AVFS_VOLTAGE_COUNT ]; + +int32_t AcBtcGb_m1[AVFS_VOLTAGE_COUNT ]; +int32_t AcBtcGb_m2[AVFS_VOLTAGE_COUNT ]; +int32_t AcBtcGb_b[AVFS_VOLTAGE_COUNT ]; + +uint32_t AvfsTempCold[AVFS_VOLTAGE_COUNT ]; +uint32_t AvfsTempMid[AVFS_VOLTAGE_COUNT ]; +uint32_t AvfsTempHot[AVFS_VOLTAGE_COUNT ]; + +uint32_t VInversion[AVFS_VOLTAGE_COUNT ]; + + +int32_t P2V_m1[AVFS_VOLTAGE_COUNT ]; +int32_t P2V_m2[AVFS_VOLTAGE_COUNT ]; +int32_t P2V_b[AVFS_VOLTAGE_COUNT ]; + +uint32_t P2VCharzFreq[AVFS_VOLTAGE_COUNT ]; + +uint32_t EnabledAvfsModules; + +uint32_t MmHubPadding[7 ]; +}AvfsFuseOverride_t ; + +typedef struct { + +uint8_t Gfx_ActiveHystLimit; +uint8_t Gfx_IdleHystLimit; +uint8_t Gfx_FPS; +uint8_t Gfx_MinActiveFreqType; +uint8_t Gfx_BoosterFreqType; +uint8_t Gfx_UseRlcBusy; +uint16_t Gfx_MinActiveFreq; +uint16_t Gfx_BoosterFreq; +uint16_t Gfx_PD_Data_time_constant; +uint32_t Gfx_PD_Data_limit_a; +uint32_t Gfx_PD_Data_limit_b; +uint32_t Gfx_PD_Data_limit_c; +uint32_t Gfx_PD_Data_error_coeff; +uint32_t Gfx_PD_Data_error_rate_coeff; + +uint8_t Soc_ActiveHystLimit; +uint8_t Soc_IdleHystLimit; +uint8_t Soc_FPS; +uint8_t Soc_MinActiveFreqType; +uint8_t Soc_BoosterFreqType; +uint8_t Soc_UseRlcBusy; +uint16_t Soc_MinActiveFreq; +uint16_t Soc_BoosterFreq; +uint16_t Soc_PD_Data_time_constant; +uint32_t Soc_PD_Data_limit_a; +uint32_t Soc_PD_Data_limit_b; +uint32_t Soc_PD_Data_limit_c; +uint32_t Soc_PD_Data_error_coeff; +uint32_t Soc_PD_Data_error_rate_coeff; + +uint8_t Mem_ActiveHystLimit; +uint8_t Mem_IdleHystLimit; +uint8_t Mem_FPS; +uint8_t Mem_MinActiveFreqType; +uint8_t Mem_BoosterFreqType; +uint8_t Mem_UseRlcBusy; +uint16_t Mem_MinActiveFreq; +uint16_t Mem_BoosterFreq; +uint16_t Mem_PD_Data_time_constant; +uint32_t Mem_PD_Data_limit_a; +uint32_t Mem_PD_Data_limit_b; +uint32_t Mem_PD_Data_limit_c; +uint32_t Mem_PD_Data_error_coeff; +uint32_t Mem_PD_Data_error_rate_coeff; + +uint8_t Fclk_ActiveHystLimit; +uint8_t Fclk_IdleHystLimit; +uint8_t Fclk_FPS; +uint8_t Fclk_MinActiveFreqType; +uint8_t Fclk_BoosterFreqType; +uint8_t Fclk_UseRlcBusy; +uint16_t Fclk_MinActiveFreq; +uint16_t Fclk_BoosterFreq; +uint16_t Fclk_PD_Data_time_constant; +uint32_t Fclk_PD_Data_limit_a; +uint32_t Fclk_PD_Data_limit_b; +uint32_t Fclk_PD_Data_limit_c; +uint32_t Fclk_PD_Data_error_coeff; +uint32_t Fclk_PD_Data_error_rate_coeff; + +}DpmActivityMonitorCoeffInt_t ; + +#define TABLE_PPTABLE 0 +#define TABLE_WATERMARKS 1 +#define TABLE_AVFS 2 +#define TABLE_AVFS_PSM_DEBUG 3 +#define TABLE_AVFS_FUSE_OVERRIDE 4 +#define TABLE_PMSTATUSLOG 5 +#define TABLE_SMU_METRICS 6 +#define TABLE_DRIVER_SMU_CONFIG 7 +#define TABLE_ACTIVITY_MONITOR_COEFF 8 +#define TABLE_OVERDRIVE 9 +#define TABLE_COUNT 10 + + +#define UCLK_SWITCH_SLOW 0 +#define UCLK_SWITCH_FAST 1 + + +#define SQ_Enable_MASK 0x1 +#define SQ_IR_MASK 0x2 +#define SQ_PCC_MASK 0x4 +#define SQ_EDC_MASK 0x8 + +#define TCP_Enable_MASK 0x100 +#define TCP_IR_MASK 0x200 +#define TCP_PCC_MASK 0x400 +#define TCP_EDC_MASK 0x800 + +#define TD_Enable_MASK 0x10000 +#define TD_IR_MASK 0x20000 +#define TD_PCC_MASK 0x40000 +#define TD_EDC_MASK 0x80000 + +#define DB_Enable_MASK 0x1000000 +#define DB_IR_MASK 0x2000000 +#define DB_PCC_MASK 0x4000000 +#define DB_EDC_MASK 0x8000000 + +#define SQ_Enable_SHIFT 0 +#define SQ_IR_SHIFT 1 +#define SQ_PCC_SHIFT 2 +#define SQ_EDC_SHIFT 3 + +#define TCP_Enable_SHIFT 8 +#define TCP_IR_SHIFT 9 +#define TCP_PCC_SHIFT 10 +#define TCP_EDC_SHIFT 11 + +#define TD_Enable_SHIFT 16 +#define TD_IR_SHIFT 17 +#define TD_PCC_SHIFT 18 +#define TD_EDC_SHIFT 19 + +#define DB_Enable_SHIFT 24 +#define DB_IR_SHIFT 25 +#define DB_PCC_SHIFT 26 +#define DB_EDC_SHIFT 27 + +#define REMOVE_FMAX_MARGIN_BIT 0x0 +#define REMOVE_DCTOL_MARGIN_BIT 0x1 +#define REMOVE_PLATFORM_MARGIN_BIT 0x2 + +#endif
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 10/38 drm/amd/powerplay: add vega20_ppsmc.h (v2)
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
v2: update to latest.
--- drivers/gpu/drm/amd/powerplay/inc/vega20_ppsmc.h | 127 +++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 drivers/gpu/drm/amd/powerplay/inc/vega20_ppsmc.h
drivers/gpu/drm/amd/powerplay/inc/vega20_ppsmc.h new file +127 -0
@@ -0,0 +1,127 @@ +/* +* Copyright 2018 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +*/ + +#ifndef VEGA20_PP_SMC_H +#define VEGA20_PP_SMC_H + +#pragma pack(push, 1) + +// SMU Response Codes: +#define PPSMC_Result_OK 0x1 +#define PPSMC_Result_Failed 0xFF +#define PPSMC_Result_UnknownCmd 0xFE +#define PPSMC_Result_CmdRejectedPrereq 0xFD +#define PPSMC_Result_CmdRejectedBusy 0xFC + +// Message Definitions: +#define PPSMC_MSG_TestMessage 0x1 +#define PPSMC_MSG_GetSmuVersion 0x2 +#define PPSMC_MSG_GetDriverIfVersion 0x3 +#define PPSMC_MSG_SetAllowedFeaturesMaskLow 0x4 +#define PPSMC_MSG_SetAllowedFeaturesMaskHigh 0x5 +#define PPSMC_MSG_EnableAllSmuFeatures 0x6 +#define PPSMC_MSG_DisableAllSmuFeatures 0x7 +#define PPSMC_MSG_EnableSmuFeaturesLow 0x8 +#define PPSMC_MSG_EnableSmuFeaturesHigh 0x9 +#define PPSMC_MSG_DisableSmuFeaturesLow 0xA +#define PPSMC_MSG_DisableSmuFeaturesHigh 0xB +#define PPSMC_MSG_GetEnabledSmuFeaturesLow 0xC +#define PPSMC_MSG_GetEnabledSmuFeaturesHigh 0xD +#define PPSMC_MSG_SetWorkloadMask 0xE +#define PPSMC_MSG_SetPptLimit 0xF +#define PPSMC_MSG_SetDriverDramAddrHigh 0x10 +#define PPSMC_MSG_SetDriverDramAddrLow 0x11 +#define PPSMC_MSG_SetToolsDramAddrHigh 0x12 +#define PPSMC_MSG_SetToolsDramAddrLow 0x13 +#define PPSMC_MSG_TransferTableSmu2Dram 0x14 +#define PPSMC_MSG_TransferTableDram2Smu 0x15 +#define PPSMC_MSG_UseDefaultPPTable 0x16 +#define PPSMC_MSG_UseBackupPPTable 0x17 +#define PPSMC_MSG_RunBtc 0x18 +#define PPSMC_MSG_RequestI2CBus 0x19 +#define PPSMC_MSG_ReleaseI2CBus 0x1A +#define PPSMC_MSG_SetFloorSocVoltage 0x21 +#define PPSMC_MSG_SoftReset 0x22 +#define PPSMC_MSG_StartBacoMonitor 0x23 +#define PPSMC_MSG_CancelBacoMonitor 0x24 +#define PPSMC_MSG_EnterBaco 0x25 +#define PPSMC_MSG_SetSoftMinByFreq 0x26 +#define PPSMC_MSG_SetSoftMaxByFreq 0x27 +#define PPSMC_MSG_SetHardMinByFreq 0x28 +#define PPSMC_MSG_SetHardMaxByFreq 0x29 +#define PPSMC_MSG_GetMinDpmFreq 0x2A +#define PPSMC_MSG_GetMaxDpmFreq 0x2B +#define PPSMC_MSG_GetDpmFreqByIndex 0x2C +#define PPSMC_MSG_GetDpmClockFreq 0x2D +#define PPSMC_MSG_GetSsVoltageByDpm 0x2E +#define PPSMC_MSG_SetMemoryChannelConfig 0x2F +#define PPSMC_MSG_SetGeminiMode 0x30 +#define PPSMC_MSG_SetGeminiApertureHigh 0x31 +#define PPSMC_MSG_SetGeminiApertureLow 0x32 +#define PPSMC_MSG_SetMinLinkDpmByIndex 0x33 +#define PPSMC_MSG_OverridePcieParameters 0x34 +#define PPSMC_MSG_OverDriveSetPercentage 0x35 +#define PPSMC_MSG_SetMinDeepSleepDcefclk 0x36 +#define PPSMC_MSG_ReenableAcDcInterrupt 0x37 +#define PPSMC_MSG_NotifyPowerSource 0x38 +#define PPSMC_MSG_SetUclkFastSwitch 0x39 +#define PPSMC_MSG_SetUclkDownHyst 0x3A +//#define PPSMC_MSG_GfxDeviceDriverReset 0x3B +#define PPSMC_MSG_GetCurrentRpm 0x3C +#define PPSMC_MSG_SetVideoFps 0x3D +#define PPSMC_MSG_SetTjMax 0x3E +#define PPSMC_MSG_SetFanTemperatureTarget 0x3F +#define PPSMC_MSG_PrepareMp1ForUnload 0x40 +#define PPSMC_MSG_DramLogSetDramAddrHigh 0x41 +#define PPSMC_MSG_DramLogSetDramAddrLow 0x42 +#define PPSMC_MSG_DramLogSetDramSize 0x43 +#define PPSMC_MSG_SetFanMaxRpm 0x44 +#define PPSMC_MSG_SetFanMinPwm 0x45 +#define PPSMC_MSG_ConfigureGfxDidt 0x46 +#define PPSMC_MSG_NumOfDisplays 0x47 +#define PPSMC_MSG_RemoveMargins 0x48 +#define PPSMC_MSG_ReadSerialNumTop32 0x49 +#define PPSMC_MSG_ReadSerialNumBottom32 0x4A +#define PPSMC_MSG_SetSystemVirtualDramAddrHigh 0x4B +#define PPSMC_MSG_SetSystemVirtualDramAddrLow 0x4C +#define PPSMC_MSG_WaflTest 0x4D +// Unused ID 0x4E to 0x50 +#define PPSMC_MSG_AllowGfxOff 0x51 +#define PPSMC_MSG_DisallowGfxOff 0x52 +#define PPSMC_MSG_GetPptLimit 0x53 +#define PPSMC_MSG_GetDcModeMaxDpmFreq 0x54 +#define PPSMC_MSG_GetDebugData 0x55 +#define PPSMC_MSG_SetXgmiMode 0x56 +#define PPSMC_MSG_RunAfllBtc 0x57 +#define PPSMC_MSG_ExitBaco 0x58 +#define PPSMC_MSG_PrepareMp1ForReset 0x59 +#define PPSMC_MSG_PrepareMp1ForShutdown 0x5A +#define PPSMC_MSG_SetMGpuFanBoostLimitRpm 0x5D +#define PPSMC_Message_Count 0x5E + +typedef uint32_t PPSMC_Result ; +typedef uint32_t PPSMC_Msg ; + +#pragma pack(pop) + +#endif
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 11/38 drm/amd/powerplay: add vega20_pptable.h (v2)
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
v2: squash in table size fixes
--- .../gpu/drm/amd/powerplay/hwmgr/vega20_pptable.h | 140 +++++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_pptable.h
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_pptable.h new file +140 -0
@@ -0,0 +1,140 @@ +/* +* Copyright 2018 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +*/ +#ifndef _VEGA20_PPTABLE_H_ +#define _VEGA20_PPTABLE_H_ + +#pragma pack(push, 1) + +#define ATOM_VEGA20_PP_THERMALCONTROLLER_NONE 0 +#define ATOM_VEGA20_PP_THERMALCONTROLLER_VEGA20 26 + +#define ATOM_VEGA20_PP_PLATFORM_CAP_POWERPLAY 0x1 +#define ATOM_VEGA20_PP_PLATFORM_CAP_SBIOSPOWERSOURCE 0x2 +#define ATOM_VEGA20_PP_PLATFORM_CAP_HARDWAREDC 0x4 +#define ATOM_VEGA20_PP_PLATFORM_CAP_BACO 0x8 +#define ATOM_VEGA20_PP_PLATFORM_CAP_BAMACO 0x10 +#define ATOM_VEGA20_PP_PLATFORM_CAP_ENABLESHADOWPSTATE 0x20 + +#define ATOM_VEGA20_TABLE_REVISION_VEGA20 11 +#define ATOM_VEGA20_ODFEATURE_MAX_COUNT 32 +#define ATOM_VEGA20_ODSETTING_MAX_COUNT 32 +#define ATOM_VEGA20_PPCLOCK_MAX_COUNT 16 + +enum ATOM_VEGA20_ODFEATURE_ID { +ATOM_VEGA20_ODFEATURE_GFXCLK_LIMITS =0 , +ATOM_VEGA20_ODFEATURE_GFXCLK_CURVE , +ATOM_VEGA20_ODFEATURE_UCLK_MAX , +ATOM_VEGA20_ODFEATURE_POWER_LIMIT , +ATOM_VEGA20_ODFEATURE_FAN_ACOUSTIC_LIMIT ,//FanMaximumRpm +ATOM_VEGA20_ODFEATURE_FAN_SPEED_MIN ,//FanMinimumPwm +ATOM_VEGA20_ODFEATURE_TEMPERATURE_FAN ,//FanTargetTemperature +ATOM_VEGA20_ODFEATURE_TEMPERATURE_SYSTEM ,//MaxOpTemp +ATOM_VEGA20_ODFEATURE_COUNT , +}; + +enum ATOM_VEGA20_ODSETTING_ID { +ATOM_VEGA20_ODSETTING_GFXCLKFMAX =0 , +ATOM_VEGA20_ODSETTING_GFXCLKFMIN , +ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P1 , +ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEOFFSET_P1 , +ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P2 , +ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEOFFSET_P2 , +ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P3 , +ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEOFFSET_P3 , +ATOM_VEGA20_ODSETTING_UCLKFMAX , +ATOM_VEGA20_ODSETTING_POWERPERCENTAGE , +ATOM_VEGA20_ODSETTING_FANRPMMIN , +ATOM_VEGA20_ODSETTING_FANRPMACOUSTICLIMIT , +ATOM_VEGA20_ODSETTING_FANTARGETTEMPERATURE , +ATOM_VEGA20_ODSETTING_OPERATINGTEMPMAX , +ATOM_VEGA20_ODSETTING_COUNT , +}; +typedef enum ATOM_VEGA20_ODSETTING_ID ATOM_VEGA20_ODSETTING_ID ; + +typedef struct _ATOM_VEGA20_OVERDRIVE8_RECORD +{ +UCHAR ucODTableRevision; +ULONG ODFeatureCount; +UCHAR ODFeatureCapabilities [ATOM_VEGA20_ODFEATURE_MAX_COUNT ];//OD feature support flags +ULONG ODSettingCount; +ULONG ODSettingsMax [ATOM_VEGA20_ODSETTING_MAX_COUNT ];//Upper Limit for each OD Setting +ULONG ODSettingsMin [ATOM_VEGA20_ODSETTING_MAX_COUNT ];//Lower Limit for each OD Setting +}ATOM_VEGA20_OVERDRIVE8_RECORD ; + +enum ATOM_VEGA20_PPCLOCK_ID { +ATOM_VEGA20_PPCLOCK_GFXCLK =0 , +ATOM_VEGA20_PPCLOCK_VCLK , +ATOM_VEGA20_PPCLOCK_DCLK , +ATOM_VEGA20_PPCLOCK_ECLK , +ATOM_VEGA20_PPCLOCK_SOCCLK , +ATOM_VEGA20_PPCLOCK_UCLK , +ATOM_VEGA20_PPCLOCK_FCLK , +ATOM_VEGA20_PPCLOCK_DCEFCLK , +ATOM_VEGA20_PPCLOCK_DISPCLK , +ATOM_VEGA20_PPCLOCK_PIXCLK , +ATOM_VEGA20_PPCLOCK_PHYCLK , +ATOM_VEGA20_PPCLOCK_COUNT , +}; +typedef enum ATOM_VEGA20_PPCLOCK_ID ATOM_VEGA20_PPCLOCK_ID ; + +typedef struct _ATOM_VEGA20_POWER_SAVING_CLOCK_RECORD +{ +UCHAR ucTableRevision; +ULONG PowerSavingClockCount;// Count of PowerSavingClock Mode +ULONG PowerSavingClockMax [ATOM_VEGA20_PPCLOCK_MAX_COUNT ];// PowerSavingClock Mode Clock Maximum array In MHz +ULONG PowerSavingClockMin [ATOM_VEGA20_PPCLOCK_MAX_COUNT ];// PowerSavingClock Mode Clock Minimum array In MHz +}ATOM_VEGA20_POWER_SAVING_CLOCK_RECORD ; + +typedef struct _ATOM_VEGA20_POWERPLAYTABLE +{ +struct atom_common_table_header sHeader; +UCHAR ucTableRevision; +USHORT usTableSize; +ULONG ulGoldenPPID; +ULONG ulGoldenRevision; +USHORT usFormatID; + +ULONG ulPlatformCaps; + +UCHAR ucThermalControllerType; + +USHORT usSmallPowerLimit1; +USHORT usSmallPowerLimit2; +USHORT usBoostPowerLimit; +USHORT usODTurboPowerLimit; +USHORT usODPowerSavePowerLimit; +USHORT usSoftwareShutdownTemp; + +ATOM_VEGA20_POWER_SAVING_CLOCK_RECORD PowerSavingClockTable;//PowerSavingClock Mode Clock Min/Max array + +ATOM_VEGA20_OVERDRIVE8_RECORD OverDrive8Table;//OverDrive8 Feature capabilities and Settings Range (Max and Min) + +USHORT usReserve[5 ]; + +PPTable_t smcPPTable; + +}ATOM_Vega20_POWERPLAYTABLE ; + +#pragma pack(pop) + +#endif
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 12/38 drm/amd/powerplay: add the smu manager for vega20 (v2)
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
v2: switch to SOC15 register access macros
reserve space for ActivityMonitor table
enable SMU fw loading
Drop dead code from bringup
--- drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 2 +- .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 530 +++++++++++++++++++++ .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.h | 61 +++ 3 files changed, 592 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.h
drivers/gpu/drm/amd/powerplay/smumgr/Makefile +1 -1
@@ -26,7 +26,7 @@ SMU_MGR = smumgr.o smu8_smumgr.o tonga_smumgr.o fiji_smumgr.o \ polaris10_smumgr.o iceland_smumgr.o \ smu7_smumgr.o vega10_smumgr.o smu10_smumgr.o ci_smumgr.o \ - vega12_smumgr.o vegam_smumgr.o smu9_smumgr.o + vega12_smumgr.o vegam_smumgr.o smu9_smumgr.o vega20_smumgr.o AMD_PP_SMUMGR = $(addprefix $(AMD_PP_PATH)/smumgr/,$(SMU_MGR))
drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c new file +530 -0
530 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.h new file +61 -0
61 lines not on this page · raw message
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 13/38 drm/amd/powerplay: new interfaces for ActivityMonitor table with SMU
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Vega20 has a new activity monitor table that is stored in memory. Add API to get and set the new table.
--- .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 57 ++++++++++++++++++++++ .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.h | 4 ++ 2 files changed, 61 insertions(+)
drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c +57 -0
@@ -243,6 +243,63 @@ int vega20_copy_table_to_smc(struct pp_hwmgr *hwmgr,return 0 ; } +int vega20_set_activity_monitor_coeff (struct pp_hwmgr *hwmgr, +uint8_t *table,uint16_t workload_type) +{ +struct vega20_smumgr *priv = + (struct vega20_smumgr *)(hwmgr->smu_backend); +int ret =0 ; + +memcpy (priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF ].table, table, + priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF ].size); + +PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, + PPSMC_MSG_SetDriverDramAddrHigh, +upper_32_bits (priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF ].mc_addr))) ==0 , +"[SetActivityMonitor] Attempt to Set Dram Addr High Failed!" , + return ret); +PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, + PPSMC_MSG_SetDriverDramAddrLow, +lower_32_bits (priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF ].mc_addr))) ==0 , +"[SetActivityMonitor] Attempt to Set Dram Addr Low Failed!" , + return ret); +PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, + PPSMC_MSG_TransferTableDram2Smu,TABLE_ACTIVITY_MONITOR_COEFF | (workload_type <<16 ))) ==0 , +"[SetActivityMonitor] Attempt to Transfer Table To SMU Failed!" , + return ret); + +return 0 ; +} + +int vega20_get_activity_monitor_coeff (struct pp_hwmgr *hwmgr, +uint8_t *table,uint16_t workload_type) +{ +struct vega20_smumgr *priv = + (struct vega20_smumgr *)(hwmgr->smu_backend); +int ret =0 ; + +PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, + PPSMC_MSG_SetDriverDramAddrHigh, +upper_32_bits (priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF ].mc_addr))) ==0 , +"[GetActivityMonitor] Attempt to Set Dram Addr High Failed!" , + return ret); +PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, + PPSMC_MSG_SetDriverDramAddrLow, +lower_32_bits (priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF ].mc_addr))) ==0 , +"[GetActivityMonitor] Attempt to Set Dram Addr Low Failed!" , + return ret); +PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, + PPSMC_MSG_TransferTableSmu2Dram, +TABLE_ACTIVITY_MONITOR_COEFF | (workload_type <<16 ))) ==0 , +"[GetActivityMonitor] Attempt to Transfer Table From SMU Failed!" , + return ret); + +memcpy (table, priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF ].table, + priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF ].size); + +return 0 ; +} +int vega20_enable_smc_features (struct pp_hwmgr *hwmgr,bool enable,uint64_t feature_mask) {
drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.h +4 -0
@@ -56,6 +56,10 @@ int vega20_enable_smc_features(struct pp_hwmgr *hwmgr, bool enable, uint64_t feature_mask);int vega20_get_enabled_smc_features (struct pp_hwmgr *hwmgr,uint64_t *features_enabled); +int vega20_set_activity_monitor_coeff (struct pp_hwmgr *hwmgr, +uint8_t *table,uint16_t workload_type); +int vega20_get_activity_monitor_coeff (struct pp_hwmgr *hwmgr, +uint8_t *table,uint16_t workload_type);#endif
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 14/38 drm/amd/powerplay: add the hw manager for vega20 (v3)
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
hwmgr is the interface for the driver to setup state structures which are used by the smu for managing the power state.
v2: squash in fixes:
- update set_watermarks_for_clocks_ranges to use common code
- drop unsupported apis
- correct MAX_REGULAR_DPM_NUMBER value
- multimonitor fixes
- add check for vbios pptable version
- revise dpm table setup
- init fclk dpm state
- Remove unused definition in vega20_hwmgr
- support power limit setup
- enable vega20 to honour DAL clock limits
- comment out dump_table debugging
v3: switch to SOC15 register access macros
--- drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 4 +- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 8 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 2099 ++++++++++++++++++++ drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h | 519 +++++ .../gpu/drm/amd/powerplay/hwmgr/vega20_powertune.c | 70 + .../gpu/drm/amd/powerplay/hwmgr/vega20_powertune.h | 32 + .../amd/powerplay/hwmgr/vega20_processpptables.c | 919 +++++++++ .../amd/powerplay/hwmgr/vega20_processpptables.h | 31 + .../gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c | 212 ++ .../gpu/drm/amd/powerplay/hwmgr/vega20_thermal.h | 64 + 10 files changed, 3956 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_powertune.c create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_powertune.h create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_processpptables.c create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_processpptables.h create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_thermal.h
drivers/gpu/drm/amd/powerplay/hwmgr/Makefile +3 -1
@@ -33,7 +33,9 @@ HARDWARE_MGR = hwmgr.o processpptables.o \ vega10_thermal.o smu10_hwmgr.o pp_psm.o\ vega12_processpptables.o vega12_hwmgr.o \ vega12_thermal.o \ - pp_overdriver.o smu_helper.o + pp_overdriver.o smu_helper.o \ + vega20_processpptables.o vega20_hwmgr.o vega20_powertune.o \ + vega20_thermal.o AMD_PP_HWMGR = $(addprefix $(AMD_PP_PATH)/hwmgr/,$(HARDWARE_MGR))
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +7 -1
@@ -44,11 +44,13 @@ extern const struct pp_smumgr_func vegam_smu_funcs;extern const struct pp_smumgr_func vega10_smu_funcs;extern const struct pp_smumgr_func vega12_smu_funcs;extern const struct pp_smumgr_func smu10_smu_funcs; +extern const struct pp_smumgr_func vega20_smu_funcs;extern int smu7_init_function_pointers (struct pp_hwmgr *hwmgr);extern int smu8_init_function_pointers (struct pp_hwmgr *hwmgr);extern int vega10_hwmgr_init (struct pp_hwmgr *hwmgr);extern int vega12_hwmgr_init (struct pp_hwmgr *hwmgr); +extern int vega20_hwmgr_init (struct pp_hwmgr *hwmgr);extern int smu10_init_function_pointers (struct pp_hwmgr *hwmgr);static int polaris_set_asic_special_caps (struct pp_hwmgr *hwmgr);
@@ -149,7 +151,6 @@ int hwmgr_early_init(struct pp_hwmgr *hwmgr)case AMDGPU_FAMILY_AI :switch (hwmgr->chip_id) {case CHIP_VEGA10 : -case CHIP_VEGA20 : hwmgr->feature_mask &= ~PP_GFXOFF_MASK ; hwmgr->smumgr_funcs = &vega10_smu_funcs;vega10_hwmgr_init (hwmgr);
@@ -158,6 +159,11 @@ int hwmgr_early_init(struct pp_hwmgr *hwmgr) hwmgr->smumgr_funcs = &vega12_smu_funcs;vega12_hwmgr_init (hwmgr);break ; +case CHIP_VEGA20 : + hwmgr->feature_mask &= ~PP_GFXOFF_MASK ; + hwmgr->smumgr_funcs = &vega20_smu_funcs; +vega20_hwmgr_init (hwmgr); +break ;default :return -EINVAL ; }
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c new file +2099 -0
2,099 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h new file +519 -0
519 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_powertune.c new file +70 -0
70 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_powertune.h new file +32 -0
@@ -0,0 +1,32 @@ +/* +* Copyright 2018 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +*/ +#ifndef _VEGA20_POWERTUNE_H_ +#define _VEGA20_POWERTUNE_H_ + +int vega20_set_power_limit (struct pp_hwmgr *hwmgr,uint32_t n); +int vega20_power_control_set_level (struct pp_hwmgr *hwmgr); +int vega20_validate_power_level_request (struct pp_hwmgr *hwmgr, +uint32_t tdp_percentage_adjustment, +uint32_t tdp_absolute_value_adjustment); +#endif /* _VEGA20_POWERTUNE_H_ */ +
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_processpptables.c new file +919 -0
239 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_processpptables.h new file +31 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c new file +212 -0
212 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_thermal.h new file +64 -0
64 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Part of the diff is not shown here. View the raw message.
PATCH 15/38 drm/amd/powerplay: support workload profile query and setup for vega20
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Support the power profile API.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 193 ++++++++++++++++++++- 1 file changed, 192 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +192 -1
@@ -384,10 +384,13 @@ static int vega20_hwmgr_backend_init(struct pp_hwmgr *hwmgr) hwmgr->backend = data; + hwmgr->workload_mask =1 << hwmgr->workload_prority[PP_SMC_POWER_PROFILE_VIDEO ]; + hwmgr->power_profile_mode =PP_SMC_POWER_PROFILE_VIDEO ; + hwmgr->default_power_profile_mode =PP_SMC_POWER_PROFILE_VIDEO ; +vega20_set_default_registry_data (hwmgr); data->disable_dpm_mask =0xff ; - data->workload_mask =0xff ;/* need to set voltage control types before EVV patching */ data->vddc_control =VEGA20_VOLTAGE_CONTROL_NONE ;
@@ -1971,6 +1974,190 @@ static int vega20_power_off_asic(struct pp_hwmgr *hwmgr)return result; } +static int vega20_get_power_profile_mode (struct pp_hwmgr *hwmgr,char *buf) +{ +DpmActivityMonitorCoeffInt_t activity_monitor; +uint32_t i, size =0 ; +uint16_t workload_type =0 ; +static const char *profile_name[] = { +"3D_FULL_SCREEN" , +"POWER_SAVING" , +"VIDEO" , +"VR" , +"COMPUTE" , +"CUSTOM" }; +static const char *title[] = { +"PROFILE_INDEX(NAME)" , +"CLOCK_TYPE(NAME)" , +"FPS" , +"UseRlcBusy" , +"MinActiveFreqType" , +"MinActiveFreq" , +"BoosterFreqType" , +"BoosterFreq" , +"PD_Data_limit_c" , +"PD_Data_error_coeff" , +"PD_Data_error_rate_coeff" }; +int result =0 ; + +if (!buf) +return -EINVAL ; + + size +=sprintf (buf + size,"%16s %s %s %s %s %s %s %s %s %s %s\n" , + title[0 ], title[1 ], title[2 ], title[3 ], title[4 ], title[5 ], + title[6 ], title[7 ], title[8 ], title[9 ], title[10 ]); + +for (i =0 ; i <=PP_SMC_POWER_PROFILE_CUSTOM ; i++) { +/* conv PP_SMC_POWER_PROFILE* to WORKLOAD_PPLIB_*_BIT */ + workload_type = i +1 ; + result =vega20_get_activity_monitor_coeff (hwmgr, + (uint8_t *)(&activity_monitor), workload_type); +PP_ASSERT_WITH_CODE (!result, +"[GetPowerProfile] Failed to get activity monitor!" , + return result); + + size +=sprintf (buf + size,"%2d(%14s%s)\n" , + i, profile_name[i], (i == hwmgr->power_profile_mode) ?"*" :" " ); + + size +=sprintf (buf + size,"%19s %d(%13s) %7d %7d %7d %7d %7d %7d %7d %7d %7d\n" , +" " , +0 , +"GFXCLK" , + activity_monitor.Gfx_FPS, + activity_monitor.Gfx_UseRlcBusy, + activity_monitor.Gfx_MinActiveFreqType, + activity_monitor.Gfx_MinActiveFreq, + activity_monitor.Gfx_BoosterFreqType, + activity_monitor.Gfx_BoosterFreq, + activity_monitor.Gfx_PD_Data_limit_c, + activity_monitor.Gfx_PD_Data_error_coeff, + activity_monitor.Gfx_PD_Data_error_rate_coeff); + + size +=sprintf (buf + size,"%19s %d(%13s) %7d %7d %7d %7d %7d %7d %7d %7d %7d\n" , +" " , +1 , +"SOCCLK" , + activity_monitor.Soc_FPS, + activity_monitor.Soc_UseRlcBusy, + activity_monitor.Soc_MinActiveFreqType, + activity_monitor.Soc_MinActiveFreq, + activity_monitor.Soc_BoosterFreqType, + activity_monitor.Soc_BoosterFreq, + activity_monitor.Soc_PD_Data_limit_c, + activity_monitor.Soc_PD_Data_error_coeff, + activity_monitor.Soc_PD_Data_error_rate_coeff); + + size +=sprintf (buf + size,"%19s %d(%13s) %7d %7d %7d %7d %7d %7d %7d %7d %7d\n" , +" " , +2 , +"UCLK" , + activity_monitor.Mem_FPS, + activity_monitor.Mem_UseRlcBusy, + activity_monitor.Mem_MinActiveFreqType, + activity_monitor.Mem_MinActiveFreq, + activity_monitor.Mem_BoosterFreqType, + activity_monitor.Mem_BoosterFreq, + activity_monitor.Mem_PD_Data_limit_c, + activity_monitor.Mem_PD_Data_error_coeff, + activity_monitor.Mem_PD_Data_error_rate_coeff); + + size +=sprintf (buf + size,"%19s %d(%13s) %7d %7d %7d %7d %7d %7d %7d %7d %7d\n" , +" " , +3 , +"FCLK" , + activity_monitor.Fclk_FPS, + activity_monitor.Fclk_UseRlcBusy, + activity_monitor.Fclk_MinActiveFreqType, + activity_monitor.Fclk_MinActiveFreq, + activity_monitor.Fclk_BoosterFreqType, + activity_monitor.Fclk_BoosterFreq, + activity_monitor.Fclk_PD_Data_limit_c, + activity_monitor.Fclk_PD_Data_error_coeff, + activity_monitor.Fclk_PD_Data_error_rate_coeff); + } + +return size; +} + +static int vega20_set_power_profile_mode (struct pp_hwmgr *hwmgr,long *input,uint32_t size) +{ +DpmActivityMonitorCoeffInt_t activity_monitor; +int result =0 ; + + hwmgr->power_profile_mode = input[size]; + +if (hwmgr->power_profile_mode ==PP_SMC_POWER_PROFILE_CUSTOM ) { +if (size <10 ) +return -EINVAL ; + + result =vega20_get_activity_monitor_coeff (hwmgr, + (uint8_t *)(&activity_monitor), +WORKLOAD_PPLIB_CUSTOM_BIT ); +PP_ASSERT_WITH_CODE (!result, +"[SetPowerProfile] Failed to get activity monitor!" , + return result); + +switch (input[0 ]) { +case 0 :/* Gfxclk */ + activity_monitor.Gfx_FPS = input[1 ]; + activity_monitor.Gfx_UseRlcBusy = input[2 ]; + activity_monitor.Gfx_MinActiveFreqType = input[3 ]; + activity_monitor.Gfx_MinActiveFreq = input[4 ]; + activity_monitor.Gfx_BoosterFreqType = input[5 ]; + activity_monitor.Gfx_BoosterFreq = input[6 ]; + activity_monitor.Gfx_PD_Data_limit_c = input[7 ]; + activity_monitor.Gfx_PD_Data_error_coeff = input[8 ]; + activity_monitor.Gfx_PD_Data_error_rate_coeff = input[9 ]; +break ; +case 1 :/* Socclk */ + activity_monitor.Soc_FPS = input[1 ]; + activity_monitor.Soc_UseRlcBusy = input[2 ]; + activity_monitor.Soc_MinActiveFreqType = input[3 ]; + activity_monitor.Soc_MinActiveFreq = input[4 ]; + activity_monitor.Soc_BoosterFreqType = input[5 ]; + activity_monitor.Soc_BoosterFreq = input[6 ]; + activity_monitor.Soc_PD_Data_limit_c = input[7 ]; + activity_monitor.Soc_PD_Data_error_coeff = input[8 ]; + activity_monitor.Soc_PD_Data_error_rate_coeff = input[9 ]; +break ; +case 2 :/* Uclk */ + activity_monitor.Mem_FPS = input[1 ]; + activity_monitor.Mem_UseRlcBusy = input[2 ]; + activity_monitor.Mem_MinActiveFreqType = input[3 ]; + activity_monitor.Mem_MinActiveFreq = input[4 ]; + activity_monitor.Mem_BoosterFreqType = input[5 ]; + activity_monitor.Mem_BoosterFreq = input[6 ]; + activity_monitor.Mem_PD_Data_limit_c = input[7 ]; + activity_monitor.Mem_PD_Data_error_coeff = input[8 ]; + activity_monitor.Mem_PD_Data_error_rate_coeff = input[9 ]; +break ; +case 3 :/* Fclk */ + activity_monitor.Fclk_FPS = input[1 ]; + activity_monitor.Fclk_UseRlcBusy = input[2 ]; + activity_monitor.Fclk_MinActiveFreqType = input[3 ]; + activity_monitor.Fclk_MinActiveFreq = input[4 ]; + activity_monitor.Fclk_BoosterFreqType = input[5 ]; + activity_monitor.Fclk_BoosterFreq = input[6 ]; + activity_monitor.Fclk_PD_Data_limit_c = input[7 ]; + activity_monitor.Fclk_PD_Data_error_coeff = input[8 ]; + activity_monitor.Fclk_PD_Data_error_rate_coeff = input[9 ]; +break ; + } + + result =vega20_set_activity_monitor_coeff (hwmgr, + (uint8_t *)(&activity_monitor), +WORKLOAD_PPLIB_CUSTOM_BIT ); +PP_ASSERT_WITH_CODE (!result, +"[SetPowerProfile] Failed to set activity monitor!" , + return result); + } + +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetWorkloadMask, +1 << hwmgr->power_profile_mode); + +return 0 ; +} + static int vega20_notify_cac_buffer_info(struct pp_hwmgr *hwmgr, uint32_t virtual_addr_low, uint32_t virtual_addr_hi,
@@ -2053,6 +2240,10 @@ static const struct pp_hwmgr_func vega20_hwmgr_funcs = {/* UMD pstate, profile related */ .force_dpm_level = vega20_dpm_force_dpm_level, + .get_power_profile_mode = + vega20_get_power_profile_mode, + .set_power_profile_mode = + vega20_set_power_profile_mode, .set_power_limit = vega20_set_power_limit,/* for sysfs to retrive/set gfxclk/memclk */
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 16/38 drm/amd/powerplay: init vega20 uvd/vce powergate status on dpm setup
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
This is essentially necessary when uvd/vce dpm is not enabled yet.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +18 -0
@@ -932,6 +932,21 @@ static int vega20_init_max_sustainable_clocks(struct pp_hwmgr *hwmgr)return 0 ; } +static void vega20_init_powergate_state (struct pp_hwmgr *hwmgr) +{ +struct vega20_hwmgr *data = + (struct vega20_hwmgr *)(hwmgr->backend); + + data->uvd_power_gated = true; + data->vce_power_gated = true; + +if (data->smu_features[GNLD_DPM_UVD ].enabled) + data->uvd_power_gated = false; + +if (data->smu_features[GNLD_DPM_VCE ].enabled) + data->vce_power_gated = false; +} +static int vega20_enable_dpm_tasks (struct pp_hwmgr *hwmgr) {int result =0 ;
@@ -954,6 +969,9 @@ static int vega20_enable_dpm_tasks(struct pp_hwmgr *hwmgr)"[EnableDPMTasks] Failed to enable all smu features!" , return result); +/* Initialize UVD/VCE powergating state */ +vega20_init_powergate_state (hwmgr); + result =vega20_setup_default_dpm_tables (hwmgr); PP_ASSERT_WITH_CODE(!result, "[EnableDPMTasks] Failed to setup default DPM tables!",
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 17/38 drm/amd/powerplay: correct force clock level related settings for vega20 (v2)
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
1. The min/max level is determined by soft_min_level/soft_max_level.
2. Vega20 comes with pptable v3 which has no vdd related table(vdd_dep_on_socclk, vdd_dep_on_mclk) support.
3. Vega20 does not support separate fan feature control(enable or disable).
v2: squash in fixes:
- bug fix for force dpm level settings
- fix wrong data type
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 109 ++++++++++++--------- 1 file changed, 64 insertions(+), 45 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +64 -45
@@ -1015,7 +1015,7 @@ static uint32_t vega20_find_lowest_dpm_level(static uint32_t vega20_find_highest_dpm_level (struct vega20_single_dpm_table *table) { -uint32_t i =0 ; +int i =0 ; PP_ASSERT_WITH_CODE(table != NULL, "[FindHighestDPMLevel] DPM Table does not exist!",
@@ -1409,14 +1409,20 @@ static int vega20_force_dpm_highest(struct pp_hwmgr *hwmgr) {struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); +uint32_t soft_level;int ret =0 ; - data->smc_state_table.gfx_boot_level = - data->smc_state_table.gfx_max_level = -vega20_find_highest_dpm_level (&(data->dpm_table.gfx_table)); - data->smc_state_table.mem_boot_level = - data->smc_state_table.mem_max_level = -vega20_find_highest_dpm_level (&(data->dpm_table.mem_table)); + soft_level =vega20_find_highest_dpm_level (&(data->dpm_table.gfx_table)); + + data->dpm_table.gfx_table.dpm_state.soft_min_level = + data->dpm_table.gfx_table.dpm_state.soft_max_level = + data->dpm_table.gfx_table.dpm_levels[soft_level].value; + + soft_level =vega20_find_highest_dpm_level (&(data->dpm_table.mem_table)); + + data->dpm_table.mem_table.dpm_state.soft_min_level = + data->dpm_table.mem_table.dpm_state.soft_max_level = + data->dpm_table.mem_table.dpm_levels[soft_level].value; ret =vega20_upload_dpm_min_level (hwmgr); PP_ASSERT_WITH_CODE(!ret,
@@ -1435,14 +1441,20 @@ static int vega20_force_dpm_lowest(struct pp_hwmgr *hwmgr) {struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); +uint32_t soft_level;int ret =0 ; - data->smc_state_table.gfx_boot_level = - data->smc_state_table.gfx_max_level = -vega20_find_lowest_dpm_level (&(data->dpm_table.gfx_table)); - data->smc_state_table.mem_boot_level = - data->smc_state_table.mem_max_level = -vega20_find_lowest_dpm_level (&(data->dpm_table.mem_table)); + soft_level =vega20_find_lowest_dpm_level (&(data->dpm_table.gfx_table)); + + data->dpm_table.gfx_table.dpm_state.soft_min_level = + data->dpm_table.gfx_table.dpm_state.soft_max_level = + data->dpm_table.gfx_table.dpm_levels[soft_level].value; + + soft_level =vega20_find_lowest_dpm_level (&(data->dpm_table.mem_table)); + + data->dpm_table.mem_table.dpm_state.soft_min_level = + data->dpm_table.mem_table.dpm_state.soft_max_level = + data->dpm_table.mem_table.dpm_levels[soft_level].value; ret =vega20_upload_dpm_min_level (hwmgr); PP_ASSERT_WITH_CODE(!ret,
@@ -1475,19 +1487,24 @@ static int vega20_unforce_dpm_levels(struct pp_hwmgr *hwmgr)return 0 ; } -#if 0 static int vega20_get_profiling_clk_mask (struct pp_hwmgr *hwmgr,enum amd_dpm_forced_level level,uint32_t *sclk_mask,uint32_t *mclk_mask,uint32_t *soc_mask) { -struct phm_ppt_v2_information *table_info = - (struct phm_ppt_v2_information *)(hwmgr->pptable); +struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); +struct vega20_single_dpm_table *gfx_dpm_table = &(data->dpm_table.gfx_table); +struct vega20_single_dpm_table *mem_dpm_table = &(data->dpm_table.mem_table); +struct vega20_single_dpm_table *soc_dpm_table = &(data->dpm_table.soc_table); + + *sclk_mask =0 ; + *mclk_mask =0 ; + *soc_mask =0 ; -if (table_info->vdd_dep_on_sclk->count >VEGA20_UMD_PSTATE_GFXCLK_LEVEL && - table_info->vdd_dep_on_socclk->count >VEGA20_UMD_PSTATE_SOCCLK_LEVEL && - table_info->vdd_dep_on_mclk->count >VEGA20_UMD_PSTATE_MCLK_LEVEL ) { +if (gfx_dpm_table->count >VEGA20_UMD_PSTATE_GFXCLK_LEVEL && + mem_dpm_table->count >VEGA20_UMD_PSTATE_MCLK_LEVEL && + soc_dpm_table->count >VEGA20_UMD_PSTATE_SOCCLK_LEVEL ) { *sclk_mask =VEGA20_UMD_PSTATE_GFXCLK_LEVEL ; - *soc_mask =VEGA20_UMD_PSTATE_SOCCLK_LEVEL ; *mclk_mask =VEGA20_UMD_PSTATE_MCLK_LEVEL ; + *soc_mask =VEGA20_UMD_PSTATE_SOCCLK_LEVEL ; }if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK ) {
@@ -1495,24 +1512,30 @@ static int vega20_get_profiling_clk_mask(struct pp_hwmgr *hwmgr, enum amd_dpm_fo }else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK ) { *mclk_mask =0 ; }else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) { - *sclk_mask = table_info->vdd_dep_on_sclk->count -1 ; - *soc_mask = table_info->vdd_dep_on_socclk->count -1 ; - *mclk_mask = table_info->vdd_dep_on_mclk->count -1 ; + *sclk_mask = gfx_dpm_table->count -1 ; + *mclk_mask = mem_dpm_table->count -1 ; + *soc_mask = soc_dpm_table->count -1 ; } +return 0 ; } -#endif static int vega20_force_clock_level (struct pp_hwmgr *hwmgr,enum pp_clock_type type,uint32_t mask) {struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); +uint32_t soft_min_level, soft_max_level;int ret =0 ;switch (type) {case PP_SCLK : - data->smc_state_table.gfx_boot_level = mask ? (ffs (mask) -1 ) :0 ; - data->smc_state_table.gfx_max_level = mask ? (fls (mask) -1 ) :0 ; + soft_min_level = mask ? (ffs (mask) -1 ) :0 ; + soft_max_level = mask ? (fls (mask) -1 ) :0 ; + + data->dpm_table.gfx_table.dpm_state.soft_min_level = + data->dpm_table.gfx_table.dpm_levels[soft_min_level].value; + data->dpm_table.gfx_table.dpm_state.soft_max_level = + data->dpm_table.gfx_table.dpm_levels[soft_max_level].value; ret =vega20_upload_dpm_min_level (hwmgr); PP_ASSERT_WITH_CODE(!ret,
@@ -1526,8 +1549,13 @@ static int vega20_force_clock_level(struct pp_hwmgr *hwmgr,break ;case PP_MCLK : - data->smc_state_table.mem_boot_level = mask ? (ffs (mask) -1 ) :0 ; - data->smc_state_table.mem_max_level = mask ? (fls (mask) -1 ) :0 ; + soft_min_level = mask ? (ffs (mask) -1 ) :0 ; + soft_max_level = mask ? (fls (mask) -1 ) :0 ; + + data->dpm_table.mem_table.dpm_state.soft_min_level = + data->dpm_table.mem_table.dpm_levels[soft_min_level].value; + data->dpm_table.mem_table.dpm_state.soft_max_level = + data->dpm_table.mem_table.dpm_levels[soft_max_level].value; ret =vega20_upload_dpm_min_level (hwmgr); PP_ASSERT_WITH_CODE(!ret,
@@ -1555,47 +1583,38 @@ static int vega20_dpm_force_dpm_level(struct pp_hwmgr *hwmgr, enum amd_dpm_forced_level level) {int ret =0 ; -#if 0 -uint32_t sclk_mask =0 ; -uint32_t mclk_mask =0 ; -uint32_t soc_mask =0 ; -#endif +uint32_t sclk_mask, mclk_mask, soc_mask;switch (level) {case AMD_DPM_FORCED_LEVEL_HIGH : ret =vega20_force_dpm_highest (hwmgr);break ; +case AMD_DPM_FORCED_LEVEL_LOW : ret =vega20_force_dpm_lowest (hwmgr);break ; +case AMD_DPM_FORCED_LEVEL_AUTO : ret =vega20_unforce_dpm_levels (hwmgr);break ; +case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD :case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK :case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK :case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK : -#if 0 ret =vega20_get_profiling_clk_mask (hwmgr, level, &sclk_mask, &mclk_mask, &soc_mask);if (ret)return ret; -vega20_force_clock_level (hwmgr,PP_SCLK ,1 <<sclk_mask); -vega20_force_clock_level (hwmgr,PP_MCLK ,1 <<mclk_mask); -#endif +vega20_force_clock_level (hwmgr,PP_SCLK ,1 << sclk_mask); +vega20_force_clock_level (hwmgr,PP_MCLK ,1 << mclk_mask);break ; +case AMD_DPM_FORCED_LEVEL_MANUAL :case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT :default :break ; } -#if 0 -if (!ret) { -if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK && hwmgr->dpm_level !=AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) -vega20_set_fan_control_mode (hwmgr,AMD_FAN_CTRL_NONE ); -else if (level !=AMD_DPM_FORCED_LEVEL_PROFILE_PEAK && hwmgr->dpm_level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) -vega20_set_fan_control_mode (hwmgr,AMD_FAN_CTRL_AUTO ); - } -#endif +return ret; }
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 18/38 drm/amd/powerplay: export vega20 stable pstate clocks
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 26 +++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +25 -1
@@ -846,6 +846,25 @@ static int vega20_odn_initialize_default_settings(return 0 ; } +static int vega20_populate_umdpstate_clocks ( +struct pp_hwmgr *hwmgr) +{ +struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); +struct vega20_single_dpm_table *gfx_table = &(data->dpm_table.gfx_table); +struct vega20_single_dpm_table *mem_table = &(data->dpm_table.mem_table); + + hwmgr->pstate_sclk = gfx_table->dpm_levels[0 ].value; + hwmgr->pstate_mclk = mem_table->dpm_levels[0 ].value; + +if (gfx_table->count >VEGA20_UMD_PSTATE_GFXCLK_LEVEL && + mem_table->count >VEGA20_UMD_PSTATE_MCLK_LEVEL ) { + hwmgr->pstate_sclk = gfx_table->dpm_levels[VEGA20_UMD_PSTATE_GFXCLK_LEVEL ].value; + hwmgr->pstate_mclk = mem_table->dpm_levels[VEGA20_UMD_PSTATE_MCLK_LEVEL ].value; + } + +return 0 ; +} +static int vega20_get_max_sustainable_clock (struct pp_hwmgr *hwmgr,PP_Clock *clock,PPCLK_e clock_select) {
@@ -992,7 +1011,12 @@ static int vega20_enable_dpm_tasks(struct pp_hwmgr *hwmgr)"[EnableDPMTasks] Failed to initialize odn settings!" , return result); -return result; + result =vega20_populate_umdpstate_clocks (hwmgr); +PP_ASSERT_WITH_CODE (!result, +"[EnableDPMTasks] Failed to populate umdpstate clocks!" , + return result); + +return 0 ; } static uint32_t vega20_find_lowest_dpm_level(
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 19/38 drm/amd/powerplay: add vega20 pre_display_config_changed callback
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
fix possible handshake hang and video playback crash
Corner cases:
- Handshake between SMU and DCE causes hangs when CRTC is not enabled
- System crash occurs when starting 4K playback with Movies and TV in an SLS configuration
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +41 -0
@@ -1874,6 +1874,45 @@ static int vega20_print_clock_levels(struct pp_hwmgr *hwmgr,return size; } +static int vega20_set_uclk_to_highest_dpm_level (struct pp_hwmgr *hwmgr, +struct vega20_single_dpm_table *dpm_table) +{ +struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); +int ret =0 ; + +if (data->smu_features[GNLD_DPM_UCLK ].enabled) { +PP_ASSERT_WITH_CODE (dpm_table->count >0 , +"[SetUclkToHightestDpmLevel] Dpm table has no entry!" , + return -EINVAL ); +PP_ASSERT_WITH_CODE (dpm_table->count <=NUM_UCLK_DPM_LEVELS , +"[SetUclkToHightestDpmLevel] Dpm table has too many entries!" , + return -EINVAL ); + + dpm_table->dpm_state.hard_min_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; +PP_ASSERT_WITH_CODE (!(ret =smum_send_msg_to_smc_with_parameter (hwmgr, + PPSMC_MSG_SetHardMinByFreq, + (PPCLK_UCLK <<16 ) | dpm_table->dpm_state.hard_min_level)), +"[SetUclkToHightestDpmLevel] Set hard min uclk failed!" , + return ret); + } + +return ret; +} + +static int vega20_pre_display_configuration_changed_task (struct pp_hwmgr *hwmgr) +{ +struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); +int ret =0 ; + +smum_send_msg_to_smc_with_parameter (hwmgr, + PPSMC_MSG_NumOfDisplays,0 ); + + ret =vega20_set_uclk_to_highest_dpm_level (hwmgr, + &data->dpm_table.mem_table); + +return ret; +} +static int vega20_display_configuration_changed_task (struct pp_hwmgr *hwmgr) {struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend);
@@ -2277,6 +2316,8 @@ static const struct pp_hwmgr_func vega20_hwmgr_funcs = {/* power state related */ .apply_clocks_adjust_rules = vega20_apply_clocks_adjust_rules, + .pre_display_config_changed = + vega20_pre_display_configuration_changed_task, .display_config_changed = vega20_display_configuration_changed_task, .check_smc_update_required_for_display_configuration =
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 20/38 drm/amd/powerplay: conv the vega20 pstate sclk/mclk into necessary 10KHz unit
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Powerplay uses 10KHz units.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +3 -0
@@ -862,6 +862,9 @@ static int vega20_populate_umdpstate_clocks( hwmgr->pstate_mclk = mem_table->dpm_levels[VEGA20_UMD_PSTATE_MCLK_LEVEL ].value; } + hwmgr->pstate_sclk = hwmgr->pstate_sclk *100 ; + hwmgr->pstate_mclk = hwmgr->pstate_mclk *100 ; +return 0 ; }
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 21/38 drm/amd/powerplay: initialize vega20 overdrive settings
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
The initialized overdrive settings are taken from vbios and SMU( by PPSMC_MSG_TransferTableSmu2Dram).
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 293 +++++++++++++++++++-- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h | 53 +++- .../amd/powerplay/hwmgr/vega20_processpptables.c | 103 ++++++-- .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 2 + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + 5 files changed, 403 insertions(+), 49 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +274 -19
@@ -103,7 +103,7 @@ static void vega20_set_default_registry_data(struct pp_hwmgr *hwmgr) data->registry_data.quick_transition_support =0 ; data->registry_data.zrpm_start_temp =0xffff ; data->registry_data.zrpm_stop_temp =0xffff ; - data->registry_data.odn_feature_enable =1 ; + data->registry_data.od8_feature_enable =1 ; data->registry_data.disable_water_mark =0 ; data->registry_data.disable_pp_tuning =0 ; data->registry_data.disable_xlpp_tuning =0 ;
@@ -150,15 +150,9 @@ static int vega20_set_features_platform_caps(struct pp_hwmgr *hwmgr)phm_cap_set (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_UnTabledHardwareInterface); -if (data->registry_data.odn_feature_enable) +if (data->registry_data.od8_feature_enable)phm_cap_set (hwmgr->platform_descriptor.platformCaps, - PHM_PlatformCaps_ODNinACSupport); -else { -phm_cap_set (hwmgr->platform_descriptor.platformCaps, - PHM_PlatformCaps_OD6inACSupport); -phm_cap_set (hwmgr->platform_descriptor.platformCaps, - PHM_PlatformCaps_OD6PlusinACSupport); - } + PHM_PlatformCaps_OD8inACSupport);phm_cap_set (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_ActivityReporting);
@@ -166,15 +160,9 @@ static int vega20_set_features_platform_caps(struct pp_hwmgr *hwmgr) PHM_PlatformCaps_FanSpeedInTableIsRPM);if (data->registry_data.od_state_in_dc_support) { -if (data->registry_data.odn_feature_enable) +if (data->registry_data.od8_feature_enable)phm_cap_set (hwmgr->platform_descriptor.platformCaps, - PHM_PlatformCaps_ODNinDCSupport); -else { -phm_cap_set (hwmgr->platform_descriptor.platformCaps, - PHM_PlatformCaps_OD6inDCSupport); -phm_cap_set (hwmgr->platform_descriptor.platformCaps, - PHM_PlatformCaps_OD6PlusinDCSupport); - } + PHM_PlatformCaps_OD8inDCSupport); } if (data->registry_data.thermal_support &&
@@ -840,9 +828,276 @@ static int vega20_disable_all_smu_features(struct pp_hwmgr *hwmgr)return 0 ; } -static int vega20_odn_initialize_default_settings ( +static int vega20_od8_set_feature_capabilities ( +struct pp_hwmgr *hwmgr) +{ +struct phm_ppt_v3_information *pptable_information = + (struct phm_ppt_v3_information *)hwmgr->pptable; +struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); +struct vega20_od8_settings *od_settings = &(data->od8_settings); + + od_settings->overdrive8_capabilities =0 ; + +if (data->smu_features[GNLD_DPM_GFXCLK ].enabled) { +if (pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_GFXCLKFMAX ] >0 && + pptable_information->od_settings_min[ATOM_VEGA20_ODSETTING_GFXCLKFMAX ] >0 && + pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_GFXCLKFMIN ] >0 && + pptable_information->od_settings_min[ATOM_VEGA20_ODSETTING_GFXCLKFMIN ] >0 ) + od_settings->overdrive8_capabilities |=OD8_GFXCLK_LIMITS ; + +if (pptable_information->od_settings_min[ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P1 ] >0 && + pptable_information->od_settings_min[ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P2 ] >0 && + pptable_information->od_settings_min[ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P3 ] >0 && + pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P1 ] >0 && + pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P2 ] >0 && + pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P3 ] >0 && + pptable_information->od_settings_min[ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEOFFSET_P1 ] >0 && + pptable_information->od_settings_min[ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEOFFSET_P2 ] >0 && + pptable_information->od_settings_min[ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEOFFSET_P3 ] >0 && + pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEOFFSET_P1 ] >0 && + pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEOFFSET_P2 ] >0 && + pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEOFFSET_P3 ] >0 ) + od_settings->overdrive8_capabilities |=OD8_GFXCLK_CURVE ; + } + +if (data->smu_features[GNLD_DPM_UCLK ].enabled) { +if (pptable_information->od_settings_min[ATOM_VEGA20_ODSETTING_UCLKFMAX ] >0 && + pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_UCLKFMAX ] >0 ) + od_settings->overdrive8_capabilities |=OD8_UCLK_MAX ; + } + +if (pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_POWERPERCENTAGE ] >0 && + pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_POWERPERCENTAGE ] <=100 ) + od_settings->overdrive8_capabilities |=OD8_POWER_LIMIT ; + +if (data->smu_features[GNLD_FAN_CONTROL ].enabled) { +if (pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_FANRPMMIN ] >0 ) + od_settings->overdrive8_capabilities |=OD8_FAN_SPEED_MIN ; + +if (pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_FANRPMACOUSTICLIMIT ] >0 ) + od_settings->overdrive8_capabilities |=OD8_ACOUSTIC_LIMIT_SCLK ; + } + +if (data->smu_features[GNLD_THERMAL ].enabled) { +if (pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_FANTARGETTEMPERATURE ] >0 ) + od_settings->overdrive8_capabilities |=OD8_TEMPERATURE_FAN ; + +if (pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_OPERATINGTEMPMAX ] >0 ) + od_settings->overdrive8_capabilities |=OD8_TEMPERATURE_SYSTEM ; + } + +return 0 ; +} + +static int vega20_od8_set_feature_id ( +struct pp_hwmgr *hwmgr) +{ +struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); +struct vega20_od8_settings *od_settings = &(data->od8_settings); + +if (od_settings->overdrive8_capabilities &OD8_GFXCLK_LIMITS ) { + od_settings->od8_settings_array[OD8_SETTING_GFXCLK_FMIN ].feature_id = +OD8_GFXCLK_LIMITS ; + od_settings->od8_settings_array[OD8_SETTING_GFXCLK_FMAX ].feature_id = +OD8_GFXCLK_LIMITS ; + }else { + od_settings->od8_settings_array[OD8_SETTING_GFXCLK_FMIN ].feature_id = +0 ; + od_settings->od8_settings_array[OD8_SETTING_GFXCLK_FMAX ].feature_id = +0 ; + } + +if (od_settings->overdrive8_capabilities &OD8_GFXCLK_CURVE ) { + od_settings->od8_settings_array[OD8_SETTING_GFXCLK_FREQ1 ].feature_id = +OD8_GFXCLK_CURVE ; + od_settings->od8_settings_array[OD8_SETTING_GFXCLK_VOLTAGE1 ].feature_id = +OD8_GFXCLK_CURVE ; + od_settings->od8_settings_array[OD8_SETTING_GFXCLK_FREQ2 ].feature_id = +OD8_GFXCLK_CURVE ; + od_settings->od8_settings_array[OD8_SETTING_GFXCLK_VOLTAGE2 ].feature_id = +OD8_GFXCLK_CURVE ; + od_settings->od8_settings_array[OD8_SETTING_GFXCLK_FREQ3 ].feature_id = +OD8_GFXCLK_CURVE ; + od_settings->od8_settings_array[OD8_SETTING_GFXCLK_VOLTAGE3 ].feature_id = +OD8_GFXCLK_CURVE ; + }else { + od_settings->od8_settings_array[OD8_SETTING_GFXCLK_FREQ1 ].feature_id = +0 ; + od_settings->od8_settings_array[OD8_SETTING_GFXCLK_VOLTAGE1 ].feature_id = +0 ; + od_settings->od8_settings_array[OD8_SETTING_GFXCLK_FREQ2 ].feature_id = +0 ; + od_settings->od8_settings_array[OD8_SETTING_GFXCLK_VOLTAGE2 ].feature_id = +0 ; + od_settings->od8_settings_array[OD8_SETTING_GFXCLK_FREQ3 ].feature_id = +0 ; + od_settings->od8_settings_array[OD8_SETTING_GFXCLK_VOLTAGE3 ].feature_id = +0 ; + } + +if (od_settings->overdrive8_capabilities &OD8_UCLK_MAX ) + od_settings->od8_settings_array[OD8_SETTING_UCLK_FMAX ].feature_id =OD8_UCLK_MAX ; +else + od_settings->od8_settings_array[OD8_SETTING_UCLK_FMAX ].feature_id =0 ; + +if (od_settings->overdrive8_capabilities &OD8_POWER_LIMIT ) + od_settings->od8_settings_array[OD8_SETTING_POWER_PERCENTAGE ].feature_id =OD8_POWER_LIMIT ; +else + od_settings->od8_settings_array[OD8_SETTING_POWER_PERCENTAGE ].feature_id =0 ; + +if (od_settings->overdrive8_capabilities &OD8_ACOUSTIC_LIMIT_SCLK ) + od_settings->od8_settings_array[OD8_SETTING_FAN_ACOUSTIC_LIMIT ].feature_id = +OD8_ACOUSTIC_LIMIT_SCLK ; +else + od_settings->od8_settings_array[OD8_SETTING_FAN_ACOUSTIC_LIMIT ].feature_id = +0 ; + +if (od_settings->overdrive8_capabilities &OD8_FAN_SPEED_MIN ) + od_settings->od8_settings_array[OD8_SETTING_FAN_MIN_SPEED ].feature_id = +OD8_FAN_SPEED_MIN ; +else + od_settings->od8_settings_array[OD8_SETTING_FAN_MIN_SPEED ].feature_id = +0 ; + +if (od_settings->overdrive8_capabilities &OD8_TEMPERATURE_FAN ) + od_settings->od8_settings_array[OD8_SETTING_FAN_TARGET_TEMP ].feature_id = +OD8_TEMPERATURE_FAN ; +else + od_settings->od8_settings_array[OD8_SETTING_FAN_TARGET_TEMP ].feature_id = +0 ; + +if (od_settings->overdrive8_capabilities &OD8_TEMPERATURE_SYSTEM ) + od_settings->od8_settings_array[OD8_SETTING_OPERATING_TEMP_MAX ].feature_id = +OD8_TEMPERATURE_SYSTEM ; +else + od_settings->od8_settings_array[OD8_SETTING_OPERATING_TEMP_MAX ].feature_id = +0 ; + +return 0 ; +} + +static int vega20_od8_initialize_default_settings (struct pp_hwmgr *hwmgr) { +struct phm_ppt_v3_information *pptable_information = + (struct phm_ppt_v3_information *)hwmgr->pptable; +struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); +struct vega20_od8_settings *od8_settings = &(data->od8_settings); +OverDriveTable_t *od_table = &(data->smc_state_table.overdrive_table); +int i, ret =0 ; + +/* Set Feature Capabilities */ +vega20_od8_set_feature_capabilities (hwmgr); + +/* Map FeatureID to individual settings */ +vega20_od8_set_feature_id (hwmgr); + +/* Set default values */ + ret =vega20_copy_table_from_smc (hwmgr, (uint8_t *)od_table,TABLE_OVERDRIVE ); +PP_ASSERT_WITH_CODE (!ret, +"Failed to export over drive table!" , + return ret); + +if (od8_settings->overdrive8_capabilities &OD8_GFXCLK_LIMITS ) { + od8_settings->od8_settings_array[OD8_SETTING_GFXCLK_FMIN ].default_value = + od_table->GfxclkFmin; + od8_settings->od8_settings_array[OD8_SETTING_GFXCLK_FMAX ].default_value = + od_table->GfxclkFmax; + }else { + od8_settings->od8_settings_array[OD8_SETTING_GFXCLK_FMIN ].default_value = +0 ; + od8_settings->od8_settings_array[OD8_SETTING_GFXCLK_FMAX ].default_value = +0 ; + } + +if (od8_settings->overdrive8_capabilities &OD8_GFXCLK_CURVE ) { + od8_settings->od8_settings_array[OD8_SETTING_GFXCLK_FREQ1 ].default_value = + od_table->GfxclkFreq1; + od8_settings->od8_settings_array[OD8_SETTING_GFXCLK_VOLTAGE1 ].default_value = + od_table->GfxclkOffsetVolt1; + od8_settings->od8_settings_array[OD8_SETTING_GFXCLK_FREQ2 ].default_value = + od_table->GfxclkFreq2; + od8_settings->od8_settings_array[OD8_SETTING_GFXCLK_VOLTAGE2 ].default_value = + od_table->GfxclkOffsetVolt2; + od8_settings->od8_settings_array[OD8_SETTING_GFXCLK_FREQ3 ].default_value = + od_table->GfxclkFreq3; + od8_settings->od8_settings_array[OD8_SETTING_GFXCLK_VOLTAGE3 ].default_value = + od_table->GfxclkOffsetVolt3; + }else { + od8_settings->od8_settings_array[OD8_SETTING_GFXCLK_FREQ1 ].default_value = +0 ; + od8_settings->od8_settings_array[OD8_SETTING_GFXCLK_VOLTAGE1 ].default_value = +0 ; + od8_settings->od8_settings_array[OD8_SETTING_GFXCLK_FREQ2 ].default_value = +0 ; + od8_settings->od8_settings_array[OD8_SETTING_GFXCLK_VOLTAGE2 ].default_value = +0 ; + od8_settings->od8_settings_array[OD8_SETTING_GFXCLK_FREQ3 ].default_value = +0 ; + od8_settings->od8_settings_array[OD8_SETTING_GFXCLK_VOLTAGE3 ].default_value = +0 ; + } + +if (od8_settings->overdrive8_capabilities &OD8_UCLK_MAX ) + od8_settings->od8_settings_array[OD8_SETTING_UCLK_FMAX ].default_value = + od_table->UclkFmax; +else + od8_settings->od8_settings_array[OD8_SETTING_UCLK_FMAX ].default_value = +0 ; + +if (od8_settings->overdrive8_capabilities &OD8_POWER_LIMIT ) + od8_settings->od8_settings_array[OD8_SETTING_POWER_PERCENTAGE ].default_value = + od_table->OverDrivePct; +else + od8_settings->od8_settings_array[OD8_SETTING_POWER_PERCENTAGE ].default_value = +0 ; + +if (od8_settings->overdrive8_capabilities &OD8_ACOUSTIC_LIMIT_SCLK ) + od8_settings->od8_settings_array[OD8_SETTING_FAN_ACOUSTIC_LIMIT ].default_value = + od_table->FanMaximumRpm; +else + od8_settings->od8_settings_array[OD8_SETTING_FAN_ACOUSTIC_LIMIT ].default_value = +0 ; + +if (od8_settings->overdrive8_capabilities &OD8_FAN_SPEED_MIN ) + od8_settings->od8_settings_array[OD8_SETTING_FAN_MIN_SPEED ].default_value = + od_table->FanMinimumPwm; +else + od8_settings->od8_settings_array[OD8_SETTING_FAN_MIN_SPEED ].default_value = +0 ; + +if (od8_settings->overdrive8_capabilities &OD8_TEMPERATURE_FAN ) + od8_settings->od8_settings_array[OD8_SETTING_FAN_TARGET_TEMP ].default_value = + od_table->FanTargetTemperature; +else + od8_settings->od8_settings_array[OD8_SETTING_FAN_TARGET_TEMP ].default_value = +0 ; + +if (od8_settings->overdrive8_capabilities &OD8_TEMPERATURE_SYSTEM ) + od8_settings->od8_settings_array[OD8_SETTING_OPERATING_TEMP_MAX ].default_value = + od_table->MaxOpTemp; +else + od8_settings->od8_settings_array[OD8_SETTING_OPERATING_TEMP_MAX ].default_value = +0 ; + +for (i =0 ; i <OD8_SETTING_COUNT ; i++) { +if (od8_settings->od8_settings_array[i].feature_id) { + od8_settings->od8_settings_array[i].min_value = + pptable_information->od_settings_min[i]; + od8_settings->od8_settings_array[i].max_value = + pptable_information->od_settings_max[i]; + od8_settings->od8_settings_array[i].current_value = + od8_settings->od8_settings_array[i].default_value; + }else { + od8_settings->od8_settings_array[i].min_value = +0 ; + od8_settings->od8_settings_array[i].max_value = +0 ; + od8_settings->od8_settings_array[i].current_value = +0 ; + } + } +return 0 ; }
@@ -1009,7 +1264,7 @@ static int vega20_enable_dpm_tasks(struct pp_hwmgr *hwmgr)"[EnableDPMTasks] Failed to power control set level!" , return result); - result =vega20_odn_initialize_default_settings (hwmgr); + result =vega20_od8_initialize_default_settings (hwmgr);PP_ASSERT_WITH_CODE (!result,"[EnableDPMTasks] Failed to initialize odn settings!" , return result);
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h +52 -1
71 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_processpptables.c +74 -29
163 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h +2 -0
@@ -232,6 +232,8 @@ enum phm_platform_caps { PHM_PlatformCaps_UVDClientMCTuning, PHM_PlatformCaps_ODNinACSupport, PHM_PlatformCaps_ODNinDCSupport, + PHM_PlatformCaps_OD8inACSupport, + PHM_PlatformCaps_OD8inDCSupport, PHM_PlatformCaps_UMDPState, PHM_PlatformCaps_AutoWattmanSupport, PHM_PlatformCaps_AutoWattmanEnable_CCCState,
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +1 -0
@@ -583,6 +583,7 @@ struct phm_ppt_v3_informationuint32_t *power_saving_clock_max;uint32_t *power_saving_clock_min; +uint8_t *od_feature_capabilities;uint32_t *od_settings_max;uint32_t *od_settings_min;
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 22/38 drm/amd/powerplay: new interfaces for overdrive vega20 sclk and mclk
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Add support for the new SMU firmware interface for clock adjustment.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 169 +++++++++++++++++++++ 1 file changed, 169 insertions(+)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +169 -0
@@ -1101,6 +1101,166 @@ static int vega20_od8_initialize_default_settings(return 0 ; } +static int vega20_od8_set_settings ( +struct pp_hwmgr *hwmgr, +uint32_t index, +uint32_t value) +{ +OverDriveTable_t od_table; +int ret =0 ; + + ret =vega20_copy_table_from_smc (hwmgr, (uint8_t *)(&od_table),TABLE_OVERDRIVE ); +PP_ASSERT_WITH_CODE (!ret, +"Failed to export over drive table!" , + return ret); + +switch (index) { +case OD8_SETTING_GFXCLK_FMIN : + od_table.GfxclkFmin = (uint16_t )value; +break ; +case OD8_SETTING_GFXCLK_FMAX : + od_table.GfxclkFmax = (uint16_t )value; +break ; +case OD8_SETTING_GFXCLK_FREQ1 : + od_table.GfxclkFreq1 = (uint16_t )value; +break ; +case OD8_SETTING_GFXCLK_VOLTAGE1 : + od_table.GfxclkOffsetVolt1 = (uint16_t )value; +break ; +case OD8_SETTING_GFXCLK_FREQ2 : + od_table.GfxclkFreq2 = (uint16_t )value; +break ; +case OD8_SETTING_GFXCLK_VOLTAGE2 : + od_table.GfxclkOffsetVolt2 = (uint16_t )value; +break ; +case OD8_SETTING_GFXCLK_FREQ3 : + od_table.GfxclkFreq3 = (uint16_t )value; +break ; +case OD8_SETTING_GFXCLK_VOLTAGE3 : + od_table.GfxclkOffsetVolt3 = (uint16_t )value; +break ; +case OD8_SETTING_UCLK_FMAX : + od_table.UclkFmax = (uint16_t )value; +break ; +case OD8_SETTING_POWER_PERCENTAGE : + od_table.OverDrivePct = (int16_t )value; +break ; +case OD8_SETTING_FAN_ACOUSTIC_LIMIT : + od_table.FanMaximumRpm = (uint16_t )value; +break ; +case OD8_SETTING_FAN_MIN_SPEED : + od_table.FanMinimumPwm = (uint16_t )value; +break ; +case OD8_SETTING_FAN_TARGET_TEMP : + od_table.FanTargetTemperature = (uint16_t )value; +break ; +case OD8_SETTING_OPERATING_TEMP_MAX : + od_table.MaxOpTemp = (uint16_t )value; +break ; + } + + ret =vega20_copy_table_to_smc (hwmgr, (uint8_t *)(&od_table),TABLE_OVERDRIVE ); +PP_ASSERT_WITH_CODE (!ret, +"Failed to import over drive table!" , + return ret); + +return 0 ; +} + +static int vega20_get_sclk_od ( +struct pp_hwmgr *hwmgr) +{ +struct vega20_hwmgr *data = hwmgr->backend; +struct vega20_single_dpm_table *sclk_table = + &(data->dpm_table.gfx_table); +struct vega20_single_dpm_table *golden_sclk_table = + &(data->golden_dpm_table.gfx_table); +int value; + +/* od percentage */ + value =DIV_ROUND_UP ((sclk_table->dpm_levels[sclk_table->count -1 ].value - + golden_sclk_table->dpm_levels[golden_sclk_table->count -1 ].value) *100 , + golden_sclk_table->dpm_levels[golden_sclk_table->count -1 ].value); + +return value; +} + +static int vega20_set_sclk_od ( +struct pp_hwmgr *hwmgr,uint32_t value) +{ +struct vega20_hwmgr *data = hwmgr->backend; +struct vega20_single_dpm_table *sclk_table = + &(data->dpm_table.gfx_table); +struct vega20_single_dpm_table *golden_sclk_table = + &(data->golden_dpm_table.gfx_table); +uint32_t od_sclk; +int ret =0 ; + + od_sclk = golden_sclk_table->dpm_levels[golden_sclk_table->count -1 ].value * value; +do_div (od_sclk,100 ); + od_sclk += golden_sclk_table->dpm_levels[golden_sclk_table->count -1 ].value; + + ret =vega20_od8_set_settings (hwmgr,OD8_SETTING_GFXCLK_FMAX , od_sclk); +PP_ASSERT_WITH_CODE (!ret, +"[SetSclkOD] failed to set od gfxclk!" , + return ret); + +/* refresh gfxclk table */ + ret =vega20_setup_single_dpm_table (hwmgr, sclk_table,PPCLK_GFXCLK ); +PP_ASSERT_WITH_CODE (!ret, +"[SetSclkOD] failed to refresh gfxclk table!" , + return ret); + +return 0 ; +} + +static int vega20_get_mclk_od ( +struct pp_hwmgr *hwmgr) +{ +struct vega20_hwmgr *data = hwmgr->backend; +struct vega20_single_dpm_table *mclk_table = + &(data->dpm_table.mem_table); +struct vega20_single_dpm_table *golden_mclk_table = + &(data->golden_dpm_table.mem_table); +int value; + +/* od percentage */ + value =DIV_ROUND_UP ((mclk_table->dpm_levels[mclk_table->count -1 ].value - + golden_mclk_table->dpm_levels[golden_mclk_table->count -1 ].value) *100 , + golden_mclk_table->dpm_levels[golden_mclk_table->count -1 ].value); + +return value; +} + +static int vega20_set_mclk_od ( +struct pp_hwmgr *hwmgr,uint32_t value) +{ +struct vega20_hwmgr *data = hwmgr->backend; +struct vega20_single_dpm_table *mclk_table = + &(data->dpm_table.mem_table); +struct vega20_single_dpm_table *golden_mclk_table = + &(data->golden_dpm_table.mem_table); +uint32_t od_mclk; +int ret =0 ; + + od_mclk = golden_mclk_table->dpm_levels[golden_mclk_table->count -1 ].value * value; +do_div (od_mclk,100 ); + od_mclk += golden_mclk_table->dpm_levels[golden_mclk_table->count -1 ].value; + + ret =vega20_od8_set_settings (hwmgr,OD8_SETTING_UCLK_FMAX , od_mclk); +PP_ASSERT_WITH_CODE (!ret, +"[SetMclkOD] failed to set od memclk!" , + return ret); + +/* refresh memclk table */ + ret =vega20_setup_single_dpm_table (hwmgr, mclk_table,PPCLK_UCLK ); +PP_ASSERT_WITH_CODE (!ret, +"[SetMclkOD] failed to refresh memclk table!" , + return ret); + +return 0 ; +} +static int vega20_populate_umdpstate_clocks (struct pp_hwmgr *hwmgr) {
@@ -2604,8 +2764,17 @@ static const struct pp_hwmgr_func vega20_hwmgr_funcs = { vega20_get_power_profile_mode, .set_power_profile_mode = vega20_set_power_profile_mode, +/* od related */ .set_power_limit = vega20_set_power_limit, + .get_sclk_od = + vega20_get_sclk_od, + .set_sclk_od = + vega20_set_sclk_od, + .get_mclk_od = + vega20_get_mclk_od, + .set_mclk_od = + vega20_set_mclk_od,/* for sysfs to retrive/set gfxclk/memclk */ .force_clock_level = vega20_force_clock_level,
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 23/38 drm/amd/powerplay: revise vega20 PPSMC_MSG_SetSoftMin/[Max]ByFreq settings
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
UVD, VCE and Socclk also need to be taken into consideration when setting PPSMC_MSG_SetSoftMinByFreq and PPSMC_MSG_SetSoftMaxByFreq.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 109 ++++++++++++++++++--- 1 file changed, 96 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +96 -13
@@ -1485,31 +1485,72 @@ static int vega20_upload_dpm_min_level(struct pp_hwmgr *hwmgr) {struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); +uint32_t min_freq;int ret =0 ; -if (data->smu_features[GNLD_DPM_GFXCLK ].enabled) +if (data->smu_features[GNLD_DPM_GFXCLK ].enabled) { + min_freq = data->dpm_table.gfx_table.dpm_state.soft_min_level;PP_ASSERT_WITH_CODE (!(ret =smum_send_msg_to_smc_with_parameter ( hwmgr, PPSMC_MSG_SetSoftMinByFreq, -PPCLK_GFXCLK <<16 | - data->dpm_table.gfx_table.dpm_state.soft_min_level)), + (PPCLK_GFXCLK <<16 ) | (min_freq &0xffff ))),"Failed to set soft min gfxclk !" , return ret); + }if (data->smu_features[GNLD_DPM_UCLK ].enabled) { + min_freq = data->dpm_table.mem_table.dpm_state.soft_min_level;PP_ASSERT_WITH_CODE (!(ret =smum_send_msg_to_smc_with_parameter ( hwmgr, PPSMC_MSG_SetSoftMinByFreq, -PPCLK_UCLK <<16 | - data->dpm_table.mem_table.dpm_state.soft_min_level)), + (PPCLK_UCLK <<16 ) | (min_freq &0xffff ))),"Failed to set soft min memclk !" , return ret); + + min_freq = data->dpm_table.mem_table.dpm_state.hard_min_level;PP_ASSERT_WITH_CODE (!(ret =smum_send_msg_to_smc_with_parameter ( hwmgr, PPSMC_MSG_SetHardMinByFreq, -PPCLK_UCLK <<16 | - data->dpm_table.mem_table.dpm_state.hard_min_level)), + (PPCLK_UCLK <<16 ) | (min_freq &0xffff ))),"Failed to set hard min memclk !" , return ret); } +if (data->smu_features[GNLD_DPM_UVD ].enabled) { + min_freq = data->dpm_table.vclk_table.dpm_state.soft_min_level; + +PP_ASSERT_WITH_CODE (!(ret =smum_send_msg_to_smc_with_parameter ( + hwmgr, PPSMC_MSG_SetSoftMinByFreq, + (PPCLK_VCLK <<16 ) | (min_freq &0xffff ))), +"Failed to set soft min vclk!" , + return ret); + + min_freq = data->dpm_table.dclk_table.dpm_state.soft_min_level; + +PP_ASSERT_WITH_CODE (!(ret =smum_send_msg_to_smc_with_parameter ( + hwmgr, PPSMC_MSG_SetSoftMinByFreq, + (PPCLK_DCLK <<16 ) | (min_freq &0xffff ))), +"Failed to set soft min dclk!" , + return ret); + } + +if (data->smu_features[GNLD_DPM_VCE ].enabled) { + min_freq = data->dpm_table.eclk_table.dpm_state.soft_min_level; + +PP_ASSERT_WITH_CODE (!(ret =smum_send_msg_to_smc_with_parameter ( + hwmgr, PPSMC_MSG_SetSoftMinByFreq, + (PPCLK_ECLK <<16 ) | (min_freq &0xffff ))), +"Failed to set soft min eclk!" , + return ret); + } + +if (data->smu_features[GNLD_DPM_SOCCLK ].enabled) { + min_freq = data->dpm_table.soc_table.dpm_state.soft_min_level; + +PP_ASSERT_WITH_CODE (!(ret =smum_send_msg_to_smc_with_parameter ( + hwmgr, PPSMC_MSG_SetSoftMinByFreq, + (PPCLK_SOCCLK <<16 ) | (min_freq &0xffff ))), +"Failed to set soft min socclk!" , + return ret); + } +return ret; }
@@ -1517,23 +1558,65 @@ static int vega20_upload_dpm_max_level(struct pp_hwmgr *hwmgr) {struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); +uint32_t max_freq;int ret =0 ; -if (data->smu_features[GNLD_DPM_GFXCLK ].enabled) +if (data->smu_features[GNLD_DPM_GFXCLK ].enabled) { + max_freq = data->dpm_table.gfx_table.dpm_state.soft_max_level; +PP_ASSERT_WITH_CODE (!(ret =smum_send_msg_to_smc_with_parameter ( hwmgr, PPSMC_MSG_SetSoftMaxByFreq, -PPCLK_GFXCLK <<16 | - data->dpm_table.gfx_table.dpm_state.soft_max_level)), + (PPCLK_GFXCLK <<16 ) | (max_freq &0xffff ))),"Failed to set soft max gfxclk!" , return ret); + } + +if (data->smu_features[GNLD_DPM_UCLK ].enabled) { + max_freq = data->dpm_table.mem_table.dpm_state.soft_max_level; -if (data->smu_features[GNLD_DPM_UCLK ].enabled)PP_ASSERT_WITH_CODE (!(ret =smum_send_msg_to_smc_with_parameter ( hwmgr, PPSMC_MSG_SetSoftMaxByFreq, -PPCLK_UCLK <<16 | - data->dpm_table.mem_table.dpm_state.soft_max_level)), + (PPCLK_UCLK <<16 ) | (max_freq &0xffff ))),"Failed to set soft max memclk!" , return ret); + } + +if (data->smu_features[GNLD_DPM_UVD ].enabled) { + max_freq = data->dpm_table.vclk_table.dpm_state.soft_max_level; + +PP_ASSERT_WITH_CODE (!(ret =smum_send_msg_to_smc_with_parameter ( + hwmgr, PPSMC_MSG_SetSoftMaxByFreq, + (PPCLK_VCLK <<16 ) | (max_freq &0xffff ))), +"Failed to set soft max vclk!" , + return ret); + + max_freq = data->dpm_table.dclk_table.dpm_state.soft_max_level; +PP_ASSERT_WITH_CODE (!(ret =smum_send_msg_to_smc_with_parameter ( + hwmgr, PPSMC_MSG_SetSoftMaxByFreq, + (PPCLK_DCLK <<16 ) | (max_freq &0xffff ))), +"Failed to set soft max dclk!" , + return ret); + } + +if (data->smu_features[GNLD_DPM_VCE ].enabled) { + max_freq = data->dpm_table.eclk_table.dpm_state.soft_max_level; + +PP_ASSERT_WITH_CODE (!(ret =smum_send_msg_to_smc_with_parameter ( + hwmgr, PPSMC_MSG_SetSoftMaxByFreq, + (PPCLK_ECLK <<16 ) | (max_freq &0xffff ))), +"Failed to set soft max eclk!" , + return ret); + } + +if (data->smu_features[GNLD_DPM_SOCCLK ].enabled) { + max_freq = data->dpm_table.soc_table.dpm_state.soft_max_level; + +PP_ASSERT_WITH_CODE (!(ret =smum_send_msg_to_smc_with_parameter ( + hwmgr, PPSMC_MSG_SetSoftMaxByFreq, + (PPCLK_SOCCLK <<16 ) | (max_freq &0xffff ))), +"Failed to set soft max socclk!" , + return ret); + }return ret; }
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 24/38 drm/amd/powerplay: update vega20 clocks threshold settings on power state adjust
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
UVD, VCE and SOC clocks need to be taken into consideration. Also, the thresholds need be updated correspondingly when stable power state is selected.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 112 +++++++++++++++++++++ 1 file changed, 112 insertions(+)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +112 -0
@@ -2503,6 +2503,23 @@ static int vega20_apply_clocks_adjust_rules(struct pp_hwmgr *hwmgr) dpm_table->dpm_state.hard_min_level = dpm_table->dpm_levels[0 ].value; dpm_table->dpm_state.hard_max_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; +if (PP_CAP (PHM_PlatformCaps_UMDPState)) { +if (VEGA20_UMD_PSTATE_GFXCLK_LEVEL < dpm_table->count) { + dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[VEGA20_UMD_PSTATE_GFXCLK_LEVEL ].value; + dpm_table->dpm_state.soft_max_level = dpm_table->dpm_levels[VEGA20_UMD_PSTATE_GFXCLK_LEVEL ].value; + } + +if (hwmgr->dpm_level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK ) { + dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[0 ].value; + dpm_table->dpm_state.soft_max_level = dpm_table->dpm_levels[0 ].value; + } + +if (hwmgr->dpm_level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) { + dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + dpm_table->dpm_state.soft_max_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + } + } +/* memclk */ dpm_table = &(data->dpm_table.mem_table); dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[0 ].value;
@@ -2510,9 +2527,28 @@ static int vega20_apply_clocks_adjust_rules(struct pp_hwmgr *hwmgr) dpm_table->dpm_state.hard_min_level = dpm_table->dpm_levels[0 ].value; dpm_table->dpm_state.hard_max_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; +if (PP_CAP (PHM_PlatformCaps_UMDPState)) { +if (VEGA20_UMD_PSTATE_MCLK_LEVEL < dpm_table->count) { + dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[VEGA20_UMD_PSTATE_MCLK_LEVEL ].value; + dpm_table->dpm_state.soft_max_level = dpm_table->dpm_levels[VEGA20_UMD_PSTATE_MCLK_LEVEL ].value; + } + +if (hwmgr->dpm_level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK ) { + dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[0 ].value; + dpm_table->dpm_state.soft_max_level = dpm_table->dpm_levels[0 ].value; + } + +if (hwmgr->dpm_level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) { + dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + dpm_table->dpm_state.soft_max_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + } + } + +/* honour DAL's UCLK Hardmin */ if (dpm_table->dpm_state.hard_min_level < (hwmgr->display_config->min_mem_set_clock /100 )) dpm_table->dpm_state.hard_min_level = hwmgr->display_config->min_mem_set_clock /100 ; +/* Hardmin is dependent on displayconfig */ if (disable_mclk_switching) { dpm_table->dpm_state.hard_min_level = dpm_table->dpm_levels[dpm_table->count -1 ].value;for (i =0 ; i < data->mclk_latency_table.count -1 ; i++) {
@@ -2528,6 +2564,82 @@ static int vega20_apply_clocks_adjust_rules(struct pp_hwmgr *hwmgr)if (hwmgr->display_config->nb_pstate_switch_disable) dpm_table->dpm_state.hard_min_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; +/* vclk */ + dpm_table = &(data->dpm_table.vclk_table); + dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[0 ].value; + dpm_table->dpm_state.soft_max_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + dpm_table->dpm_state.hard_min_level = dpm_table->dpm_levels[0 ].value; + dpm_table->dpm_state.hard_max_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + +if (PP_CAP (PHM_PlatformCaps_UMDPState)) { +if (VEGA20_UMD_PSTATE_UVDCLK_LEVEL < dpm_table->count) { + dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[VEGA20_UMD_PSTATE_UVDCLK_LEVEL ].value; + dpm_table->dpm_state.soft_max_level = dpm_table->dpm_levels[VEGA20_UMD_PSTATE_UVDCLK_LEVEL ].value; + } + +if (hwmgr->dpm_level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) { + dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + dpm_table->dpm_state.soft_max_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + } + } + +/* dclk */ + dpm_table = &(data->dpm_table.dclk_table); + dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[0 ].value; + dpm_table->dpm_state.soft_max_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + dpm_table->dpm_state.hard_min_level = dpm_table->dpm_levels[0 ].value; + dpm_table->dpm_state.hard_max_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + +if (PP_CAP (PHM_PlatformCaps_UMDPState)) { +if (VEGA20_UMD_PSTATE_UVDCLK_LEVEL < dpm_table->count) { + dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[VEGA20_UMD_PSTATE_UVDCLK_LEVEL ].value; + dpm_table->dpm_state.soft_max_level = dpm_table->dpm_levels[VEGA20_UMD_PSTATE_UVDCLK_LEVEL ].value; + } + +if (hwmgr->dpm_level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) { + dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + dpm_table->dpm_state.soft_max_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + } + } + +/* socclk */ + dpm_table = &(data->dpm_table.soc_table); + dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[0 ].value; + dpm_table->dpm_state.soft_max_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + dpm_table->dpm_state.hard_min_level = dpm_table->dpm_levels[0 ].value; + dpm_table->dpm_state.hard_max_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + +if (PP_CAP (PHM_PlatformCaps_UMDPState)) { +if (VEGA20_UMD_PSTATE_SOCCLK_LEVEL < dpm_table->count) { + dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[VEGA20_UMD_PSTATE_SOCCLK_LEVEL ].value; + dpm_table->dpm_state.soft_max_level = dpm_table->dpm_levels[VEGA20_UMD_PSTATE_SOCCLK_LEVEL ].value; + } + +if (hwmgr->dpm_level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) { + dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + dpm_table->dpm_state.soft_max_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + } + } + +/* eclk */ + dpm_table = &(data->dpm_table.eclk_table); + dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[0 ].value; + dpm_table->dpm_state.soft_max_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + dpm_table->dpm_state.hard_min_level = dpm_table->dpm_levels[0 ].value; + dpm_table->dpm_state.hard_max_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + +if (PP_CAP (PHM_PlatformCaps_UMDPState)) { +if (VEGA20_UMD_PSTATE_VCEMCLK_LEVEL < dpm_table->count) { + dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[VEGA20_UMD_PSTATE_VCEMCLK_LEVEL ].value; + dpm_table->dpm_state.soft_max_level = dpm_table->dpm_levels[VEGA20_UMD_PSTATE_VCEMCLK_LEVEL ].value; + } + +if (hwmgr->dpm_level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) { + dpm_table->dpm_state.soft_min_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + dpm_table->dpm_state.soft_max_level = dpm_table->dpm_levels[dpm_table->count -1 ].value; + } + } +return 0 ; }
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 25/38 drm/amdgpu: enable vega20 powerplay support
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +2 -2
@@ -520,9 +520,9 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &vega10_ih_ip_block);if (adev->asic_type !=CHIP_VEGA20 ) {amdgpu_device_ip_block_add (adev, &psp_v3_1_ip_block); -if (!amdgpu_sriov_vf (adev)) -amdgpu_device_ip_block_add (adev, &pp_smu_ip_block); } +if (!amdgpu_sriov_vf (adev)) +amdgpu_device_ip_block_add (adev, &pp_smu_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev))amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block);#if defined(CONFIG_DRM_AMD_DC )
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 26/38 drm/amdgpu: Add psp 11.0 support for vega20. (v2)
In reply to a message not in the archiveFrom: Feifei Xu <[email protected]>
Add psp 11.0 code for vega20 and enable it. PSP is the security processor for the GPU. It handles firmware loading and GPU resets among other things.
v2: whitespace fix, enable support, adjust reg includes (Alex)
--- drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 1 + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 565 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/psp_v11_0.h | 30 ++ drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 2 - drivers/gpu/drm/amd/amdgpu/soc15.c | 5 +- 7 files changed, 614 insertions(+), 6 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v11_0.h
drivers/gpu/drm/amd/amdgpu/Makefile +2 -1
@@ -88,7 +88,8 @@ amdgpu-y += \ amdgpu-y += \ amdgpu_psp.o \ psp_v3_1.o \ - psp_v10_0.o + psp_v10_0.o \ + psp_v11_0.o # add SMC block amdgpu-y += \
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +13 -1
@@ -31,6 +31,7 @@#include "soc15_common.h" #include "psp_v3_1.h" #include "psp_v10_0.h" +#include "psp_v11_0.h" static void psp_set_funcs (struct amdgpu_device *adev);
@@ -52,12 +53,14 @@ static int psp_sw_init(void *handle)switch (adev->asic_type) {case CHIP_VEGA10 :case CHIP_VEGA12 : -case CHIP_VEGA20 :psp_v3_1_set_psp_funcs (psp);break ;case CHIP_RAVEN :psp_v10_0_set_psp_funcs (psp);break ; +case CHIP_VEGA20 : +psp_v11_0_set_psp_funcs (psp); +break ;default :return -EINVAL ; }
@@ -594,3 +597,12 @@ const struct amdgpu_ip_block_version psp_v10_0_ip_block = .rev = 0, .funcs = &psp_ip_funcs, }; + +const struct amdgpu_ip_block_version psp_v11_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_PSP , + .major =11 , + .minor =0 , + .rev =0 , + .funcs = &psp_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +1 -0
@@ -164,5 +164,6 @@ extern int psp_wait_for(struct psp_context *psp, uint32_t reg_index,extern const struct amdgpu_ip_block_version psp_v10_0_ip_block;int psp_gpu_reset (struct amdgpu_device *adev); +extern const struct amdgpu_ip_block_version psp_v11_0_ip_block;#endif
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c new file +565 -0
565 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/psp_v11_0.h new file +30 -0
@@ -0,0 +1,30 @@ +/* +* Copyright 2018 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +*/ +#ifndef __PSP_V11_0_H__ +#define __PSP_V11_0_H__ + +#include "amdgpu_psp.h" + +void psp_v11_0_set_psp_funcs (struct psp_context *psp); + +#endif
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +0 -2
@@ -41,8 +41,6 @@ MODULE_FIRMWARE("amdgpu/vega10_sos.bin");MODULE_FIRMWARE ("amdgpu/vega10_asd.bin" );MODULE_FIRMWARE ("amdgpu/vega12_sos.bin" );MODULE_FIRMWARE ("amdgpu/vega12_asd.bin" ); -MODULE_FIRMWARE ("amdgpu/vega20_sos.bin" ); -MODULE_FIRMWARE ("amdgpu/vega20_asd.bin" );#define smnMP1_FIRMWARE_FLAGS 0x3010028
drivers/gpu/drm/amd/amdgpu/soc15.c +3 -2
@@ -518,9 +518,10 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &vega10_common_ip_block);amdgpu_device_ip_block_add (adev, &gmc_v9_0_ip_block);amdgpu_device_ip_block_add (adev, &vega10_ih_ip_block); -if (adev->asic_type !=CHIP_VEGA20 ) { +if (adev->asic_type ==CHIP_VEGA20 ) +amdgpu_device_ip_block_add (adev, &psp_v11_0_ip_block); +else amdgpu_device_ip_block_add (adev, &psp_v3_1_ip_block); - }if (!amdgpu_sriov_vf (adev))amdgpu_device_ip_block_add (adev, &pp_smu_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev))
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 27/38 drm/amdgpu/vg20: Change the load type of vega20 to psp (v2)
In reply to a message not in the archiveFrom: Likun Gao <[email protected]>
Modified the vega20 load type to psp now that psp support is implemented.
v2: squash in fixes history (Alex)
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +1 -2
@@ -303,12 +303,11 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)case CHIP_VEGA10 :case CHIP_RAVEN :case CHIP_VEGA12 : +case CHIP_VEGA20 :if (!load_type)return AMDGPU_FW_LOAD_DIRECT ;else return AMDGPU_FW_LOAD_PSP ; -case CHIP_VEGA20 : -return AMDGPU_FW_LOAD_DIRECT ;default :DRM_ERROR ("Unknown firmware load type\n" ); }
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 28/38 drm/amd/powerplay: enable fclk ss by default
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Set fclk ss as enabled on default.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_processpptables.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_processpptables.c +1 -1
@@ -810,7 +810,7 @@ static int append_vbios_pptable(struct pp_hwmgr *hwmgr, PPTable_t *ppsmc_pptable ppsmc_pptable->UclkSpreadPercent = smc_dpm_table->uclkspreadpercent; ppsmc_pptable->UclkSpreadFreq = smc_dpm_table->uclkspreadfreq; - ppsmc_pptable->FclkSpreadEnabled =0 ; + ppsmc_pptable->FclkSpreadEnabled = smc_dpm_table->fclkspreadenabled; ppsmc_pptable->FclkSpreadPercent = smc_dpm_table->fclkspreadpercent; ppsmc_pptable->FclkSpreadFreq = smc_dpm_table->fclkspreadfreq;
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 29/38 drm/amd/powerplay: remove setting soc floor voltage before sending pptable
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
SOC voltage is not able to switch and forced to low 0.8V when running HEVC. Thus the test failed.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 9 +-------- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h | 1 - 2 files changed, 1 insertion(+), 9 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1 -8
@@ -707,14 +707,7 @@ static int vega20_init_smc_table(struct pp_hwmgr *hwmgr) data->vbios_boot_state.vclock = boot_up_values.ulVClk; data->vbios_boot_state.dclock = boot_up_values.ulDClk; data->vbios_boot_state.uc_cooling_id = boot_up_values.ucCoolingID; -if (0 != boot_up_values.usVddc) { -smum_send_msg_to_smc_with_parameter (hwmgr, - PPSMC_MSG_SetFloorSocVoltage, - (boot_up_values.usVddc *4 )); - data->vbios_boot_state.bsoc_vddc_lock = true; - }else { - data->vbios_boot_state.bsoc_vddc_lock = false; - } +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetMinDeepSleepDcefclk, (uint32_t )(data->vbios_boot_state.dcef_clock /100 ));
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h +0 -1
@@ -203,7 +203,6 @@ struct vega20_dpmlevel_enable_mask { };struct vega20_vbios_boot_state { -bool bsoc_vddc_lock;uint8_t uc_cooling_id;uint16_t vddc;uint16_t vddci;
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 30/38 drm/amd/powerplay: avoid enabling/disabling uvd/vce dpm twice
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
For vega20, there are two UVD rings which share one powerplay instance. Under some case(two rings used parallel), the uvd dpm is disabled twice which causes the SMC hang.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +6 -0
@@ -2464,6 +2464,9 @@ static void vega20_power_gate_vce(struct pp_hwmgr *hwmgr, bool bgate) {struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); +if (data->vce_power_gated == bgate) +return ; + data->vce_power_gated = bgate;vega20_enable_disable_vce_dpm (hwmgr, !bgate); }
@@ -2472,6 +2475,9 @@ static void vega20_power_gate_uvd(struct pp_hwmgr *hwmgr, bool bgate) {struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); +if (data->uvd_power_gated == bgate) +return ; + data->uvd_power_gated = bgate;vega20_enable_disable_uvd_dpm (hwmgr, !bgate); }
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 31/38 drm/amd/powerplay: correct the argument for PPSMC_MSG_SetUclkFastSwitch
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
The argument was set wrongly. Fast/slow switch was asked when there is actually a slow/fast switch needed.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1 -1
@@ -1839,7 +1839,7 @@ static int vega20_notify_smc_display_change(struct pp_hwmgr *hwmgr,if (data->smu_features[GNLD_DPM_UCLK ].enabled)return smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetUclkFastSwitch, - has_disp ?0 :1 ); + has_disp ?1 :0 );return 0 ; }
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 32/38 drm/amd/powerplay: allow slow switch only if NBPState enabled
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Otherwise there may be potential SMU performance issues.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2 -1
@@ -1896,7 +1896,8 @@ static int vega20_notify_smc_display_config_after_ps_adjustment(int ret =0 ;if ((hwmgr->display_config->num_display >1 ) && - !hwmgr->display_config->multi_monitor_in_sync) + !hwmgr->display_config->multi_monitor_in_sync && + !hwmgr->display_config->nb_pstate_switch_disable)vega20_notify_smc_display_change (hwmgr, false);else vega20_notify_smc_display_change (hwmgr, true);
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 33/38 drm/amd/powerplay: remove max DCEFCLK limitation
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
The latest SMU fw removes the limitation that required UCLK >= DCEFCLK.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0 -3
@@ -1356,9 +1356,6 @@ static int vega20_init_max_sustainable_clocks(struct pp_hwmgr *hwmgr)if (max_sustainable_clocks->soc_clock < max_sustainable_clocks->uclock) max_sustainable_clocks->uclock = max_sustainable_clocks->soc_clock; -if (max_sustainable_clocks->uclock < max_sustainable_clocks->dcef_clock) - max_sustainable_clocks->dcef_clock = max_sustainable_clocks->uclock; -return 0 ; }
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 34/38 drm/amd/powerplay: added voltage boot time calibration
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Run AFLL BTC after upload pptable and before enabling all smu features.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +10 -0
@@ -756,6 +756,11 @@ static int vega20_set_allowed_featuresmask(struct pp_hwmgr *hwmgr)return 0 ; } +static int vega20_run_btc_afll (struct pp_hwmgr *hwmgr) +{ +return smum_send_msg_to_smc (hwmgr, PPSMC_MSG_RunAfllBtc); +} +static int vega20_enable_all_smu_features (struct pp_hwmgr *hwmgr) { struct vega20_hwmgr *data =
@@ -1391,6 +1396,11 @@ static int vega20_enable_dpm_tasks(struct pp_hwmgr *hwmgr)"[EnableDPMTasks] Failed to initialize SMC table!" , return result); + result =vega20_run_btc_afll (hwmgr); +PP_ASSERT_WITH_CODE (!result, +"[EnableDPMTasks] Failed to run btc afll!" , + return result); + result =vega20_enable_all_smu_features (hwmgr); PP_ASSERT_WITH_CODE(!result, "[EnableDPMTasks] Failed to enable all smu features!",
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 35/38 drm/amdgpu/gfx9: Update gfx9 golden settings.
In reply to a message not in the archiveFrom: Feifei Xu <[email protected]>
Update the goldensettings for vega20.
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +1 -1
@@ -82,7 +82,7 @@ MODULE_FIRMWARE("amdgpu/raven_rlc.bin");static const struct soc15_reg_golden golden_settings_gc_9_0[] = { -SOC15_REG_GOLDEN_VALUE (GC ,0 , mmDB_DEBUG2,0xf00fffff ,0x00000420 ), +SOC15_REG_GOLDEN_VALUE (GC ,0 , mmDB_DEBUG2,0xf00fffff ,0x00000400 ),SOC15_REG_GOLDEN_VALUE (GC ,0 , mmGB_GPU_ID,0x0000000f ,0x00000000 ),SOC15_REG_GOLDEN_VALUE (GC ,0 , mmPA_SC_BINNER_EVENT_CNTL_3,0x00000003 ,0x82400024 ),SOC15_REG_GOLDEN_VALUE (GC ,0 , mmPA_SC_ENHANCE,0x3fffffff ,0x00000001 ),
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 36/38 drm/amdgpu: update vega20 sdma golden settings
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Updated vega20 SDMA0 and SDMA1 golden settings.
--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 68 ++++++++++++++++++++++++++++------ 1 file changed, 57 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +57 -11
@@ -27,10 +27,10 @@#include "amdgpu_ucode.h" #include "amdgpu_trace.h" -#include "sdma0/sdma0_4_0_offset.h" -#include "sdma0/sdma0_4_0_sh_mask.h" -#include "sdma1/sdma1_4_0_offset.h" -#include "sdma1/sdma1_4_0_sh_mask.h" +#include "sdma0/sdma0_4_2_offset.h" +#include "sdma0/sdma0_4_2_sh_mask.h" +#include "sdma1/sdma1_4_2_offset.h" +#include "sdma1/sdma1_4_2_sh_mask.h" #include "hdp/hdp_4_0_offset.h" #include "sdma0/sdma0_4_1_default.h"
@@ -98,8 +98,7 @@ static const struct soc15_reg_golden golden_settings_sdma_vg12[] = {SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_GB_ADDR_CONFIG_READ,0x0018773f ,0x00104001 ) }; -static const struct soc15_reg_golden golden_settings_sdma_4_1[] = -{ +static const struct soc15_reg_golden golden_settings_sdma_4_1[] = {SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_CHICKEN_BITS,0xfe931f07 ,0x02831d07 ),SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_CLK_CTRL,0xffffffff ,0x3f000100 ),SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_GFX_IB_CNTL,0x800f0111 ,0x00000100 ),
@@ -112,26 +111,67 @@ static const struct soc15_reg_golden golden_settings_sdma_4_1[] =SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_UTCL1_PAGE,0x000003ff ,0x000003c0 ) }; -static const struct soc15_reg_golden golden_settings_sdma_4_2[] = +static const struct soc15_reg_golden golden_settings_sdma0_4_2_init[] = { +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RLC0_RB_WPTR_POLL_CNTL,0xfffffff0 ,0x00403000 ), +}; + +static const struct soc15_reg_golden golden_settings_sdma0_4_2[] = {SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_CHICKEN_BITS,0xfe931f07 ,0x02831d07 ),SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_CLK_CTRL,0xffffffff ,0x3f000100 ),SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_GB_ADDR_CONFIG,0x0000773f ,0x00004002 ),SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_GFX_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ),SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_GFX_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_PAGE_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ),SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_PAGE_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RD_BURST_CNTL,0x0000000f ,0x00000003 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RLC0_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ),SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RLC0_RB_WPTR_POLL_CNTL,0xfffffff0 ,0x00403000 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RLC1_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ),SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RLC1_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RLC2_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RLC2_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RLC3_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RLC3_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RLC4_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RLC4_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RLC5_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RLC5_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RLC6_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RLC6_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RLC7_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RLC7_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ),SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_UTCL1_PAGE,0x000003ff ,0x000003c0 ), +}; + +static const struct soc15_reg_golden golden_settings_sdma1_4_2[] = {SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_CHICKEN_BITS,0xfe931f07 ,0x02831d07 ),SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_CLK_CTRL,0xffffffff ,0x3f000100 ),SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_GB_ADDR_CONFIG,0x0000773f ,0x00004002 ),SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_GFX_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ),SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_GFX_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_PAGE_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ),SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_PAGE_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ), -SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RLC0_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RD_BURST_CNTL,0x0000000f ,0x00000003 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RLC0_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RLC0_RB_WPTR_POLL_CNTL,0xfffffff0 ,0x00403000 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RLC1_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ),SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RLC1_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ), -SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_UTCL1_PAGE,0x000003ff ,0x000003c0 ) +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RLC2_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RLC2_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RLC3_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RLC3_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RLC4_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RLC4_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RLC5_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RLC5_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RLC6_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RLC6_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RLC7_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RLC7_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_UTCL1_PAGE,0x000003ff ,0x000003c0 ), }; static const struct soc15_reg_golden golden_settings_sdma_rv1[] =
@@ -168,8 +208,14 @@ static void sdma_v4_0_init_golden_registers(struct amdgpu_device *adev)break ;case CHIP_VEGA20 :soc15_program_register_sequence (adev, - golden_settings_sdma_4_2, -ARRAY_SIZE (golden_settings_sdma_4_2)); + golden_settings_sdma0_4_2_init, +ARRAY_SIZE (golden_settings_sdma0_4_2_init)); +soc15_program_register_sequence (adev, + golden_settings_sdma0_4_2, +ARRAY_SIZE (golden_settings_sdma0_4_2)); +soc15_program_register_sequence (adev, + golden_settings_sdma1_4_2, +ARRAY_SIZE (golden_settings_sdma1_4_2));break ;case CHIP_RAVEN : soc15_program_register_sequence(adev,
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 37/38 drm/amdgpu/psp: Enlarge PSP TMR SIZE from 3M to 4M.
In reply to a message not in the archiveFrom: Feifei Xu <[email protected]>
Enlarge the PSP TMR SIZE to 4M for dual UVD fw front-door loading.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 6 ++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -2
@@ -163,7 +163,7 @@ static int psp_tmr_init(struct psp_context *psp)* Note: this memory need be reserved till the driver * uninitializes. */ - ret =amdgpu_bo_create_kernel (psp->adev,0x300000 ,0x100000 , + ret =amdgpu_bo_create_kernel (psp->adev,PSP_TMR_SIZE ,0x100000 ,AMDGPU_GEM_DOMAIN_VRAM , &psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf);
@@ -179,7 +179,9 @@ static int psp_tmr_load(struct psp_context *psp)if (!cmd)return -ENOMEM ; -psp_prep_tmr_cmd_buf (cmd, psp->tmr_mc_addr,0x300000 ); +psp_prep_tmr_cmd_buf (cmd, psp->tmr_mc_addr,PSP_TMR_SIZE ); +DRM_INFO ("reserve 0x%x from 0x%llx for PSP TMR SIZE\n" , +PSP_TMR_SIZE , psp->tmr_mc_addr); ret =psp_cmd_submit_buf (psp,NULL , cmd, psp->fence_buf_mc_addr,1 );
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +1 -0
@@ -32,6 +32,7 @@#define PSP_CMD_BUFFER_SIZE 0x1000#define PSP_ASD_SHARED_MEM_SIZE 0x4000#define PSP_1_MEG 0x100000 +#define PSP_TMR_SIZE 0x400000struct psp_context ;
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 38/38 drm/amdgpu: remove experimental flag for vega20
In reply to a message not in the archiveNow that PSP and SMU support is in place.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +6 -6
@@ -770,12 +770,12 @@ static const struct pci_device_id pciidlist[] = { {0x1002, 0x69A3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA12}, {0x1002, 0x69AF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA12},/* Vega 20 */ - {0x1002, 0x66A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20|AMD_EXP_HW_SUPPORT}, - {0x1002, 0x66A1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20|AMD_EXP_HW_SUPPORT}, - {0x1002, 0x66A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20|AMD_EXP_HW_SUPPORT}, - {0x1002, 0x66A3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20|AMD_EXP_HW_SUPPORT}, - {0x1002, 0x66A7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20|AMD_EXP_HW_SUPPORT}, - {0x1002, 0x66AF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20|AMD_EXP_HW_SUPPORT}, + {0x1002, 0x66A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20}, + {0x1002, 0x66A1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20}, + {0x1002, 0x66A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20}, + {0x1002, 0x66A3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20}, + {0x1002, 0x66A7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20}, + {0x1002, 0x66AF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20},/* Raven */ {0x1002, 0x15dd, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RAVEN|AMD_IS_APU},
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx