Unified entry point for other blocks to interact with power
Subsystems (5)
v5 cover Unified entry point for other blocks to interact with power
There are several problems with current power implementations:
1. Too many internal details are exposed to other blocks. Thus to interact with power, they need to know which power framework is used(powerplay vs swsmu) or even whether some API is implemented.
2. A lot of cross callings exist which make it hard to get a whole picture of the code hierarchy. And that makes any code change/increment error-prone.
3. Many different types of lock are used. It is calculated there is totally 13 different locks are used within power. Some of them are even designed for the same purpose.
To ease the problems above, this patch series try to
1. provide unified entry point for other blocks to interact with power.
2. relocate some source code piece/headers to avoid cross callings.
3. enforce a unified lock protection on those entry point APIs above. That makes the future optimization for unnecessary power locks possible.
Evan Quan (16):
drm/amd/pm: do not expose implementation details to other blocks out
of power
drm/amd/pm: do not expose power implementation details to amdgpu_pm.c drm/amd/pm: do not expose power implementation details to display drm/amd/pm: do not expose those APIs used internally only in
amdgpu_dpm.c
drm/amd/pm: do not expose those APIs used internally only in si_dpm.c drm/amd/pm: do not expose the API used internally only in kv_dpm.c drm/amd/pm: create a new holder for those APIs used only by legacy
ASICs(si/kv)
drm/amd/pm: move pp_force_state_enabled member to amdgpu_pm structure drm/amd/pm: optimize the amdgpu_pm_compute_clocks() implementations drm/amd/pm: move those code piece used by Stoney only to smu8_hwmgr.c drm/amd/pm: drop redundant or unused APIs and data structures drm/amd/pm: do not expose the smu_context structure used internally in
power
drm/amd/pm: relocate the power related headers
drm/amd/pm: drop unnecessary gfxoff controls
drm/amd/pm: revise the performance level setting APIs drm/amd/pm: unified lock protections in amdgpu_dpm.c
drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 7 -
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 25 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 18 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 7 -
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 5 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 5 +-
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +-
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +-
drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 2 +-
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +-
.../amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 248 +-
drivers/gpu/drm/amd/include/amd_shared.h | 2 -
.../gpu/drm/amd/include/kgd_pp_interface.h | 8 +
drivers/gpu/drm/amd/pm/Makefile | 14 +-
drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2467 ++++++++---------
drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c | 94 +
drivers/gpu/drm/amd/pm/amdgpu_pm.c | 552 ++--
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 341 +--
.../gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h | 32 +
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile | 32 +
.../pm/{powerplay => legacy-dpm}/cik_dpm.h | 0
.../amd/pm/{powerplay => legacy-dpm}/kv_dpm.c | 47 +-
.../amd/pm/{powerplay => legacy-dpm}/kv_dpm.h | 0
.../amd/pm/{powerplay => legacy-dpm}/kv_smc.c | 0
.../gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 1081 ++++++++
.../gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h | 38 +
.../amd/pm/{powerplay => legacy-dpm}/ppsmc.h | 0
.../pm/{powerplay => legacy-dpm}/r600_dpm.h | 0
.../amd/pm/{powerplay => legacy-dpm}/si_dpm.c | 163 +-
.../amd/pm/{powerplay => legacy-dpm}/si_dpm.h | 15 +-
.../amd/pm/{powerplay => legacy-dpm}/si_smc.c | 0
.../{powerplay => legacy-dpm}/sislands_smc.h | 0
drivers/gpu/drm/amd/pm/powerplay/Makefile | 4 -
.../gpu/drm/amd/pm/powerplay/amd_powerplay.c | 51 +-
.../drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 10 +-
.../pm/{ => powerplay}/inc/amd_powerplay.h | 0
.../drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h | 0
.../amd/pm/{ => powerplay}/inc/fiji_ppsmc.h | 0
.../pm/{ => powerplay}/inc/hardwaremanager.h | 0
.../drm/amd/pm/{ => powerplay}/inc/hwmgr.h | 3 -
.../{ => powerplay}/inc/polaris10_pwrvirus.h | 0
.../amd/pm/{ => powerplay}/inc/power_state.h | 0
.../drm/amd/pm/{ => powerplay}/inc/pp_debug.h | 0
.../amd/pm/{ => powerplay}/inc/pp_endian.h | 0
.../amd/pm/{ => powerplay}/inc/pp_thermal.h | 0
.../amd/pm/{ => powerplay}/inc/ppinterrupt.h | 0
.../drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h | 0
.../drm/amd/pm/{ => powerplay}/inc/smu10.h | 0
.../pm/{ => powerplay}/inc/smu10_driver_if.h | 0
.../pm/{ => powerplay}/inc/smu11_driver_if.h | 0
.../gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h | 0
.../drm/amd/pm/{ => powerplay}/inc/smu71.h | 0
.../pm/{ => powerplay}/inc/smu71_discrete.h | 0
.../drm/amd/pm/{ => powerplay}/inc/smu72.h | 0
.../pm/{ => powerplay}/inc/smu72_discrete.h | 0
.../drm/amd/pm/{ => powerplay}/inc/smu73.h | 0
.../pm/{ => powerplay}/inc/smu73_discrete.h | 0
.../drm/amd/pm/{ => powerplay}/inc/smu74.h | 0
.../pm/{ => powerplay}/inc/smu74_discrete.h | 0
.../drm/amd/pm/{ => powerplay}/inc/smu75.h | 0
.../pm/{ => powerplay}/inc/smu75_discrete.h | 0
.../amd/pm/{ => powerplay}/inc/smu7_common.h | 0
.../pm/{ => powerplay}/inc/smu7_discrete.h | 0
.../amd/pm/{ => powerplay}/inc/smu7_fusion.h | 0
.../amd/pm/{ => powerplay}/inc/smu7_ppsmc.h | 0
.../gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h | 0
.../amd/pm/{ => powerplay}/inc/smu8_fusion.h | 0
.../gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h | 0
.../pm/{ => powerplay}/inc/smu9_driver_if.h | 0
.../{ => powerplay}/inc/smu_ucode_xfer_cz.h | 0
.../{ => powerplay}/inc/smu_ucode_xfer_vi.h | 0
.../drm/amd/pm/{ => powerplay}/inc/smumgr.h | 0
.../amd/pm/{ => powerplay}/inc/tonga_ppsmc.h | 0
.../amd/pm/{ => powerplay}/inc/vega10_ppsmc.h | 0
.../inc/vega12/smu9_driver_if.h | 0
.../amd/pm/{ => powerplay}/inc/vega12_ppsmc.h | 0
.../amd/pm/{ => powerplay}/inc/vega20_ppsmc.h | 0
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 94 +-
.../drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h | 16 +-
.../inc/interface}/smu11_driver_if_arcturus.h | 0
.../smu11_driver_if_cyan_skillfish.h | 0
.../inc/interface}/smu11_driver_if_navi10.h | 0
.../smu11_driver_if_sienna_cichlid.h | 0
.../inc/interface}/smu11_driver_if_vangogh.h | 0
.../inc/interface}/smu12_driver_if.h | 0
.../interface}/smu13_driver_if_aldebaran.h | 0
.../interface}/smu13_driver_if_yellow_carp.h | 0
.../inc/interface}/smu_v11_5_pmfw.h | 0
.../inc/interface}/smu_v11_8_pmfw.h | 0
.../inc/interface}/smu_v13_0_1_pmfw.h | 0
.../inc/message}/aldebaran_ppsmc.h | 0
.../inc/message}/arcturus_ppsmc.h | 0
.../inc/message}/smu_v11_0_7_ppsmc.h | 0
.../inc/message}/smu_v11_0_ppsmc.h | 0
.../inc/message}/smu_v11_5_ppsmc.h | 0
.../inc/message}/smu_v11_8_ppsmc.h | 0
.../inc/message}/smu_v12_0_ppsmc.h | 0
.../inc/message}/smu_v13_0_1_ppsmc.h | 0
.../pm/{ => swsmu}/inc/smu_11_0_cdr_table.h | 0
.../drm/amd/pm/{ => swsmu}/inc/smu_types.h | 0
.../drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h | 0
.../pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h | 0
.../pm/{ => swsmu}/inc/smu_v11_0_pptable.h | 0
.../drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h | 0
.../drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h | 0
.../pm/{ => swsmu}/inc/smu_v13_0_pptable.h | 0
.../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 10 +-
.../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 9 +-
.../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 34 +-
.../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 11 +-
.../drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 10 +-
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 15 +-
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 4 +
117 files changed, 3232 insertions(+), 2264 deletions(-)
create mode 100644 drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c
create mode 100644 drivers/gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h
create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/Makefile
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/cik_dpm.h (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.c (99%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.h (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_smc.c (100%)
create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c
create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/r600_dpm.h (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.c (98%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.h (99%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_smc.c (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/sislands_smc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/amd_powerplay.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/fiji_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/hardwaremanager.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/hwmgr.h (99%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/polaris10_pwrvirus.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/power_state.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_debug.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_endian.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_thermal.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/ppinterrupt.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu10.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu10_driver_if.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu11_driver_if.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71_discrete.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72_discrete.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73_discrete.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74_discrete.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75_discrete.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_common.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_discrete.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_fusion.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8_fusion.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9_driver_if.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu_ucode_xfer_cz.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu_ucode_xfer_vi.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smumgr.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/tonga_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega10_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega12/smu9_driver_if.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega12_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega20_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h (98%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu11_driver_if_arcturus.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu11_driver_if_cyan_skillfish.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu11_driver_if_navi10.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu11_driver_if_sienna_cichlid.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu11_driver_if_vangogh.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu12_driver_if.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu13_driver_if_aldebaran.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu13_driver_if_yellow_carp.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu_v11_5_pmfw.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu_v11_8_pmfw.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu_v13_0_1_pmfw.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/aldebaran_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/arcturus_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/smu_v11_0_7_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/smu_v11_0_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/smu_v11_5_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/smu_v11_8_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/smu_v12_0_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/smu_v13_0_1_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_11_0_cdr_table.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_types.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0_pptable.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0_pptable.h (100%)Signature · 1 line
2.29.0
PATCH v5 1/16 drm/amd/pm: do not expose implementation details to other blocks out of power
Those implementation details(whether swsmu supported, some ppt_funcs supported, accessing internal statistics ...)should be kept internally. It's not a good practice and even error prone to expose implementation details.
--- drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 25 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 18 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 7 -- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 5 +- drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 2 +- .../gpu/drm/amd/include/kgd_pp_interface.h | 4 + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 90 +++++++++++++++++++ drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 25 +++++- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 11 +-- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 26 +++--- 13 files changed, 161 insertions(+), 65 deletions(-)
drivers/gpu/drm/amd/amdgpu/aldebaran.c +1 -1
@@ -260,7 +260,7 @@ static int aldebaran_mode2_restore_ip(struct amdgpu_device *adev) adev->gfx.rlc.funcs->resume (adev);/* Wait for FW reset event complete */ - r =smu_wait_for_event (adev,SMU_EVENT_RESET_COMPLETE ,0 ); + r =amdgpu_dpm_wait_for_event (adev,SMU_EVENT_RESET_COMPLETE ,0 );if (r) {dev_err (adev->dev,"Failed to get response from firmware after reset\n" );
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +14 -11
@@ -1585,22 +1585,25 @@ static int amdgpu_debugfs_sclk_set(void *data, u64 val)return ret; } -if (is_support_sw_smu (adev)) { - ret =smu_get_dpm_freq_range (&adev->smu,SMU_SCLK , &min_freq, &max_freq); -if (ret || val > max_freq || val < min_freq) -return -EINVAL ; - ret =smu_set_soft_freq_range (&adev->smu,SMU_SCLK , (uint32_t )val, (uint32_t )val); - }else { -return 0 ; + ret =amdgpu_dpm_get_dpm_freq_range (adev,PP_SCLK , &min_freq, &max_freq); +if (ret == -EOPNOTSUPP ) { + ret =0 ; + goto out; } +if (ret || val > max_freq || val < min_freq) { + ret = -EINVAL ; + goto out; + } + + ret =amdgpu_dpm_set_soft_freq_range (adev,PP_SCLK , (uint32_t )val, (uint32_t )val); +if (ret) + ret = -EINVAL ; +out:pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); -if (ret) -return -EINVAL ; - -return 0 ; +return ret; } DEFINE_DEBUGFS_ATTRIBUTE(fops_ib_preempt, NULL,
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -3
@@ -2618,7 +2618,7 @@ static int amdgpu_device_ip_late_init(struct amdgpu_device *adev)if (adev->asic_type ==CHIP_ARCTURUS &&amdgpu_passthrough (adev) && adev->gmc.xgmi.num_physical_nodes >1 ) -smu_set_light_sbr (&adev->smu, true); +amdgpu_dpm_set_light_sbr (adev, true);if (adev->gmc.xgmi.num_physical_nodes >1 ) {mutex_lock (&mgpu_info.mutex);
@@ -2875,7 +2875,7 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev)int i, r;if (adev->in_s0ix) -amdgpu_gfx_state_change_set (adev, sGpuChangeState_D3Entry); +amdgpu_dpm_gfx_state_change (adev, sGpuChangeState_D3Entry);for (i = adev->num_ip_blocks -1 ; i >=0 ; i--) {if (!adev->ip_blocks[i].status.valid)
@@ -4018,7 +4018,7 @@ int amdgpu_device_resume(struct drm_device *dev, bool fbcon)return 0 ;if (adev->in_s0ix) -amdgpu_gfx_state_change_set (adev, sGpuChangeState_D0Entry); +amdgpu_dpm_gfx_state_change (adev, sGpuChangeState_D0Entry);/* post card */ if (amdgpu_device_need_post (adev)) {
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +1 -17
@@ -615,7 +615,7 @@ int amdgpu_get_gfx_off_status(struct amdgpu_device *adev, uint32_t *value)mutex_lock (&adev->gfx.gfx_off_mutex); - r =smu_get_status_gfxoff (adev, value); + r =amdgpu_dpm_get_status_gfxoff (adev, value);mutex_unlock (&adev->gfx.gfx_off_mutex);
@@ -852,19 +852,3 @@ int amdgpu_gfx_get_num_kcq(struct amdgpu_device *adev) }return amdgpu_num_kcq; } - -/* amdgpu_gfx_state_change_set - Handle gfx power state change set -* @adev: amdgpu_device pointer -* @state: gfx power state(1 -sGpuChangeState_D0Entry and 2 -sGpuChangeState_D3Entry) -* -*/ - -void amdgpu_gfx_state_change_set (struct amdgpu_device *adev,enum gfx_change_state state) -{ -mutex_lock (&adev->pm.mutex); -if (adev->powerplay.pp_funcs && - adev->powerplay.pp_funcs->gfx_state_change_set) - ((adev)->powerplay.pp_funcs->gfx_state_change_set ( - (adev)->powerplay.pp_handle, state)); -mutex_unlock (&adev->pm.mutex); -}
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +0 -7
@@ -47,12 +47,6 @@ enum amdgpu_gfx_pipe_priority { AMDGPU_GFX_PIPE_PRIO_HIGH = AMDGPU_RING_PRIO_2 }; -/* Argument for PPSMC_MSG_GpuChangeState */ -enum gfx_change_state { - sGpuChangeState_D0Entry =1 , - sGpuChangeState_D3Entry, -}; -#define AMDGPU_GFX_QUEUE_PRIORITY_MINIMUM 0#define AMDGPU_GFX_QUEUE_PRIORITY_MAXIMUM 15
@@ -410,5 +404,4 @@ int amdgpu_gfx_cp_ecc_error_irq(struct amdgpu_device *adev,uint32_t amdgpu_kiq_rreg (struct amdgpu_device *adev,uint32_t reg);void amdgpu_kiq_wreg (struct amdgpu_device *adev,uint32_t reg,uint32_t v);int amdgpu_gfx_get_num_kcq (struct amdgpu_device *adev); -void amdgpu_gfx_state_change_set (struct amdgpu_device *adev,enum gfx_change_state state);#endif
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +2 -3
@@ -901,7 +901,7 @@ static void amdgpu_ras_get_ecc_info(struct amdgpu_device *adev, struct ras_err_d* choosing right query method according to * whether smu support query error information */ - ret =smu_get_ecc_info (&adev->smu, (void *)&(ras->umc_ecc)); + ret =amdgpu_dpm_get_ecc_info (adev, (void *)&(ras->umc_ecc));if (ret == -EOPNOTSUPP ) {if (adev->umc.ras_funcs && adev->umc.ras_funcs->query_ras_error_count)
@@ -2142,8 +2142,7 @@ int amdgpu_ras_recovery_init(struct amdgpu_device *adev)if (ret) goto free; -if (adev->smu.ppt_funcs && adev->smu.ppt_funcs->send_hbm_bad_pages_num) - adev->smu.ppt_funcs->send_hbm_bad_pages_num (&adev->smu, con->eeprom_control.ras_num_recs); +amdgpu_dpm_send_hbm_bad_pages_num (adev, con->eeprom_control.ras_num_recs); }#ifdef CONFIG_X86_MCE_AMD
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c +2 -3
@@ -97,7 +97,7 @@ int amdgpu_umc_process_ras_data_cb(struct amdgpu_device *adev,int ret =0 ;kgd2kfd_set_sram_ecc_flag (adev->kfd.dev); - ret =smu_get_ecc_info (&adev->smu, (void *)&(con->umc_ecc)); + ret =amdgpu_dpm_get_ecc_info (adev, (void *)&(con->umc_ecc));if (ret == -EOPNOTSUPP ) {if (adev->umc.ras_funcs && adev->umc.ras_funcs->query_ras_error_count)
@@ -160,8 +160,7 @@ int amdgpu_umc_process_ras_data_cb(struct amdgpu_device *adev, err_data->err_addr_cnt);amdgpu_ras_save_bad_pages (adev); -if (adev->smu.ppt_funcs && adev->smu.ppt_funcs->send_hbm_bad_pages_num) - adev->smu.ppt_funcs->send_hbm_bad_pages_num (&adev->smu, con->eeprom_control.ras_num_recs); +amdgpu_dpm_send_hbm_bad_pages_num (adev, con->eeprom_control.ras_num_recs); }amdgpu_ras_reset_gpu (adev);
drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c +1 -1
@@ -222,7 +222,7 @@ void kfd_smi_event_update_thermal_throttling(struct kfd_dev *dev, len =snprintf (fifo_in,sizeof (fifo_in),"%x %llx:%llx\n" ,KFD_SMI_EVENT_THERMAL_THROTTLE , throttle_bitmask, -atomic64_read (&dev->adev->smu.throttle_int_counter)); +amdgpu_dpm_get_thermal_throttling_counter (dev->adev));add_event_to_kfifo (dev,KFD_SMI_EVENT_THERMAL_THROTTLE , fifo_in, len); }
drivers/gpu/drm/amd/include/kgd_pp_interface.h +4 -0
@@ -26,6 +26,10 @@extern const struct amdgpu_ip_block_version pp_smu_ip_block; +enum smu_event_type { +SMU_EVENT_RESET_COMPLETE =0 , +}; +struct amd_vce_state {/* vce clocks */ u32 evclk;
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +90 -0
93 lines not on this page · raw message
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h +24 -1
@@ -23,6 +23,12 @@#ifndef __AMDGPU_DPM_H__#define __AMDGPU_DPM_H__ +/* Argument for PPSMC_MSG_GpuChangeState */ +enum gfx_change_state { + sGpuChangeState_D0Entry =1 , + sGpuChangeState_D3Entry, +}; +enum amdgpu_int_thermal_type {THERMAL_TYPE_NONE , THERMAL_TYPE_EXTERNAL,
@@ -574,5 +580,22 @@ void amdgpu_dpm_enable_vce(struct amdgpu_device *adev, bool enable);void amdgpu_dpm_enable_jpeg (struct amdgpu_device *adev,bool enable);void amdgpu_pm_print_power_states (struct amdgpu_device *adev);int amdgpu_pm_load_smu_firmware (struct amdgpu_device *adev,uint32_t *smu_version); - +int amdgpu_dpm_set_light_sbr (struct amdgpu_device *adev,bool enable); +int amdgpu_dpm_send_hbm_bad_pages_num (struct amdgpu_device *adev,uint32_t size); +int amdgpu_dpm_get_dpm_freq_range (struct amdgpu_device *adev, +enum pp_clock_type type, +uint32_t *min, +uint32_t *max); +int amdgpu_dpm_set_soft_freq_range (struct amdgpu_device *adev, +enum pp_clock_type type, +uint32_t min, +uint32_t max); +int amdgpu_dpm_wait_for_event (struct amdgpu_device *adev,enum smu_event_type event, +uint64_t event_arg); +int amdgpu_dpm_get_status_gfxoff (struct amdgpu_device *adev,uint32_t *value); +uint64_t amdgpu_dpm_get_thermal_throttling_counter (struct amdgpu_device *adev); +void amdgpu_dpm_gfx_state_change (struct amdgpu_device *adev, +enum gfx_change_state state); +int amdgpu_dpm_get_ecc_info (struct amdgpu_device *adev, +void *umc_ecc);#endif
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +3 -8
@@ -241,11 +241,6 @@ struct smu_user_dpm_profile {uint32_t clk_dependency; }; -enum smu_event_type { - -SMU_EVENT_RESET_COMPLETE =0 , -}; -#define SMU_TABLE_INIT (tables, table_id, s, a, d) \ do { \ tables[table_id].size = s; \
@@ -1413,15 +1408,15 @@ int smu_set_ac_dc(struct smu_context *smu);int smu_allow_xgmi_power_down (struct smu_context *smu,bool en); -int smu_get_status_gfxoff (struct amdgpu_device *adev,uint32_t *value); +int smu_get_status_gfxoff (struct smu_context *smu,uint32_t *value);int smu_set_light_sbr (struct smu_context *smu,bool enable); -int smu_wait_for_event (struct amdgpu_device *adev,enum smu_event_type event, +int smu_wait_for_event (struct smu_context *smu,enum smu_event_type event,uint64_t event_arg);int smu_get_ecc_info (struct smu_context *smu,void *umc_ecc);int smu_stb_collect_info (struct smu_context *smu,void *buff,uint32_t size);void amdgpu_smu_stb_debug_fs_init (struct amdgpu_device *adev); - +int smu_send_hbm_bad_pages_num (struct smu_context *smu,uint32_t size);#endif #endif
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +16 -10
@@ -100,17 +100,14 @@ static int smu_sys_set_pp_feature_mask(void *handle,return ret; } -int smu_get_status_gfxoff (struct amdgpu_device *adev,uint32_t *value) +int smu_get_status_gfxoff (struct smu_context *smu,uint32_t *value) { -int ret =0 ; -struct smu_context *smu = &adev->smu; +if (!smu->ppt_funcs->get_gfx_off_status) +return -EINVAL ; -if (is_support_sw_smu (adev) && smu->ppt_funcs->get_gfx_off_status) - *value =smu_get_gfx_off_status (smu); -else - ret = -EINVAL ; + *value =smu_get_gfx_off_status (smu); -return ret; +return 0 ; } int smu_set_soft_freq_range(struct smu_context *smu,
@@ -3162,11 +3159,10 @@ static const struct amd_pm_funcs swsmu_pm_funcs = { .get_smu_prv_buf_details = smu_get_prv_buffer_details, }; -int smu_wait_for_event (struct amdgpu_device *adev,enum smu_event_type event, +int smu_wait_for_event (struct smu_context *smu,enum smu_event_type event,uint64_t event_arg) {int ret = -EINVAL ; -struct smu_context *smu = &adev->smu;if (smu->ppt_funcs->wait_for_event) {mutex_lock (&smu->mutex);
@@ -3280,3 +3276,13 @@ void amdgpu_smu_stb_debug_fs_init(struct amdgpu_device *adev)#endif } + +int smu_send_hbm_bad_pages_num (struct smu_context *smu,uint32_t size) +{ +int ret =0 ; + +if (smu->ppt_funcs && smu->ppt_funcs->send_hbm_bad_pages_num) + ret = smu->ppt_funcs->send_hbm_bad_pages_num (smu, size); + +return ret; +}
Signature · 1 line
2.29.0
PATCH v5 2/16 drm/amd/pm: do not expose power implementation details to amdgpu_pm.c
In reply to Evan Quanamdgpu_pm.c holds all the user sysfs/hwmon interfaces. It's another client of our power APIs. It's not proper to spike into power implementation details there.
--v1->v2:
- drop unneeded "return;" in amdgpu_dpm_get_current_power_state(Guchun)v2->v3:
- undo those unintentional changes(Lijo)v3->v4:
- fix the return value on !pp_funcs->set_sclk_od and !pp_funcs->set_mclk_od(Lijo)
--- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 461 ++++++++++++++++++- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 519 ++++++++-------------- drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 160 +++---- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 3 - 4 files changed, 712 insertions(+), 431 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +460 -1
@@ -1453,7 +1453,9 @@ static void amdgpu_dpm_change_power_state_locked(struct amdgpu_device *adev)if (equal)return ; -amdgpu_dpm_set_power_state (adev); +if (adev->powerplay.pp_funcs->set_power_state) + adev->powerplay.pp_funcs->set_power_state (adev->powerplay.pp_handle); +amdgpu_dpm_post_set_power_state (adev); adev->pm.dpm.current_active_crtcs = adev->pm.dpm.new_active_crtcs;
@@ -1704,3 +1706,460 @@ int amdgpu_dpm_get_ecc_info(struct amdgpu_device *adev,return smu_get_ecc_info (&adev->smu, umc_ecc); } + +struct amd_vce_state *amdgpu_dpm_get_vce_clock_state (struct amdgpu_device *adev, +uint32_t idx) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->get_vce_clock_state) +return NULL ; + +return pp_funcs->get_vce_clock_state (adev->powerplay.pp_handle, + idx); +} + +void amdgpu_dpm_get_current_power_state (struct amdgpu_device *adev, +enum amd_pm_state_type *state) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->get_current_power_state) { + *state = adev->pm.dpm.user_state; +return ; + } + + *state = pp_funcs->get_current_power_state (adev->powerplay.pp_handle); +if (*state <POWER_STATE_TYPE_DEFAULT || + *state >POWER_STATE_TYPE_INTERNAL_3DPERF ) + *state = adev->pm.dpm.user_state; +} + +void amdgpu_dpm_set_power_state (struct amdgpu_device *adev, +enum amd_pm_state_type state) +{ + adev->pm.dpm.user_state = state; + +if (is_support_sw_smu (adev)) +return ; + +if (amdgpu_dpm_dispatch_task (adev, +AMD_PP_TASK_ENABLE_USER_STATE , + &state) == -EOPNOTSUPP ) +amdgpu_pm_compute_clocks (adev); +} + +enum amd_dpm_forced_level amdgpu_dpm_get_performance_level (struct amdgpu_device *adev) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +enum amd_dpm_forced_level level; + +if (pp_funcs->get_performance_level) + level = pp_funcs->get_performance_level (adev->powerplay.pp_handle); +else + level = adev->pm.dpm.forced_level; + +return level; +} + +int amdgpu_dpm_force_performance_level (struct amdgpu_device *adev, +enum amd_dpm_forced_level level) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (pp_funcs->force_performance_level) { +if (adev->pm.dpm.thermal_active) +return -EINVAL ; + +if (pp_funcs->force_performance_level (adev->powerplay.pp_handle, + level)) +return -EINVAL ; + + adev->pm.dpm.forced_level = level; + } + +return 0 ; +} + +int amdgpu_dpm_get_pp_num_states (struct amdgpu_device *adev, +struct pp_states_info *states) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->get_pp_num_states) +return -EOPNOTSUPP ; + +return pp_funcs->get_pp_num_states (adev->powerplay.pp_handle, states); +} + +int amdgpu_dpm_dispatch_task (struct amdgpu_device *adev, +enum amd_pp_task task_id, +enum amd_pm_state_type *user_state) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->dispatch_tasks) +return -EOPNOTSUPP ; + +return pp_funcs->dispatch_tasks (adev->powerplay.pp_handle, task_id, user_state); +} + +int amdgpu_dpm_get_pp_table (struct amdgpu_device *adev,char **table) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->get_pp_table) +return 0 ; + +return pp_funcs->get_pp_table (adev->powerplay.pp_handle, table); +} + +int amdgpu_dpm_set_fine_grain_clk_vol (struct amdgpu_device *adev, +uint32_t type, +long *input, +uint32_t size) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->set_fine_grain_clk_vol) +return 0 ; + +return pp_funcs->set_fine_grain_clk_vol (adev->powerplay.pp_handle, + type, + input, + size); +} + +int amdgpu_dpm_odn_edit_dpm_table (struct amdgpu_device *adev, +uint32_t type, +long *input, +uint32_t size) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->odn_edit_dpm_table) +return 0 ; + +return pp_funcs->odn_edit_dpm_table (adev->powerplay.pp_handle, + type, + input, + size); +} + +int amdgpu_dpm_print_clock_levels (struct amdgpu_device *adev, +enum pp_clock_type type, +char *buf) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->print_clock_levels) +return 0 ; + +return pp_funcs->print_clock_levels (adev->powerplay.pp_handle, + type, + buf); +} + +int amdgpu_dpm_set_ppfeature_status (struct amdgpu_device *adev, +uint64_t ppfeature_masks) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->set_ppfeature_status) +return 0 ; + +return pp_funcs->set_ppfeature_status (adev->powerplay.pp_handle, + ppfeature_masks); +} + +int amdgpu_dpm_get_ppfeature_status (struct amdgpu_device *adev,char *buf) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->get_ppfeature_status) +return 0 ; + +return pp_funcs->get_ppfeature_status (adev->powerplay.pp_handle, + buf); +} + +int amdgpu_dpm_force_clock_level (struct amdgpu_device *adev, +enum pp_clock_type type, +uint32_t mask) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->force_clock_level) +return 0 ; + +return pp_funcs->force_clock_level (adev->powerplay.pp_handle, + type, + mask); +} + +int amdgpu_dpm_get_sclk_od (struct amdgpu_device *adev) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->get_sclk_od) +return 0 ; + +return pp_funcs->get_sclk_od (adev->powerplay.pp_handle); +} + +int amdgpu_dpm_set_sclk_od (struct amdgpu_device *adev,uint32_t value) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (is_support_sw_smu (adev)) +return 0 ; + +if (pp_funcs->set_sclk_od) + pp_funcs->set_sclk_od (adev->powerplay.pp_handle, value); + +if (amdgpu_dpm_dispatch_task (adev, +AMD_PP_TASK_READJUST_POWER_STATE , +NULL ) == -EOPNOTSUPP ) { + adev->pm.dpm.current_ps = adev->pm.dpm.boot_ps; +amdgpu_pm_compute_clocks (adev); + } + +return 0 ; +} + +int amdgpu_dpm_get_mclk_od (struct amdgpu_device *adev) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->get_mclk_od) +return 0 ; + +return pp_funcs->get_mclk_od (adev->powerplay.pp_handle); +} + +int amdgpu_dpm_set_mclk_od (struct amdgpu_device *adev,uint32_t value) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (is_support_sw_smu (adev)) +return 0 ; + +if (pp_funcs->set_mclk_od) + pp_funcs->set_mclk_od (adev->powerplay.pp_handle, value); + +if (amdgpu_dpm_dispatch_task (adev, +AMD_PP_TASK_READJUST_POWER_STATE , +NULL ) == -EOPNOTSUPP ) { + adev->pm.dpm.current_ps = adev->pm.dpm.boot_ps; +amdgpu_pm_compute_clocks (adev); + } + +return 0 ; +} + +int amdgpu_dpm_get_power_profile_mode (struct amdgpu_device *adev, +char *buf) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->get_power_profile_mode) +return -EOPNOTSUPP ; + +return pp_funcs->get_power_profile_mode (adev->powerplay.pp_handle, + buf); +} + +int amdgpu_dpm_set_power_profile_mode (struct amdgpu_device *adev, +long *input,uint32_t size) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->set_power_profile_mode) +return 0 ; + +return pp_funcs->set_power_profile_mode (adev->powerplay.pp_handle, + input, + size); +} + +int amdgpu_dpm_get_gpu_metrics (struct amdgpu_device *adev,void **table) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->get_gpu_metrics) +return 0 ; + +return pp_funcs->get_gpu_metrics (adev->powerplay.pp_handle, table); +} + +int amdgpu_dpm_get_fan_control_mode (struct amdgpu_device *adev, +uint32_t *fan_mode) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->get_fan_control_mode) +return -EOPNOTSUPP ; + + *fan_mode = pp_funcs->get_fan_control_mode (adev->powerplay.pp_handle); + +return 0 ; +} + +int amdgpu_dpm_set_fan_speed_pwm (struct amdgpu_device *adev, +uint32_t speed) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->set_fan_speed_pwm) +return -EINVAL ; + +return pp_funcs->set_fan_speed_pwm (adev->powerplay.pp_handle, speed); +} + +int amdgpu_dpm_get_fan_speed_pwm (struct amdgpu_device *adev, +uint32_t *speed) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->get_fan_speed_pwm) +return -EINVAL ; + +return pp_funcs->get_fan_speed_pwm (adev->powerplay.pp_handle, speed); +} + +int amdgpu_dpm_get_fan_speed_rpm (struct amdgpu_device *adev, +uint32_t *speed) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->get_fan_speed_rpm) +return -EINVAL ; + +return pp_funcs->get_fan_speed_rpm (adev->powerplay.pp_handle, speed); +} + +int amdgpu_dpm_set_fan_speed_rpm (struct amdgpu_device *adev, +uint32_t speed) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->set_fan_speed_rpm) +return -EINVAL ; + +return pp_funcs->set_fan_speed_rpm (adev->powerplay.pp_handle, speed); +} + +int amdgpu_dpm_set_fan_control_mode (struct amdgpu_device *adev, +uint32_t mode) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->set_fan_control_mode) +return -EOPNOTSUPP ; + + pp_funcs->set_fan_control_mode (adev->powerplay.pp_handle, mode); + +return 0 ; +} + +int amdgpu_dpm_get_power_limit (struct amdgpu_device *adev, +uint32_t *limit, +enum pp_power_limit_level pp_limit_level, +enum pp_power_type power_type) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->get_power_limit) +return -ENODATA ; + +return pp_funcs->get_power_limit (adev->powerplay.pp_handle, + limit, + pp_limit_level, + power_type); +} + +int amdgpu_dpm_set_power_limit (struct amdgpu_device *adev, +uint32_t limit) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->set_power_limit) +return -EINVAL ; + +return pp_funcs->set_power_limit (adev->powerplay.pp_handle, limit); +} + +int amdgpu_dpm_is_cclk_dpm_supported (struct amdgpu_device *adev) +{ +if (!is_support_sw_smu (adev)) +return false; + +return is_support_cclk_dpm (adev); +} + +int amdgpu_dpm_debugfs_print_current_performance_level (struct amdgpu_device *adev, +struct seq_file *m) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->debugfs_print_current_performance_level) +return -EOPNOTSUPP ; + + pp_funcs->debugfs_print_current_performance_level (adev->powerplay.pp_handle, + m); + +return 0 ; +} + +int amdgpu_dpm_get_smu_prv_buf_details (struct amdgpu_device *adev, +void **addr, +size_t *size) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->get_smu_prv_buf_details) +return -ENOSYS ; + +return pp_funcs->get_smu_prv_buf_details (adev->powerplay.pp_handle, + addr, + size); +} + +int amdgpu_dpm_is_overdrive_supported (struct amdgpu_device *adev) +{ +struct pp_hwmgr *hwmgr = adev->powerplay.pp_handle; + +if ((is_support_sw_smu (adev) && adev->smu.od_enabled) || + (is_support_sw_smu (adev) && adev->smu.is_apu) || + (!is_support_sw_smu (adev) && hwmgr->od_enabled)) +return true; + +return false; +} + +int amdgpu_dpm_set_pp_table (struct amdgpu_device *adev, +const char *buf, +size_t size) +{ +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; + +if (!pp_funcs->set_pp_table) +return -EOPNOTSUPP ; + +return pp_funcs->set_pp_table (adev->powerplay.pp_handle, + buf, + size); +} + +int amdgpu_dpm_get_num_cpu_cores (struct amdgpu_device *adev) +{ +return adev->smu.cpu_core_num; +} + +void amdgpu_dpm_stb_debug_fs_init (struct amdgpu_device *adev) +{ +if (!is_support_sw_smu (adev)) +return ; + +amdgpu_smu_stb_debug_fs_init (adev); +}
drivers/gpu/drm/amd/pm/amdgpu_pm.c +182 -337
922 lines not on this page · raw message
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h +70 -90
183 lines not on this page · raw message
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0 -3
@@ -470,9 +470,6 @@ bool is_support_cclk_dpm(struct amdgpu_device *adev) {struct smu_context *smu = &adev->smu; -if (!is_support_sw_smu (adev)) -return false; -if (!smu_feature_is_enabled (smu,SMU_FEATURE_CCLK_DPM_BIT ))return false;
Signature · 1 line
2.29.0
PATCH v5 3/16 drm/amd/pm: do not expose power implementation details to display
In reply to Evan QuanDisplay is another client of our power APIs. It's not proper to spike into power implementation details there.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +- .../amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 246 +++++++----------- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 218 ++++++++++++++++ drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 38 +++ 4 files changed, 344 insertions(+), 164 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -5
@@ -2143,12 +2143,8 @@ static void s3_handle_mst(struct drm_device *dev, bool suspend)static int amdgpu_dm_smu_write_watermarks_table (struct amdgpu_device *adev) { -struct smu_context *smu = &adev->smu;int ret =0 ; -if (!is_support_sw_smu (adev)) -return 0 ; -/* This interface is for dGPU Navi1x.Linux dc-pplib interface depends * on window driver dc implementation. * For Navi1x, clock settings of dcn watermarks are fixed. the settings
@@ -2187,7 +2183,7 @@ static int amdgpu_dm_smu_write_watermarks_table(struct amdgpu_device *adev)return 0 ; } - ret =smu_write_watermarks_table (smu); + ret =amdgpu_dpm_write_watermarks_table (adev);if (ret) {DRM_ERROR ("Failed to update WMTABLE!\n" );return ret;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +87 -159
461 lines not on this page · raw message
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +218 -0
227 lines not on this page · raw message
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h +38 -0
@@ -500,6 +500,7 @@ int amdgpu_dpm_set_soft_freq_range(struct amdgpu_device *adev,enum pp_clock_type type, uint32_t min, uint32_t max); +int amdgpu_dpm_write_watermarks_table (struct amdgpu_device *adev);int amdgpu_dpm_wait_for_event (struct amdgpu_device *adev,enum smu_event_type event,uint64_t event_arg);int amdgpu_dpm_get_status_gfxoff (struct amdgpu_device *adev,uint32_t *value);
@@ -578,4 +579,41 @@ int amdgpu_dpm_set_pp_table(struct amdgpu_device *adev, size_t size);int amdgpu_dpm_get_num_cpu_cores (struct amdgpu_device *adev);void amdgpu_dpm_stb_debug_fs_init (struct amdgpu_device *adev); +int amdgpu_dpm_display_configuration_change (struct amdgpu_device *adev, +const struct amd_pp_display_configuration *input); +int amdgpu_dpm_get_clock_by_type (struct amdgpu_device *adev, +enum amd_pp_clock_type type, +struct amd_pp_clocks *clocks); +int amdgpu_dpm_get_display_mode_validation_clks (struct amdgpu_device *adev, +struct amd_pp_simple_clock_info *clocks); +int amdgpu_dpm_get_clock_by_type_with_latency (struct amdgpu_device *adev, +enum amd_pp_clock_type type, +struct pp_clock_levels_with_latency *clocks); +int amdgpu_dpm_get_clock_by_type_with_voltage (struct amdgpu_device *adev, +enum amd_pp_clock_type type, +struct pp_clock_levels_with_voltage *clocks); +int amdgpu_dpm_set_watermarks_for_clocks_ranges (struct amdgpu_device *adev, +void *clock_ranges); +int amdgpu_dpm_display_clock_voltage_request (struct amdgpu_device *adev, +struct pp_display_clock_request *clock); +int amdgpu_dpm_get_current_clocks (struct amdgpu_device *adev, +struct amd_pp_clock_info *clocks); +void amdgpu_dpm_notify_smu_enable_pwe (struct amdgpu_device *adev); +int amdgpu_dpm_set_active_display_count (struct amdgpu_device *adev, +uint32_t count); +int amdgpu_dpm_set_min_deep_sleep_dcefclk (struct amdgpu_device *adev, +uint32_t clock); +void amdgpu_dpm_set_hard_min_dcefclk_by_freq (struct amdgpu_device *adev, +uint32_t clock); +void amdgpu_dpm_set_hard_min_fclk_by_freq (struct amdgpu_device *adev, +uint32_t clock); +int amdgpu_dpm_display_disable_memory_clock_switch (struct amdgpu_device *adev, +bool disable_memory_clock_switch); +int amdgpu_dpm_get_max_sustainable_clocks_by_dc (struct amdgpu_device *adev, +struct pp_smu_nv_clock_table *max_clocks); +enum pp_smu_status amdgpu_dpm_get_uclk_dpm_states (struct amdgpu_device *adev, +unsigned int *clock_values_in_khz, +unsigned int *num_states); +int amdgpu_dpm_get_dpm_clock_table (struct amdgpu_device *adev, +struct dpm_clocks *clock_table);#endif
Signature · 1 line
2.29.0
PATCH v5 4/16 drm/amd/pm: do not expose those APIs used internally only in amdgpu_dpm.c
In reply to Evan QuanMove them to amdgpu_dpm.c instead.
--- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 25 +++++++++++++++++++++++-- drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 23 ----------------------- 2 files changed, 23 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +23 -2
@@ -34,6 +34,27 @@#define WIDTH_4K 3840 +#define amdgpu_dpm_pre_set_power_state (adev) \ + ((adev)->powerplay.pp_funcs->pre_set_power_state((adev)->powerplay.pp_handle)) + +#define amdgpu_dpm_post_set_power_state (adev) \ + ((adev)->powerplay.pp_funcs->post_set_power_state((adev)->powerplay.pp_handle)) + +#define amdgpu_dpm_display_configuration_changed (adev) \ + ((adev)->powerplay.pp_funcs->display_configuration_changed((adev)->powerplay.pp_handle)) + +#define amdgpu_dpm_print_power_state (adev, ps) \ + ((adev)->powerplay.pp_funcs->print_power_state((adev)->powerplay.pp_handle, (ps))) + +#define amdgpu_dpm_vblank_too_short (adev) \ + ((adev)->powerplay.pp_funcs->vblank_too_short((adev)->powerplay.pp_handle)) + +#define amdgpu_dpm_enable_bapm (adev, e) \ + ((adev)->powerplay.pp_funcs->enable_bapm((adev)->powerplay.pp_handle, (e))) + +#define amdgpu_dpm_check_state_equal (adev, cps, rps, equal) \ + ((adev)->powerplay.pp_funcs->check_state_equal((adev)->powerplay.pp_handle, (cps), (rps), (equal))) +void amdgpu_dpm_print_class_info (u32 class,u32 class2) {const char *s;
@@ -120,7 +141,7 @@ void amdgpu_dpm_print_ps_status(struct amdgpu_device *adev,pr_cont ("\n" ); } -void amdgpu_dpm_get_active_displays (struct amdgpu_device *adev) +static void amdgpu_dpm_get_active_displays (struct amdgpu_device *adev) {struct drm_device *ddev =adev_to_drm (adev);struct drm_crtc *crtc;
@@ -168,7 +189,7 @@ u32 amdgpu_dpm_get_vblank_time(struct amdgpu_device *adev)return vblank_time_us; } -u32 amdgpu_dpm_get_vrefresh (struct amdgpu_device *adev) +static u32 amdgpu_dpm_get_vrefresh (struct amdgpu_device *adev) {struct drm_device *dev =adev_to_drm (adev);struct drm_crtc *crtc;
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h +0 -23
@@ -259,27 +259,6 @@ enum amdgpu_pcie_gen { AMDGPU_PCIE_GEN_INVALID = 0xffff }; -#define amdgpu_dpm_pre_set_power_state (adev) \ - ((adev)->powerplay.pp_funcs->pre_set_power_state((adev)->powerplay.pp_handle)) - -#define amdgpu_dpm_post_set_power_state (adev) \ - ((adev)->powerplay.pp_funcs->post_set_power_state((adev)->powerplay.pp_handle)) - -#define amdgpu_dpm_display_configuration_changed (adev) \ - ((adev)->powerplay.pp_funcs->display_configuration_changed((adev)->powerplay.pp_handle)) - -#define amdgpu_dpm_print_power_state (adev, ps) \ - ((adev)->powerplay.pp_funcs->print_power_state((adev)->powerplay.pp_handle, (ps))) - -#define amdgpu_dpm_vblank_too_short (adev) \ - ((adev)->powerplay.pp_funcs->vblank_too_short((adev)->powerplay.pp_handle)) - -#define amdgpu_dpm_enable_bapm (adev, e) \ - ((adev)->powerplay.pp_funcs->enable_bapm((adev)->powerplay.pp_handle, (e))) - -#define amdgpu_dpm_check_state_equal (adev, cps, rps, equal) \ - ((adev)->powerplay.pp_funcs->check_state_equal((adev)->powerplay.pp_handle, (cps), (rps), (equal))) -#define amdgpu_dpm_reset_power_profile_state (adev, request) \ ((adev)->powerplay.pp_funcs->reset_power_profile_state(\ (adev)->powerplay.pp_handle, request))
@@ -412,8 +391,6 @@ void amdgpu_dpm_print_cap_info(u32 caps);void amdgpu_dpm_print_ps_status (struct amdgpu_device *adev,struct amdgpu_ps *rps);u32 amdgpu_dpm_get_vblank_time (struct amdgpu_device *adev); -u32 amdgpu_dpm_get_vrefresh (struct amdgpu_device *adev); -void amdgpu_dpm_get_active_displays (struct amdgpu_device *adev);int amdgpu_dpm_read_sensor (struct amdgpu_device *adev,enum amd_pp_sensors sensor,void *data,uint32_t *size);
Signature · 1 line
2.29.0
PATCH v5 5/16 drm/amd/pm: do not expose those APIs used internally only in si_dpm.c
In reply to Evan QuanMove them to si_dpm.c instead.
--v1->v2:
- rename the API with "si_" prefix(Alex)v2->v3:
- rename other data structures used only in si_dpm.c(Lijo)v3->v4:
- rename Macros used only in si_dpm.c with "SI_" prefix(Lijo)
--- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 25 ----- drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 25 ----- drivers/gpu/drm/amd/pm/powerplay/si_dpm.c | 106 +++++++++++++++------- drivers/gpu/drm/amd/pm/powerplay/si_dpm.h | 15 ++- 4 files changed, 83 insertions(+), 88 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0 -25
@@ -894,31 +894,6 @@ void amdgpu_add_thermal_controller(struct amdgpu_device *adev) } } -enum amdgpu_pcie_gen amdgpu_get_pcie_gen_support (struct amdgpu_device *adev, -u32 sys_mask, -enum amdgpu_pcie_gen asic_gen, -enum amdgpu_pcie_gen default_gen) -{ -switch (asic_gen) { -case AMDGPU_PCIE_GEN1 : -return AMDGPU_PCIE_GEN1 ; -case AMDGPU_PCIE_GEN2 : -return AMDGPU_PCIE_GEN2 ; -case AMDGPU_PCIE_GEN3 : -return AMDGPU_PCIE_GEN3 ; -default : -if ((sys_mask &CAIL_PCIE_LINK_SPEED_SUPPORT_GEN3 ) && - (default_gen ==AMDGPU_PCIE_GEN3 )) -return AMDGPU_PCIE_GEN3 ; -else if ((sys_mask &CAIL_PCIE_LINK_SPEED_SUPPORT_GEN2 ) && - (default_gen ==AMDGPU_PCIE_GEN2 )) -return AMDGPU_PCIE_GEN2 ; -else -return AMDGPU_PCIE_GEN1 ; - } -return AMDGPU_PCIE_GEN1 ; -} -struct amd_vce_state *amdgpu_get_vce_clock_state (void *handle,u32 idx) {
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h +0 -25
@@ -45,19 +45,6 @@ enum amdgpu_int_thermal_type { THERMAL_TYPE_KV, }; -enum amdgpu_dpm_auto_throttle_src { -AMDGPU_DPM_AUTO_THROTTLE_SRC_THERMAL , -AMDGPU_DPM_AUTO_THROTTLE_SRC_EXTERNAL -}; - -enum amdgpu_dpm_event_src { -AMDGPU_DPM_EVENT_SRC_ANALOG =0 , -AMDGPU_DPM_EVENT_SRC_EXTERNAL =1 , -AMDGPU_DPM_EVENT_SRC_DIGITAL =2 , -AMDGPU_DPM_EVENT_SRC_ANALOG_OR_EXTERNAL =3 , -AMDGPU_DPM_EVENT_SRC_DIGIAL_OR_EXTERNAL =4 -}; -struct amdgpu_ps {u32 caps;/* vbios flags */ u32 class;/* vbios flags */
@@ -252,13 +239,6 @@ struct amdgpu_dpm_fan {bool ucode_fan_control; }; -enum amdgpu_pcie_gen { -AMDGPU_PCIE_GEN1 =0 , -AMDGPU_PCIE_GEN2 =1 , -AMDGPU_PCIE_GEN3 =2 , -AMDGPU_PCIE_GEN_INVALID =0xffff -}; -#define amdgpu_dpm_reset_power_profile_state (adev, request) \ ((adev)->powerplay.pp_funcs->reset_power_profile_state(\ (adev)->powerplay.pp_handle, request))
@@ -403,11 +383,6 @@ void amdgpu_free_extended_power_table(struct amdgpu_device *adev);void amdgpu_add_thermal_controller (struct amdgpu_device *adev); -enum amdgpu_pcie_gen amdgpu_get_pcie_gen_support (struct amdgpu_device *adev, -u32 sys_mask, -enum amdgpu_pcie_gen asic_gen, -enum amdgpu_pcie_gen default_gen); -struct amd_vce_state *amdgpu_get_vce_clock_state (void *handle,u32 idx);
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +72 -34
212 lines not on this page · raw message
drivers/gpu/drm/amd/pm/powerplay/si_dpm.h +11 -4
@@ -595,13 +595,20 @@ struct rv7xx_power_info {RV770_SMC_STATETABLE smc_statetable; }; +enum si_pcie_gen { +PCIE_GEN1 =0 , +PCIE_GEN2 =1 , +PCIE_GEN3 =2 , +PCIE_GEN_INVALID =0xffff +}; +struct rv7xx_pl {u32 sclk;u32 mclk;u16 vddc;u16 vddci;/* eg+ only */ u32 flags; -enum amdgpu_pcie_gen pcie_gen;/* si+ only */ +enum si_pcie_gen pcie_gen;/* si+ only */ };struct rv7xx_ps {
@@ -967,9 +974,9 @@ struct si_power_info {struct si_ulv_param ulv;u32 max_cu;/* pcie gen */ -enum amdgpu_pcie_gen force_pcie_gen; -enum amdgpu_pcie_gen boot_pcie_gen; -enum amdgpu_pcie_gen acpi_pcie_gen; +enum si_pcie_gen force_pcie_gen; +enum si_pcie_gen boot_pcie_gen; +enum si_pcie_gen acpi_pcie_gen;u32 sys_pcie_mask;/* flags */ bool enable_dte;
Signature · 1 line
2.29.0
Re: [PATCH V5 05/16] drm/amd/pm: do not expose those APIs used internally only in si_dpm.c
Quoted 338 lines · Evan Quan
Move them to
si_dpm.cinstead.Signed-off-by Evan Quan <[email protected]>Change-Id I288205cfd7c6ba09cfb22626ff70360d61ff0c67--
v1->v2:
- rename the API with "si_" prefix(Alex)v2->v3:
- rename other data structures used only insi_dpm.c(Lijo)v3->v4:
- rename Macros used only insi_dpm.cwith "SI_" prefix(Lijo)--- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 25 ----- drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 25 ----- drivers/gpu/drm/amd/pm/powerplay/si_dpm.c | 106 +++++++++++++++------- drivers/gpu/drm/amd/pm/powerplay/si_dpm.h | 15 ++- 4 files changed, 83 insertions(+), 88 deletions(-)drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-25@@ -894,31 +894,6 @@ void amdgpu_add_thermal_controller(struct amdgpu_device *adev) } } -enum amdgpu_pcie_gen amdgpu_get_pcie_gen_support (struct amdgpu_device *adev, -u32 sys_mask, -enum amdgpu_pcie_gen asic_gen, -enum amdgpu_pcie_gen default_gen) -{ -switch (asic_gen) { -case AMDGPU_PCIE_GEN1 : -return AMDGPU_PCIE_GEN1 ; -case AMDGPU_PCIE_GEN2 : -return AMDGPU_PCIE_GEN2 ; -case AMDGPU_PCIE_GEN3 : -return AMDGPU_PCIE_GEN3 ; -default : -if ((sys_mask &CAIL_PCIE_LINK_SPEED_SUPPORT_GEN3 ) && - (default_gen ==AMDGPU_PCIE_GEN3 )) -return AMDGPU_PCIE_GEN3 ; -else if ((sys_mask &CAIL_PCIE_LINK_SPEED_SUPPORT_GEN2 ) && - (default_gen ==AMDGPU_PCIE_GEN2 )) -return AMDGPU_PCIE_GEN2 ; -else -return AMDGPU_PCIE_GEN1 ; - } -return AMDGPU_PCIE_GEN1 ; -} -struct amd_vce_state *amdgpu_get_vce_clock_state (void *handle,u32 idx) {drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h +0
-25@@ -45,19 +45,6 @@ enum amdgpu_int_thermal_type { THERMAL_TYPE_KV, }; -enum amdgpu_dpm_auto_throttle_src { -AMDGPU_DPM_AUTO_THROTTLE_SRC_THERMAL , -AMDGPU_DPM_AUTO_THROTTLE_SRC_EXTERNAL -}; - -enum amdgpu_dpm_event_src { -AMDGPU_DPM_EVENT_SRC_ANALOG =0 , -AMDGPU_DPM_EVENT_SRC_EXTERNAL =1 , -AMDGPU_DPM_EVENT_SRC_DIGITAL =2 , -AMDGPU_DPM_EVENT_SRC_ANALOG_OR_EXTERNAL =3 , -AMDGPU_DPM_EVENT_SRC_DIGIAL_OR_EXTERNAL =4 -}; -struct amdgpu_ps {u32 caps;/* vbios flags */ u32 class;/* vbios flags */ @@ -252,13 +239,6 @@ struct amdgpu_dpm_fan {bool ucode_fan_control; }; -enum amdgpu_pcie_gen { -AMDGPU_PCIE_GEN1 =0 , -AMDGPU_PCIE_GEN2 =1 , -AMDGPU_PCIE_GEN3 =2 , -AMDGPU_PCIE_GEN_INVALID =0xffff -}; -#define amdgpu_dpm_reset_power_profile_state (adev, request) \ ((adev)->powerplay.pp_funcs->reset_power_profile_state(\ (adev)->powerplay.pp_handle, request))@@ -403,11 +383,6 @@ void amdgpu_free_extended_power_table(struct amdgpu_device *adev);void amdgpu_add_thermal_controller (struct amdgpu_device *adev); -enum amdgpu_pcie_gen amdgpu_get_pcie_gen_support (struct amdgpu_device *adev, -u32 sys_mask, -enum amdgpu_pcie_gen asic_gen, -enum amdgpu_pcie_gen default_gen); -struct amd_vce_state *amdgpu_get_vce_clock_state (void *handle,u32 idx);drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +72
-34@@ -96,6 +96,19 @@ union pplib_clock_info {struct _ATOM_PPLIB_SI_CLOCK_INFO si; }; +enum si_dpm_auto_throttle_src { +SI_DPM_AUTO_THROTTLE_SRC_THERMAL , +SI_DPM_AUTO_THROTTLE_SRC_EXTERNAL +}; + +enum si_dpm_event_src { +SI_DPM_EVENT_SRC_ANALOG =0 , +SI_DPM_EVENT_SRC_EXTERNAL =1 , +SI_DPM_EVENT_SRC_DIGITAL =2 , +SI_DPM_EVENT_SRC_ANALOG_OR_EXTERNAL =3 , +SI_DPM_EVENT_SRC_DIGIAL_OR_EXTERNAL =4 +}; +static const u32 r600_utc[R600_PM_NUMBER_OF_TC ] = {R600_UTC_DFLT_00 ,@@ -3718,25 +3731,25 @@ static void si_set_dpm_event_sources(struct amdgpu_device *adev, u32 sources) {struct rv7xx_power_info *pi =rv770_get_pi (adev);bool want_thermal_protection; -enum amdgpu_dpm_event_src dpm_event_src; +enum si_dpm_event_src dpm_event_src;switch (sources) {case 0 :default : want_thermal_protection = false;break ; -case (1 <<AMDGPU_DPM_AUTO_THROTTLE_SRC_THERMAL ): +case (1 <<SI_DPM_AUTO_THROTTLE_SRC_THERMAL ): want_thermal_protection = true; - dpm_event_src =AMDGPU_DPM_EVENT_SRC_DIGITAL ; + dpm_event_src =SI_DPM_EVENT_SRC_DIGITAL ;break ; -case (1 <<AMDGPU_DPM_AUTO_THROTTLE_SRC_EXTERNAL ): +case (1 <<SI_DPM_AUTO_THROTTLE_SRC_EXTERNAL ): want_thermal_protection = true; - dpm_event_src =AMDGPU_DPM_EVENT_SRC_EXTERNAL ; + dpm_event_src =SI_DPM_EVENT_SRC_EXTERNAL ;break ; -case ((1 <<AMDGPU_DPM_AUTO_THROTTLE_SRC_EXTERNAL ) | - (1 <<AMDGPU_DPM_AUTO_THROTTLE_SRC_THERMAL )): +case ((1 <<SI_DPM_AUTO_THROTTLE_SRC_EXTERNAL ) | + (1 <<SI_DPM_AUTO_THROTTLE_SRC_THERMAL )): want_thermal_protection = true; - dpm_event_src =AMDGPU_DPM_EVENT_SRC_DIGIAL_OR_EXTERNAL ; + dpm_event_src =SI_DPM_EVENT_SRC_DIGIAL_OR_EXTERNAL ;break ; }@@ -3750,7 +3763,7 @@ static void si_set_dpm_event_sources(struct amdgpu_device *adev, u32 sources) }static void si_enable_auto_throttle_source (struct amdgpu_device *adev, -enum amdgpu_dpm_auto_throttle_src source, +enum si_dpm_auto_throttle_src source,bool enable) {struct rv7xx_power_info *pi =rv770_get_pi (adev);@@ -4927,6 +4940,31 @@ static int si_populate_smc_initial_state(struct amdgpu_device *adev,return 0 ; } +static enum si_pcie_gen si_gen_pcie_gen_support (struct amdgpu_device *adev, +u32 sys_mask, +enum si_pcie_gen asic_gen, +enum si_pcie_gen default_gen) +{ +switch (asic_gen) { +case PCIE_GEN1 : +return PCIE_GEN1 ; +case PCIE_GEN2 : +return PCIE_GEN2 ; +case PCIE_GEN3 : +return PCIE_GEN3 ; +default : +if ((sys_mask &CAIL_PCIE_LINK_SPEED_SUPPORT_GEN3 ) && + (default_gen ==PCIE_GEN3 )) +return PCIE_GEN3 ; +else if ((sys_mask &CAIL_PCIE_LINK_SPEED_SUPPORT_GEN2 ) && + (default_gen ==PCIE_GEN2 )) +return PCIE_GEN2 ; +else +return PCIE_GEN1 ; + } +return PCIE_GEN1 ; +} +static int si_populate_smc_acpi_state (struct amdgpu_device *adev,SISLANDS_SMC_STATETABLE *table) {@@ -4989,10 +5027,10 @@ static int si_populate_smc_acpi_state(struct amdgpu_device *adev, &table->ACPIState.level.std_vddc); } table->ACPIState.level.gen2PCIE = - (u8 )amdgpu_get_pcie_gen_support (adev, - si_pi->sys_pcie_mask, - si_pi->boot_pcie_gen, -AMDGPU_PCIE_GEN1 ); + (u8 )si_gen_pcie_gen_support (adev, + si_pi->sys_pcie_mask, + si_pi->boot_pcie_gen, +PCIE_GEN1 );if (si_pi->vddc_phase_shed_control) si_populate_phase_shedding_value(adev,@@ -5430,7 +5468,7 @@ static int si_convert_power_level_to_smc(struct amdgpu_device *adev,bool gmc_pg = false;if (eg_pi->pcie_performance_request && - (si_pi->force_pcie_gen !=AMDGPU_PCIE_GEN_INVALID )) + (si_pi->force_pcie_gen !=PCIE_GEN_INVALID )) level->gen2PCIE = (u8 )si_pi->force_pcie_gen;else level->gen2PCIE = (u8 )pl->pcie_gen;@@ -6147,8 +6185,8 @@ static void si_enable_voltage_control(struct amdgpu_device *adev, bool enable)WREG32_P (GENERAL_PWRMGT ,0 , ~VOLT_PWRMGT_EN ); } -static enum amdgpu_pcie_gen si_get_maximum_link_speed (struct amdgpu_device *adev, -struct amdgpu_ps *amdgpu_state) +static enum si_pcie_gen si_get_maximum_link_speed (struct amdgpu_device *adev, +struct amdgpu_ps *amdgpu_state) {struct si_ps *state =si_get_ps (amdgpu_state);int i;@@ -6177,27 +6215,27 @@ static void si_request_link_speed_change_before_state_change(struct amdgpu_devic struct amdgpu_ps *amdgpu_current_state) {struct si_power_info *si_pi =si_get_pi (adev); -enum amdgpu_pcie_gen target_link_speed =si_get_maximum_link_speed (adev, amdgpu_new_state); -enum amdgpu_pcie_gen current_link_speed; +enum si_pcie_gen target_link_speed =si_get_maximum_link_speed (adev, amdgpu_new_state); +enum si_pcie_gen current_link_speed; -if (si_pi->force_pcie_gen ==AMDGPU_PCIE_GEN_INVALID ) +if (si_pi->force_pcie_gen ==PCIE_GEN_INVALID ) current_link_speed =si_get_maximum_link_speed (adev, amdgpu_current_state);else current_link_speed = si_pi->force_pcie_gen; - si_pi->force_pcie_gen =AMDGPU_PCIE_GEN_INVALID ; + si_pi->force_pcie_gen =PCIE_GEN_INVALID ; si_pi->pspp_notify_required = false;if (target_link_speed > current_link_speed) {switch (target_link_speed) {#if defined(CONFIG_ACPI ) -case AMDGPU_PCIE_GEN3 : +case PCIE_GEN3 :if (amdgpu_acpi_pcie_performance_request (adev,PCIE_PERF_REQ_PECI_GEN3 , false) ==0 )break ; - si_pi->force_pcie_gen =AMDGPU_PCIE_GEN2 ; -if (current_link_speed ==AMDGPU_PCIE_GEN2 ) + si_pi->force_pcie_gen =PCIE_GEN2 ; +if (current_link_speed ==PCIE_GEN2 )break ; fallthrough; -case AMDGPU_PCIE_GEN2 : +case PCIE_GEN2 :if (amdgpu_acpi_pcie_performance_request (adev,PCIE_PERF_REQ_PECI_GEN2 , false) ==0 )break ; fallthrough;@@ -6217,13 +6255,13 @@ static void si_notify_link_speed_change_after_state_change(struct amdgpu_device struct amdgpu_ps *amdgpu_current_state) {struct si_power_info *si_pi =si_get_pi (adev); -enum amdgpu_pcie_gen target_link_speed =si_get_maximum_link_speed (adev, amdgpu_new_state); +enum si_pcie_gen target_link_speed =si_get_maximum_link_speed (adev, amdgpu_new_state);u8 request;if (si_pi->pspp_notify_required) { -if (target_link_speed ==AMDGPU_PCIE_GEN3 ) +if (target_link_speed ==PCIE_GEN3 ) request =PCIE_PERF_REQ_PECI_GEN3 ; -else if (target_link_speed ==AMDGPU_PCIE_GEN2 ) +else if (target_link_speed ==PCIE_GEN2 ) request =PCIE_PERF_REQ_PECI_GEN2 ;else request =PCIE_PERF_REQ_PECI_GEN1 ;@@ -6864,7 +6902,7 @@ static int si_dpm_enable(struct amdgpu_device *adev)si_enable_sclk_control (adev, true);si_start_dpm (adev); -si_enable_auto_throttle_source (adev,AMDGPU_DPM_AUTO_THROTTLE_SRC_THERMAL , true); +si_enable_auto_throttle_source (adev,SI_DPM_AUTO_THROTTLE_SRC_THERMAL , true);si_thermal_start_thermal_controller (adev);ni_update_current_ps (adev, boot_ps);@@ -6904,7 +6942,7 @@ static void si_dpm_disable(struct amdgpu_device *adev)si_enable_power_containment (adev, boot_ps, false);si_enable_smc_cac (adev, boot_ps, false);si_enable_spread_spectrum (adev, false); -si_enable_auto_throttle_source (adev,AMDGPU_DPM_AUTO_THROTTLE_SRC_THERMAL , false); +si_enable_auto_throttle_source (adev,SI_DPM_AUTO_THROTTLE_SRC_THERMAL , false);si_stop_dpm (adev);si_reset_to_default (adev);si_dpm_stop_smc (adev);@@ -7148,10 +7186,10 @@ static void si_parse_pplib_clock_info(struct amdgpu_device *adev, pl->vddc =le16_to_cpu (clock_info->si.usVDDC); pl->vddci =le16_to_cpu (clock_info->si.usVDDCI); pl->flags =le32_to_cpu (clock_info->si.ulFlags); - pl->pcie_gen =amdgpu_get_pcie_gen_support (adev, - si_pi->sys_pcie_mask, - si_pi->boot_pcie_gen, - clock_info->si.ucPCIEGen); + pl->pcie_gen =si_gen_pcie_gen_support (adev, + si_pi->sys_pcie_mask, + si_pi->boot_pcie_gen, + clock_info->si.ucPCIEGen);/* patch up vddc if necessary */ ret = si_get_leakage_voltage_from_leakage_index(adev, pl->vddc,@@ -7318,7 +7356,7 @@ static int si_dpm_init(struct amdgpu_device *adev) si_pi->sys_pcie_mask = adev->pm.pcie_gen_mask &CAIL_PCIE_LINK_SPEED_SUPPORT_MASK ; - si_pi->force_pcie_gen =AMDGPU_PCIE_GEN_INVALID ; + si_pi->force_pcie_gen =PCIE_GEN_INVALID ; si_pi->boot_pcie_gen =si_get_current_pcie_speed (adev);si_set_max_cu_value (adev);drivers/gpu/drm/amd/pm/powerplay/si_dpm.h +0
-0
drivers/gpu/drm/amd/pm/powerplay/si_dpm.h struct rv7xx_power_info { · line 604
Quoted 10 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.h +7
-0@@ -595,13 +595,20 @@ struct rv7xx_power_info {RV770_SMC_STATETABLE smc_statetable; }; +enum si_pcie_gen { +PCIE_GEN1 =0 , +PCIE_GEN2 =1 , +PCIE_GEN3 =2 , +PCIE_GEN_INVALID =0xffff +}; +
Better use the same SI_ convention for consistency.
Thanks,
Lijo
Quoted 25 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.h +4
-4struct rv7xx_pl {u32 sclk;u32 mclk;u16 vddc;u16 vddci;/* eg+ only */ u32 flags; -enum amdgpu_pcie_gen pcie_gen;/* si+ only */ +enum si_pcie_gen pcie_gen;/* si+ only */ };struct rv7xx_ps {@@ -967,9 +974,9 @@ struct si_power_info {struct si_ulv_param ulv;u32 max_cu;/* pcie gen */ -enum amdgpu_pcie_gen force_pcie_gen; -enum amdgpu_pcie_gen boot_pcie_gen; -enum amdgpu_pcie_gen acpi_pcie_gen; +enum si_pcie_gen force_pcie_gen; +enum si_pcie_gen boot_pcie_gen; +enum si_pcie_gen acpi_pcie_gen;u32 sys_pcie_mask;/* flags */ bool enable_dte;
RE: [PATCH V5 05/16] drm/amd/pm: do not expose those APIs used internally only in si_dpm.c
[AMD Official Use Only]
Quoted 408 lines
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Tuesday, December 21, 2021 2:17 PM
To: Quan, Evan <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: Re: [PATCH V5 05/16] drm/amd/pm: do not expose those APIs used internally only insi_dpm.cQuoted 11 lines · Evan Quan
Move them to
si_dpm.cinstead.Signed-off-by Evan Quan <[email protected]>Change-Id I288205cfd7c6ba09cfb22626ff70360d61ff0c67--
v1->v2:
- rename the API with "si_" prefix(Alex)v2->v3:
- rename other data structures used only insi_dpm.c(Lijo)v3->v4:
- rename Macros used only insi_dpm.cwith "SI_" prefix(Lijo)Quoted 4 lines
--- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 25 ----- drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 25 ----- drivers/gpu/drm/amd/pm/powerplay/si_dpm.c | 106+++++++++++++++-------
drivers/gpu/drm/amd/pm/amdgpu_dpm.c void amdgpu_add_thermal_controller(struct
Quoted 9 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.h | 15 ++- 4 files changed, 83 insertions(+), 88 deletions(-)drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-0@@ -894,31 +894,6 @@ void amdgpu_add_thermal_controller(struct
amdgpu_device*adev)drivers/gpu/drm/amd/pm/amdgpu_dpm.c void amdgpu_add_thermal_controller(struct · line 897
Quoted 4 lines
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1} } -enum amdgpu_pcie_gen amdgpu_get_pcie_gen_support(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c void amdgpu_add_thermal_controller(struct · line 899
Quoted 2 lines
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-2-u32 sys_mask, - enum amdgpu_pcie_gen
asic_gen,drivers/gpu/drm/amd/pm/amdgpu_dpm.c void amdgpu_add_thermal_controller(struct · line 900
Quoted 1 line
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1-enum amdgpu_pcie_gen
default_gen)drivers/gpu/drm/amd/pm/amdgpu_dpm.c void amdgpu_add_thermal_controller(struct amdgpu_device *adev)
Quoted 10 lines
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-10-{ -switch (asic_gen) { -case AMDGPU_PCIE_GEN1 : -return AMDGPU_PCIE_GEN1 ; -case AMDGPU_PCIE_GEN2 : -return AMDGPU_PCIE_GEN2 ; -case AMDGPU_PCIE_GEN3 : -return AMDGPU_PCIE_GEN3 ; -default : - if ((sys_mask & CAIL_PCIE_LINK_SPEED_SUPPORT_GEN3)&&
drivers/gpu/drm/amd/pm/amdgpu_dpm.c void amdgpu_add_thermal_controller(struct amdgpu_device *adev)
Quoted 3 lines
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-3- (default_gen == AMDGPU_PCIE_GEN3)) -return AMDGPU_PCIE_GEN3 ; - else if ((sys_mask &
CAIL_PCIE_LINK_SPEED_SUPPORT_GEN2) &&Quoted 50 lines
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-8- (default_gen == AMDGPU_PCIE_GEN2)) -return AMDGPU_PCIE_GEN2 ; - else - return AMDGPU_PCIE_GEN1; - } -return AMDGPU_PCIE_GEN1 ; -} -struct amd_vce_state *amdgpu_get_vce_clock_state (void *handle,u32 idx) {drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h +0
-20@@ -45,19 +45,6 @@ enum amdgpu_int_thermal_type { THERMAL_TYPE_KV, }; -enum amdgpu_dpm_auto_throttle_src { -AMDGPU_DPM_AUTO_THROTTLE_SRC_THERMAL , -AMDGPU_DPM_AUTO_THROTTLE_SRC_EXTERNAL -}; - -enum amdgpu_dpm_event_src { -AMDGPU_DPM_EVENT_SRC_ANALOG =0 , -AMDGPU_DPM_EVENT_SRC_EXTERNAL =1 , -AMDGPU_DPM_EVENT_SRC_DIGITAL =2 , -AMDGPU_DPM_EVENT_SRC_ANALOG_OR_EXTERNAL =3 , -AMDGPU_DPM_EVENT_SRC_DIGIAL_OR_EXTERNAL =4 -}; -struct amdgpu_ps {u32 caps;/* vbios flags */ u32 class;/* vbios flags */ @@ -252,13 +239,6 @@ struct amdgpu_dpm_fan {bool ucode_fan_control; }; -enum amdgpu_pcie_gen { -AMDGPU_PCIE_GEN1 =0 , -AMDGPU_PCIE_GEN2 =1 , -AMDGPU_PCIE_GEN3 =2 , -AMDGPU_PCIE_GEN_INVALID =0xffff -}; -#define amdgpu_dpm_reset_power_profile_state (adev, request) \ ((adev)->powerplay.pp_funcs- reset_power_profile_state(\Quoted 1 line
(adev)->powerplay.pp_handle, request)) @@ -
403,11 +383,6 @@ void
Quoted 5 lines
amdgpu_free_extended_power_table(struct amdgpu_device *adev);void amdgpu_add_thermal_controller(struct amdgpu_device *adev);-enum
amdgpu_pcie_genamdgpu_get_pcie_gen_support(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
Quoted 2 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h +0
-2-u32 sys_mask, - enum amdgpu_pcie_gen
asic_gen,drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
Quoted 1 line
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h +0
-1-enum amdgpu_pcie_gen
default_gen);drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void si_set_dpm_event_sources(struct
Quoted 29 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h +0
-1-struct amd_vce_state *amdgpu_get_vce_clock_state (void *handle,u32 idx);drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +12
-0@@ -96,6 +96,19 @@ union pplib_clock_info {struct _ATOM_PPLIB_SI_CLOCK_INFO si; }; +enum si_dpm_auto_throttle_src { +SI_DPM_AUTO_THROTTLE_SRC_THERMAL , +SI_DPM_AUTO_THROTTLE_SRC_EXTERNAL +}; + +enum si_dpm_event_src { +SI_DPM_EVENT_SRC_ANALOG =0 , +SI_DPM_EVENT_SRC_EXTERNAL =1 , +SI_DPM_EVENT_SRC_DIGITAL =2 , +SI_DPM_EVENT_SRC_ANALOG_OR_EXTERNAL =3 , +SI_DPM_EVENT_SRC_DIGIAL_OR_EXTERNAL =4 }; +static const u32 r600_utc[R600_PM_NUMBER_OF_TC ] = {R600_UTC_DFLT_00 ,@@ -3718,25 +3731,25 @@ static void si_set_dpm_event_sources(struct
amdgpu_device*adev, u32 sources)Quoted 19 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +4
-4{struct rv7xx_power_info *pi =rv770_get_pi (adev);bool want_thermal_protection; -enum amdgpu_dpm_event_src dpm_event_src; +enum si_dpm_event_src dpm_event_src;switch (sources) {case 0 :default : want_thermal_protection = false;break ; -case (1 <<AMDGPU_DPM_AUTO_THROTTLE_SRC_THERMAL ): +case (1 <<SI_DPM_AUTO_THROTTLE_SRC_THERMAL ): want_thermal_protection = true; - dpm_event_src =AMDGPU_DPM_EVENT_SRC_DIGITAL ; + dpm_event_src =SI_DPM_EVENT_SRC_DIGITAL ;break ; -case (1 <<AMDGPU_DPM_AUTO_THROTTLE_SRC_EXTERNAL ): +case (1 <<SI_DPM_AUTO_THROTTLE_SRC_EXTERNAL ):drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void si_set_dpm_event_sources(struct amdgpu_device *adev, u32 sources)
Quoted 10 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +3
-4want_thermal_protection = true; - dpm_event_src =AMDGPU_DPM_EVENT_SRC_EXTERNAL ; + dpm_event_src =SI_DPM_EVENT_SRC_EXTERNAL ;break ; -case ((1 <<AMDGPU_DPM_AUTO_THROTTLE_SRC_EXTERNAL ) | - (1 <<AMDGPU_DPM_AUTO_THROTTLE_SRC_THERMAL )): +case ((1 <<SI_DPM_AUTO_THROTTLE_SRC_EXTERNAL ) | + (1 <<SI_DPM_AUTO_THROTTLE_SRC_THERMAL )): want_thermal_protection = true; - dpm_event_src =
AMDGPU_DPM_EVENT_SRC_DIGIAL_OR_EXTERNAL;drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void si_set_dpm_event_sources(struct · line 3752
Quoted 1 line
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +1
-0+ dpm_event_src =
SI_DPM_EVENT_SRC_DIGIAL_OR_EXTERNAL;drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void si_set_dpm_event_sources(struct
Quoted 4 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +0
-0break ; }@@ -3750,7 +3763,7 @@ static void si_set_dpm_event_sources(struct
amdgpu_device*adev, u32 sources)drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void si_set_dpm_event_sources(struct amdgpu_device *adev, u32 sources)
Quoted 4 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +0
-1} static void si_enable_auto_throttle_source(struct amdgpu_device *adev, - enum
amdgpu_dpm_auto_throttle_srcsource,drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void si_set_dpm_event_sources(struct · line 3766
Quoted 1 line
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +1
-0+enum si_dpm_auto_throttle_src source,
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void si_set_dpm_event_sources(struct amdgpu_device *adev, u32 sources)
Quoted 4 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +1
-0bool enable) { struct rv7xx_power_info *pi = rv770_get_pi(adev); @@ -4927,6 +4940,31 @@ static int si_populate_smc_initial_state(struct
amdgpu_device*adev,Quoted 4 lines
return 0; }+static enum
si_pcie_gensi_gen_pcie_gen_support(structamdgpu_device*adev,
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static int si_populate_smc_initial_state(struct amdgpu_device *adev,
Quoted 3 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +3
-0+u32 sys_mask, + enum si_pcie_gen asic_gen, + enum si_pcie_gen
default_gen)drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static int si_populate_smc_initial_state(struct amdgpu_device *adev,
Quoted 10 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +10
-0+{ +switch (asic_gen) { +case PCIE_GEN1 : +return PCIE_GEN1 ; +case PCIE_GEN2 : +return PCIE_GEN2 ; +case PCIE_GEN3 : +return PCIE_GEN3 ; +default : + if ((sys_mask & CAIL_PCIE_LINK_SPEED_SUPPORT_GEN3)&&
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static int si_populate_smc_initial_state(struct amdgpu_device *adev,
Quoted 3 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +3
-0+ (default_gen == PCIE_GEN3)) +return PCIE_GEN3 ; + else if ((sys_mask &
CAIL_PCIE_LINK_SPEED_SUPPORT_GEN2) &&drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static int si_populate_smc_acpi_state(struct
Quoted 12 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +8
-0+ (default_gen == PCIE_GEN2)) +return PCIE_GEN2 ; + else + return PCIE_GEN1; + } +return PCIE_GEN1 ; +} +static int si_populate_smc_acpi_state (struct amdgpu_device *adev,SISLANDS_SMC_STATETABLE *table) {@@ -4989,10 +5027,10 @@ static int si_populate_smc_acpi_state(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static int si_populate_smc_acpi_state(struct amdgpu_device *adev,
Quoted 8 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +0
-4&table- ACPIState.level.std_vddc); } table->ACPIState.level.gen2PCIE = - (u8)amdgpu_get_pcie_gen_support(adev, - si_pi->sys_pcie_mask, - si_pi->boot_pcie_gen, -AMDGPU_PCIE_GEN1);drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static int si_convert_power_level_to_smc(struct
Quoted 8 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +4
-0+ (u8 )si_gen_pcie_gen_support (adev, + si_pi->sys_pcie_mask, + si_pi->boot_pcie_gen, +PCIE_GEN1 );if (si_pi->vddc_phase_shed_control)si_populate_phase_shedding_value(adev,
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +0
-0@@ -5430,7 +5468,7 @@ static int si_convert_power_level_to_smc(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static int si_convert_power_level_to_smc(struct amdgpu_device *adev,
Quoted 8 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +1
-1bool gmc_pg = false;if (eg_pi->pcie_performance_request && - (si_pi->force_pcie_gen !=AMDGPU_PCIE_GEN_INVALID )) + (si_pi->force_pcie_gen !=PCIE_GEN_INVALID )) level->gen2PCIE = (u8 )si_pi->force_pcie_gen;else level->gen2PCIE = (u8)pl->pcie_gen; @@ -6147,8 +6185,8@@ static
Quoted 5 lines
void
si_enable_voltage_control(struct amdgpu_device *adev, bool enable)
WREG32_P(GENERAL_PWRMGT, 0, ~VOLT_PWRMGT_EN);
}-static enum
amdgpu_pcie_gensi_get_maximum_link_speed(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/powerplay/si_dpm.c
Quoted 1 line
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +0
-1-struct amdgpu_ps
*amdgpu_state)Quoted 1 line
+static enum
si_pcie_gensi_get_maximum_link_speed(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/powerplay/si_dpm.c
Quoted 1 line
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +1
-0+struct amdgpu_ps
*amdgpu_state)drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void
Quoted 4 lines
{ struct si_ps *state = si_get_ps(amdgpu_state); int i;drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +0
-0@@ -6177,27 +6215,27 @@ static voidsi_request_link_speed_change_before_state_change(struct
amdgpu_devicdrivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void · line 6215
Quoted 1 line
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +0
-0struct amdgpu_ps
*amdgpu_current_state)drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void si_request_link_speed_change_before_state_change(struct amdgpu_devic
Quoted 3 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +0
-1{struct si_power_info *si_pi =si_get_pi (adev); - enum amdgpu_pcie_gen target_link_speed =
si_get_maximum_link_speed(adev, amdgpu_new_state);drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void · line 6218
Quoted 2 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +1
-1-enum amdgpu_pcie_gen current_link_speed; + enum si_pcie_gen target_link_speed =
si_get_maximum_link_speed(adev, amdgpu_new_state);drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void si_request_link_speed_change_before_state_change(struct amdgpu_devic
Quoted 5 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +2
-1+enum si_pcie_gen current_link_speed; -if (si_pi->force_pcie_gen ==AMDGPU_PCIE_GEN_INVALID ) +if (si_pi->force_pcie_gen ==PCIE_GEN_INVALID ) current_link_speed = si_get_maximum_link_speed(adev,
amdgpu_current_state);drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void si_request_link_speed_change_before_state_change(struct amdgpu_devic
Quoted 12 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +2
-2else current_link_speed = si_pi->force_pcie_gen; - si_pi->force_pcie_gen =AMDGPU_PCIE_GEN_INVALID ; + si_pi->force_pcie_gen =PCIE_GEN_INVALID ; si_pi->pspp_notify_required = false;if (target_link_speed > current_link_speed) {switch (target_link_speed) {#if defined(CONFIG_ACPI ) -case AMDGPU_PCIE_GEN3 : +case PCIE_GEN3 : if (amdgpu_acpi_pcie_performance_request(adev,
PCIE_PERF_REQ_PECI_GEN3, false) == 0)drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void si_request_link_speed_change_before_state_change(struct amdgpu_devic
Quoted 10 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +3
-3break ; - si_pi->force_pcie_gen =AMDGPU_PCIE_GEN2 ; -if (current_link_speed ==AMDGPU_PCIE_GEN2 ) + si_pi->force_pcie_gen =PCIE_GEN2 ; +if (current_link_speed ==PCIE_GEN2 )break ; fallthrough; -case AMDGPU_PCIE_GEN2 : +case PCIE_GEN2 : if (amdgpu_acpi_pcie_performance_request(adev,
PCIE_PERF_REQ_PECI_GEN2, false) == 0)drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void
Quoted 3 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +0
-0break ; fallthrough;@@ -6217,13 +6255,13 @@ static voidsi_notify_link_speed_change_after_state_change(struct
amdgpu_devicedrivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void · line 6255
Quoted 1 line
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +0
-0struct amdgpu_ps
*amdgpu_current_state)drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void si_request_link_speed_change_before_state_change(struct amdgpu_devic
Quoted 3 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +0
-1{struct si_power_info *si_pi =si_get_pi (adev); - enum amdgpu_pcie_gen target_link_speed =
si_get_maximum_link_speed(adev, amdgpu_new_state);drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void · line 6258
Quoted 1 line
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +1
-0+ enum si_pcie_gen target_link_speed =si_get_maximum_link_speed(adev,
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void si_notify_link_speed_change_after_state_change(struct amdgpu_device
Quoted 12 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +3
-2+amdgpu_new_state);u8 request;if (si_pi->pspp_notify_required) { -if (target_link_speed ==AMDGPU_PCIE_GEN3 ) +if (target_link_speed ==PCIE_GEN3 ) request =PCIE_PERF_REQ_PECI_GEN3 ; -else if (target_link_speed ==AMDGPU_PCIE_GEN2 ) +else if (target_link_speed ==PCIE_GEN2 ) request =PCIE_PERF_REQ_PECI_GEN2 ;else request = PCIE_PERF_REQ_PECI_GEN1; @@ -6864,7+6902,7 @@ static
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c
Quoted 5 lines
int
si_dpm_enable(struct amdgpu_device *adev)
si_enable_sclk_control(adev, true);
si_start_dpm(adev);drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +0
-1- si_enable_auto_throttle_source(adev,
AMDGPU_DPM_AUTO_THROTTLE_SRC_THERMAL, true);drivers/gpu/drm/amd/pm/powerplay/si_dpm.c
Quoted 5 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +2
-0+si_enable_auto_throttle_source (adev, +SI_DPM_AUTO_THROTTLE_SRC_THERMAL , true);si_thermal_start_thermal_controller (adev); ni_update_current_ps(adev, boot_ps); @@ -6904,7 +6942,7 @@static
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c
Quoted 5 lines
void
si_dpm_disable(struct amdgpu_device *adev)
si_enable_power_containment(adev, boot_ps, false);si_enable_smc_cac(adev, boot_ps, false);si_enable_spread_spectrum(adev, false);drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +0
-1- si_enable_auto_throttle_source(adev,
AMDGPU_DPM_AUTO_THROTTLE_SRC_THERMAL, false);drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void si_parse_pplib_clock_info(struct
Quoted 6 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +2
-0+si_enable_auto_throttle_source (adev, +SI_DPM_AUTO_THROTTLE_SRC_THERMAL , false);si_stop_dpm (adev);si_reset_to_default (adev);si_dpm_stop_smc (adev);@@ -7148,10 +7186,10 @@ static void si_parse_pplib_clock_info(struct
amdgpu_device*adev,Quoted 4 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +0
-1pl->vddc =le16_to_cpu (clock_info->si.usVDDC); pl->vddci =le16_to_cpu (clock_info->si.usVDDCI); pl->flags =le32_to_cpu (clock_info->si.ulFlags); - pl->pcie_gen = amdgpu_get_pcie_gen_support(adev,drivers/gpu/drm/amd/pm/powerplay/si_dpm.c static void si_parse_pplib_clock_info(struct amdgpu_device *adev, · line 7195
Quoted 10 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +4
-3- si_pi->sys_pcie_mask, - si_pi->boot_pcie_gen, - clock_info->si.ucPCIEGen); + pl->pcie_gen =si_gen_pcie_gen_support (adev, + si_pi->sys_pcie_mask, + si_pi->boot_pcie_gen, + clock_info->si.ucPCIEGen);/* patch up vddc if necessary */ ret = si_get_leakage_voltage_from_leakage_index(adev, pl->vddc,@@
Quoted 4 lines
-7318,7 +7356,7 @@ static int
si_dpm_init(struct amdgpu_device *adev)
si_pi->sys_pcie_mask=
adev->pm.pcie_gen_mask&
CAIL_PCIE_LINK_SPEED_SUPPORT_MASK;Quoted 14 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +1
-1- si_pi->force_pcie_gen =AMDGPU_PCIE_GEN_INVALID ; + si_pi->force_pcie_gen =PCIE_GEN_INVALID ; si_pi->boot_pcie_gen =si_get_current_pcie_speed (adev);si_set_max_cu_value (adev);drivers/gpu/drm/amd/pm/powerplay/si_dpm.h +0
-0@@ -595,13 +595,20 @@ struct rv7xx_power_info {RV770_SMC_STATETABLE smc_statetable; };
Quoted 9 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.h struct rv7xx_power_info { · line 604
Quoted 7 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.h +7
-0+enum si_pcie_gen { +PCIE_GEN1 =0 , +PCIE_GEN2 =1 , +PCIE_GEN3 =2 , +PCIE_GEN_INVALID =0xffff +}; +Better use the same
SI_convention for consistency.
[Quan, Evan] Sure, I can get this updated.
BR
Evan
Quoted 29 lines
Thanks,
LijoQuoted 25 lines
drivers/gpu/drm/amd/pm/powerplay/si_dpm.h +4
-4struct rv7xx_pl {u32 sclk;u32 mclk;u16 vddc;u16 vddci;/* eg+ only */ u32 flags; -enum amdgpu_pcie_gen pcie_gen;/* si+ only */ +enum si_pcie_gen pcie_gen;/* si+ only */ };struct rv7xx_ps {@@ -967,9 +974,9 @@ struct si_power_info {struct si_ulv_param ulv;u32 max_cu;/* pcie gen */ -enum amdgpu_pcie_gen force_pcie_gen; -enum amdgpu_pcie_gen boot_pcie_gen; -enum amdgpu_pcie_gen acpi_pcie_gen; +enum si_pcie_gen force_pcie_gen; +enum si_pcie_gen boot_pcie_gen; +enum si_pcie_gen acpi_pcie_gen;u32 sys_pcie_mask;/* flags */ bool enable_dte;
PATCH v5 6/16 drm/amd/pm: do not expose the API used internally only in kv_dpm.c
In reply to Evan QuanMove it to kv_dpm.c instead.
--v1->v2:
- rename the API with "kv_" prefix(Alex)
--- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 23 --------------------- drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 2 -- drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c | 25 ++++++++++++++++++++++- 3 files changed, 24 insertions(+), 26 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0 -23
@@ -209,29 +209,6 @@ static u32 amdgpu_dpm_get_vrefresh(struct amdgpu_device *adev)return vrefresh; } -bool amdgpu_is_internal_thermal_sensor (enum amdgpu_int_thermal_type sensor) -{ -switch (sensor) { -case THERMAL_TYPE_RV6XX : -case THERMAL_TYPE_RV770 : -case THERMAL_TYPE_EVERGREEN : -case THERMAL_TYPE_SUMO : -case THERMAL_TYPE_NI : -case THERMAL_TYPE_SI : -case THERMAL_TYPE_CI : -case THERMAL_TYPE_KV : -return true; -case THERMAL_TYPE_ADT7473_WITH_INTERNAL : -case THERMAL_TYPE_EMC2103_WITH_INTERNAL : -return false;/* need special handling */ -case THERMAL_TYPE_NONE : -case THERMAL_TYPE_EXTERNAL : -case THERMAL_TYPE_EXTERNAL_GPIO : -default : -return false; - } -} -union power_info {struct _ATOM_POWERPLAY_INFO info;struct _ATOM_POWERPLAY_INFO_V2 info_2;
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h +0 -2
@@ -374,8 +374,6 @@ u32 amdgpu_dpm_get_vblank_time(struct amdgpu_device *adev);int amdgpu_dpm_read_sensor (struct amdgpu_device *adev,enum amd_pp_sensors sensor,void *data,uint32_t *size); -bool amdgpu_is_internal_thermal_sensor (enum amdgpu_int_thermal_type sensor); -int amdgpu_get_platform_caps (struct amdgpu_device *adev);int amdgpu_parse_extended_power_table (struct amdgpu_device *adev);
drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c +24 -1
@@ -1256,6 +1256,29 @@ static void kv_dpm_enable_bapm(void *handle, bool enable) } } +static bool kv_is_internal_thermal_sensor (enum amdgpu_int_thermal_type sensor) +{ +switch (sensor) { +case THERMAL_TYPE_RV6XX : +case THERMAL_TYPE_RV770 : +case THERMAL_TYPE_EVERGREEN : +case THERMAL_TYPE_SUMO : +case THERMAL_TYPE_NI : +case THERMAL_TYPE_SI : +case THERMAL_TYPE_CI : +case THERMAL_TYPE_KV : +return true; +case THERMAL_TYPE_ADT7473_WITH_INTERNAL : +case THERMAL_TYPE_EMC2103_WITH_INTERNAL : +return false;/* need special handling */ +case THERMAL_TYPE_NONE : +case THERMAL_TYPE_EXTERNAL : +case THERMAL_TYPE_EXTERNAL_GPIO : +default : +return false; + } +} +static int kv_dpm_enable (struct amdgpu_device *adev) {struct kv_power_info *pi =kv_get_pi (adev);
@@ -1352,7 +1375,7 @@ static int kv_dpm_enable(struct amdgpu_device *adev) }if (adev->irq.installed && -amdgpu_is_internal_thermal_sensor (adev->pm.int_thermal_type)) { +kv_is_internal_thermal_sensor (adev->pm.int_thermal_type)) { ret =kv_set_thermal_temperature_range (adev,KV_TEMP_RANGE_MIN ,KV_TEMP_RANGE_MAX );if (ret) {DRM_ERROR ("kv_set_thermal_temperature_range failed\n" );
Signature · 1 line
2.29.0
PATCH v5 7/16 drm/amd/pm: create a new holder for those APIs used only by legacy ASICs(si/kv)
In reply to Evan QuanThose APIs are used only by legacy ASICs(si/kv). They cannot be shared by other ASICs. So, we create a new holder for them.
--v1->v2:
- rename amdgpu_pm_compute_clocks as amdgpu_dpm_compute_clocks(Lijo)v2->v3:
- add back the lock protections dropped unintentionally(Lijo)
--- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- .../amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 2 +- .../gpu/drm/amd/include/kgd_pp_interface.h | 1 + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 1022 +--------------- drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 17 +- drivers/gpu/drm/amd/pm/powerplay/Makefile | 2 +- drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c | 6 +- drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.c | 1024 +++++++++++++++++ drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.h | 37 + drivers/gpu/drm/amd/pm/powerplay/si_dpm.c | 6 +- 13 files changed, 1091 insertions(+), 1034 deletions(-) create mode 100644 drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.c create mode 100644 drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.h
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +1 -1
@@ -2532,7 +2532,7 @@ static void dce_v10_0_crtc_dpms(struct drm_crtc *crtc, int mode)break ; }/* adjust pm to dpms */ -amdgpu_pm_compute_clocks (adev); +amdgpu_dpm_compute_clocks (adev); }static void dce_v10_0_crtc_prepare (struct drm_crtc *crtc)
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +1 -1
@@ -2608,7 +2608,7 @@ static void dce_v11_0_crtc_dpms(struct drm_crtc *crtc, int mode)break ; }/* adjust pm to dpms */ -amdgpu_pm_compute_clocks (adev); +amdgpu_dpm_compute_clocks (adev); }static void dce_v11_0_crtc_prepare (struct drm_crtc *crtc)
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1 -1
@@ -2424,7 +2424,7 @@ static void dce_v6_0_crtc_dpms(struct drm_crtc *crtc, int mode)break ; }/* adjust pm to dpms */ -amdgpu_pm_compute_clocks (adev); +amdgpu_dpm_compute_clocks (adev); }static void dce_v6_0_crtc_prepare (struct drm_crtc *crtc)
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +1 -1
@@ -2433,7 +2433,7 @@ static void dce_v8_0_crtc_dpms(struct drm_crtc *crtc, int mode)break ; }/* adjust pm to dpms */ -amdgpu_pm_compute_clocks (adev); +amdgpu_dpm_compute_clocks (adev); }static void dce_v8_0_crtc_prepare (struct drm_crtc *crtc)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +1 -1
@@ -101,7 +101,7 @@ bool dm_pp_apply_display_requirements(amdgpu_dpm_display_configuration_change (adev, &adev->pm.pm_display_cfg); -amdgpu_pm_compute_clocks (adev); +amdgpu_dpm_compute_clocks (adev); }return true;
drivers/gpu/drm/amd/include/kgd_pp_interface.h +1 -0
@@ -404,6 +404,7 @@ struct amd_pm_funcs {int (*get_dpm_clock_table)(void *handle,struct dpm_clocks *clock_table);int (*get_smu_prv_buf_details)(void *handle,void **addr,size_t *size); +int (*change_power_state)(void *handle); };struct metrics_table_header {
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +14 -1008
1,099 lines not on this page · raw message
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h +1 -16
@@ -366,24 +366,10 @@ enum amdgpu_display_gap AMDGPU_PM_DISPLAY_GAP_IGNORE = 3, }; -void amdgpu_dpm_print_class_info (u32 class,u32 class2); -void amdgpu_dpm_print_cap_info (u32 caps); -void amdgpu_dpm_print_ps_status (struct amdgpu_device *adev, -struct amdgpu_ps *rps);u32 amdgpu_dpm_get_vblank_time (struct amdgpu_device *adev);int amdgpu_dpm_read_sensor (struct amdgpu_device *adev,enum amd_pp_sensors sensor,void *data,uint32_t *size); -int amdgpu_get_platform_caps (struct amdgpu_device *adev); - -int amdgpu_parse_extended_power_table (struct amdgpu_device *adev); -void amdgpu_free_extended_power_table (struct amdgpu_device *adev); - -void amdgpu_add_thermal_controller (struct amdgpu_device *adev); - -struct amd_vce_state * -amdgpu_get_vce_clock_state (void *handle,u32 idx); -int amdgpu_dpm_set_powergating_by_smu (struct amdgpu_device *adev,uint32_t block_type,bool gate);
@@ -434,11 +420,10 @@ int amdgpu_dpm_read_sensor(struct amdgpu_device *adev, enum amd_pp_sensors sensovoid amdgpu_dpm_thermal_work_handler (struct work_struct *work); -void amdgpu_pm_compute_clocks (struct amdgpu_device *adev); +void amdgpu_dpm_compute_clocks (struct amdgpu_device *adev);void amdgpu_dpm_enable_uvd (struct amdgpu_device *adev,bool enable);void amdgpu_dpm_enable_vce (struct amdgpu_device *adev,bool enable);void amdgpu_dpm_enable_jpeg (struct amdgpu_device *adev,bool enable); -void amdgpu_pm_print_power_states (struct amdgpu_device *adev);int amdgpu_pm_load_smu_firmware (struct amdgpu_device *adev,uint32_t *smu_version);int amdgpu_dpm_set_light_sbr (struct amdgpu_device *adev,bool enable);int amdgpu_dpm_send_hbm_bad_pages_num (struct amdgpu_device *adev,uint32_t size);
drivers/gpu/drm/amd/pm/powerplay/Makefile +1 -1
@@ -28,7 +28,7 @@ AMD_POWERPLAY = $(addsuffix /Makefile,$(addprefix $(FULL_AMD_PATH)/pm/powerplay/ include $(AMD_POWERPLAY) -POWER_MGR-y = amd_powerplay.o +POWER_MGR-y = amd_powerplay.o legacy_dpm.o POWER_MGR-$(CONFIG_DRM_AMDGPU_CIK)+= kv_dpm.o kv_smc.o
drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c +4 -2
@@ -36,6 +36,7 @@#include "gca/gfx_7_2_d.h" #include "gca/gfx_7_2_sh_mask.h" +#include "legacy_dpm.h" #define KV_MAX_DEEPSLEEP_DIVIDER_ID 5#define KV_MINIMUM_ENGINE_CLOCK 800
@@ -3087,7 +3088,7 @@ static int kv_dpm_hw_init(void *handle)else adev->pm.dpm_enabled = true;mutex_unlock (&adev->pm.mutex); -amdgpu_pm_compute_clocks (adev); +amdgpu_dpm_compute_clocks (adev);return ret; }
@@ -3135,7 +3136,7 @@ static int kv_dpm_resume(void *handle) adev->pm.dpm_enabled = true;mutex_unlock (&adev->pm.mutex);if (adev->pm.dpm_enabled) -amdgpu_pm_compute_clocks (adev); +amdgpu_dpm_compute_clocks (adev); }return 0 ; }
@@ -3389,6 +3390,7 @@ static const struct amd_pm_funcs kv_dpm_funcs = { .get_vce_clock_state = amdgpu_get_vce_clock_state, .check_state_equal = kv_check_state_equal, .read_sensor = &kv_dpm_read_sensor, + .change_power_state = amdgpu_dpm_change_power_state_locked, };static const struct amdgpu_irq_src_funcs kv_dpm_irq_funcs = {
drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.c new file +1024 -0
1,024 lines not on this page · raw message
drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.h new file +37 -0
@@ -0,0 +1,37 @@ +/* +* Copyright 2021 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 __LEGACY_DPM_H__ +#define __LEGACY_DPM_H__ + +void amdgpu_dpm_print_class_info (u32 class,u32 class2); +void amdgpu_dpm_print_cap_info (u32 caps); +void amdgpu_dpm_print_ps_status (struct amdgpu_device *adev, +struct amdgpu_ps *rps); +int amdgpu_get_platform_caps (struct amdgpu_device *adev); +int amdgpu_parse_extended_power_table (struct amdgpu_device *adev); +void amdgpu_free_extended_power_table (struct amdgpu_device *adev); +void amdgpu_add_thermal_controller (struct amdgpu_device *adev); +struct amd_vce_state *amdgpu_get_vce_clock_state (void *handle,u32 idx); +int amdgpu_dpm_change_power_state_locked (void *handle); +void amdgpu_pm_print_power_states (struct amdgpu_device *adev); +#endif
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +4 -2
@@ -37,6 +37,7 @@#include <linux/math64.h> #include <linux/seq_file.h> #include <linux/firmware.h> +#include <legacy_dpm.h> #define MC_CG_ARB_FREQ_F0 0x0a#define MC_CG_ARB_FREQ_F1 0x0b
@@ -7800,7 +7801,7 @@ static int si_dpm_hw_init(void *handle)else adev->pm.dpm_enabled = true;mutex_unlock (&adev->pm.mutex); -amdgpu_pm_compute_clocks (adev); +amdgpu_dpm_compute_clocks (adev);return ret; }
@@ -7848,7 +7849,7 @@ static int si_dpm_resume(void *handle) adev->pm.dpm_enabled = true;mutex_unlock (&adev->pm.mutex);if (adev->pm.dpm_enabled) -amdgpu_pm_compute_clocks (adev); +amdgpu_dpm_compute_clocks (adev); }return 0 ; }
@@ -8101,6 +8102,7 @@ static const struct amd_pm_funcs si_dpm_funcs = { .check_state_equal = &si_check_state_equal, .get_vce_clock_state = amdgpu_get_vce_clock_state, .read_sensor = &si_dpm_read_sensor, + .change_power_state = amdgpu_dpm_change_power_state_locked, };static const struct amdgpu_irq_src_funcs si_dpm_irq_funcs = {
Signature · 1 line
2.29.0
PATCH v5 8/16 drm/amd/pm: move pp_force_state_enabled member to amdgpu_pm structure
In reply to Evan QuanAs it lables an internal pm state and amdgpu_pm structure is the more proper place than amdgpu_device structure for it.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - drivers/gpu/drm/amd/pm/amdgpu_pm.c | 6 +++--- drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -1
@@ -953,7 +953,6 @@ struct amdgpu_device {/* powerplay */ struct amd_powerplay powerplay; -bool pp_force_state_enabled;/* smu */ struct smu_context smu;
drivers/gpu/drm/amd/pm/amdgpu_pm.c +3 -3
@@ -469,7 +469,7 @@ static ssize_t amdgpu_get_pp_force_state(struct device *dev,if (adev->in_suspend && !adev->in_runpm)return -EPERM ; -if (adev->pp_force_state_enabled) +if (adev->pm.pp_force_state_enabled)return amdgpu_get_pp_cur_state (dev, attr, buf);else return sysfs_emit (buf,"\n" );
@@ -492,7 +492,7 @@ static ssize_t amdgpu_set_pp_force_state(struct device *dev,if (adev->in_suspend && !adev->in_runpm)return -EPERM ; - adev->pp_force_state_enabled = false; + adev->pm.pp_force_state_enabled = false;if (strlen (buf) ==1 )return count;
@@ -523,7 +523,7 @@ static ssize_t amdgpu_set_pp_force_state(struct device *dev,if (ret) goto err_out; - adev->pp_force_state_enabled = true; + adev->pm.pp_force_state_enabled = true; }pm_runtime_mark_last_busy (ddev->dev);
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h +2 -0
@@ -335,6 +335,8 @@ struct amdgpu_pm {struct list_head pm_attr_list;atomic_t pwr_state[AMD_IP_BLOCK_TYPE_NUM ]; + +bool pp_force_state_enabled; };#define R600_SSTU_DFLT 0
Signature · 1 line
2.29.0
PATCH v5 9/16 drm/amd/pm: optimize the amdgpu_pm_compute_clocks() implementations
In reply to Evan QuanDrop cross callings and multi-function APIs. Also avoid exposing internal implementations details.
--v1->v2:
- add back the adev->pm.dpm_enabled check(Lijo)
--- .../gpu/drm/amd/include/kgd_pp_interface.h | 2 +- drivers/gpu/drm/amd/pm/Makefile | 2 +- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 202 ++---------------- drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c | 94 ++++++++ drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 2 - .../gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h | 32 +++ .../gpu/drm/amd/pm/powerplay/amd_powerplay.c | 39 +++- drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c | 6 +- drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.c | 60 +++++- drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.h | 3 +- drivers/gpu/drm/amd/pm/powerplay/si_dpm.c | 41 +++- 11 files changed, 289 insertions(+), 194 deletions(-) create mode 100644 drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c create mode 100644 drivers/gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h
drivers/gpu/drm/amd/include/kgd_pp_interface.h +1 -1
@@ -404,7 +404,7 @@ struct amd_pm_funcs {int (*get_dpm_clock_table)(void *handle,struct dpm_clocks *clock_table);int (*get_smu_prv_buf_details)(void *handle,void **addr,size_t *size); -int (*change_power_state)(void *handle); +void (*pm_compute_clocks)(void *handle); };struct metrics_table_header {
drivers/gpu/drm/amd/pm/Makefile +1 -1
@@ -40,7 +40,7 @@ AMD_PM = $(addsuffix /Makefile,$(addprefix $(FULL_AMD_PATH)/pm/,$(PM_LIBS))) include $(AMD_PM) -PM_MGR = amdgpu_dpm.o amdgpu_pm.o +PM_MGR = amdgpu_dpm.o amdgpu_pm.o amdgpu_dpm_internal.o AMD_PM_POWER = $(addprefix $(AMD_PM_PATH)/,$(PM_MGR))
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +22 -180
234 lines not on this page · raw message
drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c new file +94 -0
94 lines not on this page · raw message
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h +0 -2
@@ -420,8 +420,6 @@ void amdgpu_pm_acpi_event_handler(struct amdgpu_device *adev);int amdgpu_dpm_read_sensor (struct amdgpu_device *adev,enum amd_pp_sensors sensor,void *data,uint32_t *size); -void amdgpu_dpm_thermal_work_handler (struct work_struct *work); -void amdgpu_dpm_compute_clocks (struct amdgpu_device *adev);void amdgpu_dpm_enable_uvd (struct amdgpu_device *adev,bool enable);void amdgpu_dpm_enable_vce (struct amdgpu_device *adev,bool enable);
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h new file +32 -0
@@ -0,0 +1,32 @@ +/* +* Copyright 2021 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 __AMDGPU_DPM_INTERNAL_H__ +#define __AMDGPU_DPM_INTERNAL_H__ + +void amdgpu_dpm_get_active_displays (struct amdgpu_device *adev); + +u32 amdgpu_dpm_get_vblank_time (struct amdgpu_device *adev); + +u32 amdgpu_dpm_get_vrefresh (struct amdgpu_device *adev); + +#endif
drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c +38 -1
@@ -31,7 +31,8 @@#include "power_state.h" #include "amdgpu.h" #include "hwmgr.h" - +#include "amdgpu_dpm_internal.h" +#include "amdgpu_display.h" static const struct amd_pm_funcs pp_dpm_funcs;
@@ -1678,6 +1679,41 @@ static int pp_get_prv_buffer_details(void *handle, void **addr, size_t *size)return 0 ; } +static void pp_pm_compute_clocks (void *handle) +{ +struct pp_hwmgr *hwmgr = handle; +struct amdgpu_device *adev = hwmgr->adev; +int i =0 ; + +if (adev->mode_info.num_crtc) +amdgpu_display_bandwidth_update (adev); + +for (i =0 ; i <AMDGPU_MAX_RINGS ; i++) { +struct amdgpu_ring *ring = adev->rings[i]; +if (ring && ring->sched.ready) +amdgpu_fence_wait_empty (ring); + } + +if (!amdgpu_device_has_dc_support (adev)) { +amdgpu_dpm_get_active_displays (adev); + adev->pm.pm_display_cfg.num_display = adev->pm.dpm.new_active_crtc_count; + adev->pm.pm_display_cfg.vrefresh =amdgpu_dpm_get_vrefresh (adev); + adev->pm.pm_display_cfg.min_vblank_time =amdgpu_dpm_get_vblank_time (adev); +/* we have issues with mclk switching with +* refresh rates over 120 hz on the non-DC code. +*/ +if (adev->pm.pm_display_cfg.vrefresh >120 ) + adev->pm.pm_display_cfg.min_vblank_time =0 ; + +pp_display_configuration_change (handle, + &adev->pm.pm_display_cfg); + } + +pp_dpm_dispatch_tasks (handle, +AMD_PP_TASK_DISPLAY_CONFIG_CHANGE , +NULL ); +} +static const struct amd_pm_funcs pp_dpm_funcs = { .load_firmware = pp_dpm_load_fw, .wait_for_fw_loading_complete = pp_dpm_fw_loading_complete,
@@ -1742,4 +1778,5 @@ static const struct amd_pm_funcs pp_dpm_funcs = { .get_gpu_metrics = pp_get_gpu_metrics, .gfx_state_change_set = pp_gfx_state_change_set, .get_smu_prv_buf_details = pp_get_prv_buffer_details, + .pm_compute_clocks = pp_pm_compute_clocks, };
drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c +3 -3
@@ -3088,7 +3088,7 @@ static int kv_dpm_hw_init(void *handle)else adev->pm.dpm_enabled = true;mutex_unlock (&adev->pm.mutex); -amdgpu_dpm_compute_clocks (adev); +amdgpu_legacy_dpm_compute_clocks (adev);return ret; }
@@ -3136,7 +3136,7 @@ static int kv_dpm_resume(void *handle) adev->pm.dpm_enabled = true;mutex_unlock (&adev->pm.mutex);if (adev->pm.dpm_enabled) -amdgpu_dpm_compute_clocks (adev); +amdgpu_legacy_dpm_compute_clocks (adev); }return 0 ; }
@@ -3390,7 +3390,7 @@ static const struct amd_pm_funcs kv_dpm_funcs = { .get_vce_clock_state = amdgpu_get_vce_clock_state, .check_state_equal = kv_check_state_equal, .read_sensor = &kv_dpm_read_sensor, - .change_power_state = amdgpu_dpm_change_power_state_locked, + .pm_compute_clocks = amdgpu_legacy_dpm_compute_clocks, };static const struct amdgpu_irq_src_funcs kv_dpm_irq_funcs = {
drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.c +58 -2
76 lines not on this page · raw message
drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.h +2 -1
@@ -32,6 +32,7 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev);void amdgpu_free_extended_power_table (struct amdgpu_device *adev);void amdgpu_add_thermal_controller (struct amdgpu_device *adev);struct amd_vce_state *amdgpu_get_vce_clock_state (void *handle,u32 idx); -int amdgpu_dpm_change_power_state_locked (void *handle);void amdgpu_pm_print_power_states (struct amdgpu_device *adev); +void amdgpu_legacy_dpm_compute_clocks (void *handle); +void amdgpu_dpm_thermal_work_handler (struct work_struct *work);#endif
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +38 -3
71 lines not on this page · raw message
Signature · 1 line
2.29.0
PATCH v5 10/16 drm/amd/pm: move those code piece used by Stoney only to smu8_hwmgr.c
In reply to Evan QuanInstead of putting them in amdgpu_dpm.c.
--- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 14 -------------- drivers/gpu/drm/amd/pm/inc/hwmgr.h | 3 --- .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 10 +++++++++- 3 files changed, 9 insertions(+), 18 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0 -14
@@ -32,8 +32,6 @@#include "hwmgr.h" #include <linux/power_supply.h> -#define WIDTH_4K 3840 -#define amdgpu_dpm_enable_bapm (adev, e) \ ((adev)->powerplay.pp_funcs->enable_bapm((adev)->powerplay.pp_handle, (e)))
@@ -386,18 +384,6 @@ void amdgpu_dpm_enable_uvd(struct amdgpu_device *adev, bool enable)if (ret)DRM_ERROR ("Dpm %s uvd failed, ret = %d. \n" , enable ?"enable" :"disable" , ret); - -/* enable/disable Low Memory PState for UVD (4k videos) */ -if (adev->asic_type ==CHIP_STONEY && - adev->uvd.decode_image_width >=WIDTH_4K ) { -struct pp_hwmgr *hwmgr = adev->powerplay.pp_handle; - -if (hwmgr && hwmgr->hwmgr_func && - hwmgr->hwmgr_func->update_nbdpm_pstate) - hwmgr->hwmgr_func->update_nbdpm_pstate (hwmgr, - !enable, - true); - } }void amdgpu_dpm_enable_vce (struct amdgpu_device *adev,bool enable)
drivers/gpu/drm/amd/pm/inc/hwmgr.h +0 -3
@@ -331,9 +331,6 @@ struct pp_hwmgr_func {uint32_t mc_addr_low, uint32_t mc_addr_hi, uint32_t size); -int (*update_nbdpm_pstate)(struct pp_hwmgr *hwmgr, -bool enable, -bool lock);int (*get_thermal_temperature_range)(struct pp_hwmgr *hwmgr,struct PP_TemperatureRange *range);int (*get_power_profile_mode)(struct pp_hwmgr *hwmgr,char *buf);
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c +9 -1
@@ -1950,9 +1950,12 @@ static void smu8_dpm_powergate_acp(struct pp_hwmgr *hwmgr, bool bgate)smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ACPPowerON,NULL ); } +#define WIDTH_4K 3840 +static void smu8_dpm_powergate_uvd (struct pp_hwmgr *hwmgr,bool bgate) {struct smu8_hwmgr *data = hwmgr->backend; +struct amdgpu_device *adev = hwmgr->adev; data->uvd_power_gated = bgate;
@@ -1976,6 +1979,12 @@ static void smu8_dpm_powergate_uvd(struct pp_hwmgr *hwmgr, bool bgate)smu8_dpm_update_uvd_dpm (hwmgr, false); } +/* enable/disable Low Memory PState for UVD (4k videos) */ +if (adev->asic_type ==CHIP_STONEY && + adev->uvd.decode_image_width >=WIDTH_4K ) +smu8_nbdpm_pstate_enable_disable (hwmgr, + bgate, + true); }static void smu8_dpm_powergate_vce (struct pp_hwmgr *hwmgr,bool bgate)
@@ -2037,7 +2046,6 @@ static const struct pp_hwmgr_func smu8_hwmgr_funcs = { .power_state_set = smu8_set_power_state_tasks, .dynamic_state_management_disable = smu8_disable_dpm_tasks, .notify_cac_buffer_info = smu8_notify_cac_buffer_info, - .update_nbdpm_pstate = smu8_nbdpm_pstate_enable_disable, .get_thermal_temperature_range = smu8_get_thermal_temperature_range, };
Signature · 1 line
2.29.0
PATCH v5 11/16 drm/amd/pm: drop redundant or unused APIs and data structures
In reply to Evan QuanDrop those unused APIs and data structures.
--- drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 49 ------------------------- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 4 ++ 2 files changed, 4 insertions(+), 49 deletions(-)
drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h +0 -49
@@ -88,19 +88,6 @@ struct amdgpu_dpm_thermal {struct amdgpu_irq_src irq; }; -enum amdgpu_clk_action -{ -AMDGPU_SCLK_UP =1 , -AMDGPU_SCLK_DOWN -}; - -struct amdgpu_blacklist_clocks -{ -u32 sclk; -u32 mclk; -enum amdgpu_clk_action action; -}; -struct amdgpu_clock_and_voltage_limits {u32 sclk;u32 mclk;
@@ -239,10 +226,6 @@ struct amdgpu_dpm_fan {bool ucode_fan_control; }; -#define amdgpu_dpm_reset_power_profile_state (adev, request) \ - ((adev)->powerplay.pp_funcs->reset_power_profile_state(\ - (adev)->powerplay.pp_handle, request)) -struct amdgpu_dpm {struct amdgpu_ps *ps;/* number of valid power states */
@@ -339,35 +322,6 @@ struct amdgpu_pm {bool pp_force_state_enabled; }; -#define R600_SSTU_DFLT 0 -#define R600_SST_DFLT 0x00C8 - -/* XXX are these ok? */ -#define R600_TEMP_RANGE_MIN (90 * 1000) -#define R600_TEMP_RANGE_MAX (120 * 1000) - -#define FDO_PWM_MODE_STATIC 1 -#define FDO_PWM_MODE_STATIC_RPM 5 - -enum amdgpu_td { -AMDGPU_TD_AUTO , -AMDGPU_TD_UP , -AMDGPU_TD_DOWN , -}; - -enum amdgpu_display_watermark { -AMDGPU_DISPLAY_WATERMARK_LOW =0 , -AMDGPU_DISPLAY_WATERMARK_HIGH =1 , -}; - -enum amdgpu_display_gap -{ -AMDGPU_PM_DISPLAY_GAP_VBLANK_OR_WM =0 , -AMDGPU_PM_DISPLAY_GAP_VBLANK =1 , -AMDGPU_PM_DISPLAY_GAP_WATERMARK =2 , -AMDGPU_PM_DISPLAY_GAP_IGNORE =3 , -}; -u32 amdgpu_dpm_get_vblank_time (struct amdgpu_device *adev);int amdgpu_dpm_read_sensor (struct amdgpu_device *adev,enum amd_pp_sensors sensor,void *data,uint32_t *size);
@@ -417,9 +371,6 @@ int amdgpu_dpm_smu_i2c_bus_access(struct amdgpu_device *adev,void amdgpu_pm_acpi_event_handler (struct amdgpu_device *adev); -int amdgpu_dpm_read_sensor (struct amdgpu_device *adev,enum amd_pp_sensors sensor, -void *data,uint32_t *size); -void amdgpu_dpm_compute_clocks (struct amdgpu_device *adev);void amdgpu_dpm_enable_uvd (struct amdgpu_device *adev,bool enable);void amdgpu_dpm_enable_vce (struct amdgpu_device *adev,bool enable);
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h +4 -0
@@ -26,6 +26,10 @@#include "amdgpu_smu.h" #if defined(SWSMU_CODE_LAYER_L2 ) || defined(SWSMU_CODE_LAYER_L3 ) || defined(SWSMU_CODE_LAYER_L4 ) + +#define FDO_PWM_MODE_STATIC 1 +#define FDO_PWM_MODE_STATIC_RPM 5 +int smu_cmn_send_msg_without_waiting (struct smu_context *smu,uint16_t msg_index,uint32_t param);
Signature · 1 line
2.29.0
PATCH v5 12/16 drm/amd/pm: do not expose the smu_context structure used internally in power
In reply to Evan QuanThis can cover the power implementation details. And as what did for powerplay framework, we hook the smu_context to adev->powerplay.pp_handle.
--v1->v2:
- drop smu_ppt_limit_type used internally from kgd_pp_interface.h(Lijo)
- drop the smu_send_hbm_bad_pages_num() change which can be combined into the patch ahead(Lijo)
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 --- .../gpu/drm/amd/include/kgd_pp_interface.h | 3 ++ drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 50 +++++++++++++------ drivers/gpu/drm/amd/pm/amdgpu_pm.c | 2 +- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 4 -- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 48 +++++++++++------- .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 9 ++-- .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 9 ++-- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 9 ++-- .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 4 +- .../drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 9 ++-- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 8 +-- 12 files changed, 94 insertions(+), 67 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -6
@@ -99,7 +99,6 @@#include "amdgpu_gem.h" #include "amdgpu_doorbell.h" #include "amdgpu_amdkfd.h" -#include "amdgpu_smu.h" #include "amdgpu_discovery.h" #include "amdgpu_mes.h" #include "amdgpu_umc.h"
@@ -953,11 +952,6 @@ struct amdgpu_device {/* powerplay */ struct amd_powerplay powerplay; - -/* smu */ -struct smu_context smu; - -/* dpm */ struct amdgpu_pm pm;u32 cg_flags;u32 pg_flags;
drivers/gpu/drm/amd/include/kgd_pp_interface.h +3 -0
@@ -25,6 +25,9 @@#define __KGD_PP_INTERFACE_H__extern const struct amdgpu_ip_block_version pp_smu_ip_block; +extern const struct amdgpu_ip_block_version smu_v11_0_ip_block; +extern const struct amdgpu_ip_block_version smu_v12_0_ip_block; +extern const struct amdgpu_ip_block_version smu_v13_0_ip_block;enum smu_event_type {SMU_EVENT_RESET_COMPLETE =0 ,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +34 -16
158 lines not on this page · raw message
drivers/gpu/drm/amd/pm/amdgpu_pm.c +1 -1
@@ -2862,7 +2862,7 @@ static ssize_t amdgpu_hwmon_show_power_label(struct device *dev,int limit_type =to_sensor_dev_attr (attr)->index;return sysfs_emit (buf,"%s\n" , - limit_type ==SMU_FAST_PPT_LIMIT ?"fastPPT" :"slowPPT" ); + limit_type ==PP_PWR_TYPE_FAST ?"fastPPT" :"slowPPT" ); } static ssize_t amdgpu_hwmon_set_power_cap(struct device *dev,
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0 -4
@@ -1390,10 +1390,6 @@ int smu_mode1_reset(struct smu_context *smu);extern const struct amd_ip_funcs smu_ip_funcs; -extern const struct amdgpu_ip_block_version smu_v11_0_ip_block; -extern const struct amdgpu_ip_block_version smu_v12_0_ip_block; -extern const struct amdgpu_ip_block_version smu_v13_0_ip_block; -bool is_support_sw_smu (struct amdgpu_device *adev);bool is_support_cclk_dpm (struct amdgpu_device *adev);int smu_write_watermarks_table (struct smu_context *smu);
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +30 -18
168 lines not on this page · raw message
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +5 -4
@@ -2082,7 +2082,8 @@ static int arcturus_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msg, int num_msgs) {struct amdgpu_device *adev =to_amdgpu_device (i2c_adap); -struct smu_table_context *smu_table = &adev->smu.smu_table; +struct smu_context *smu = adev->powerplay.pp_handle; +struct smu_table_context *smu_table = &smu->smu_table;struct smu_table *table = &smu_table->driver_table;SwI2cRequest_t *req, *res = (SwI2cRequest_t *)table->cpu_addr;int i, j, r, c;
@@ -2128,9 +2129,9 @@ static int arcturus_i2c_xfer(struct i2c_adapter *i2c_adap, } } } -mutex_lock (&adev->smu.mutex); - r =smu_cmn_update_table (&adev->smu,SMU_TABLE_I2C_COMMANDS ,0 , req, true); -mutex_unlock (&adev->smu.mutex); +mutex_lock (&smu->mutex); + r =smu_cmn_update_table (smu,SMU_TABLE_I2C_COMMANDS ,0 , req, true); +mutex_unlock (&smu->mutex);if (r) goto fail;
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +5 -4
@@ -2779,7 +2779,8 @@ static int navi10_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msg, int num_msgs) {struct amdgpu_device *adev =to_amdgpu_device (i2c_adap); -struct smu_table_context *smu_table = &adev->smu.smu_table; +struct smu_context *smu = adev->powerplay.pp_handle; +struct smu_table_context *smu_table = &smu->smu_table;struct smu_table *table = &smu_table->driver_table;SwI2cRequest_t *req, *res = (SwI2cRequest_t *)table->cpu_addr;int i, j, r, c;
@@ -2825,9 +2826,9 @@ static int navi10_i2c_xfer(struct i2c_adapter *i2c_adap, } } } -mutex_lock (&adev->smu.mutex); - r =smu_cmn_update_table (&adev->smu,SMU_TABLE_I2C_COMMANDS ,0 , req, true); -mutex_unlock (&adev->smu.mutex); +mutex_lock (&smu->mutex); + r =smu_cmn_update_table (smu,SMU_TABLE_I2C_COMMANDS ,0 , req, true); +mutex_unlock (&smu->mutex);if (r) goto fail;
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +5 -4
@@ -3459,7 +3459,8 @@ static int sienna_cichlid_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msg, int num_msgs) {struct amdgpu_device *adev =to_amdgpu_device (i2c_adap); -struct smu_table_context *smu_table = &adev->smu.smu_table; +struct smu_context *smu = adev->powerplay.pp_handle; +struct smu_table_context *smu_table = &smu->smu_table;struct smu_table *table = &smu_table->driver_table;SwI2cRequest_t *req, *res = (SwI2cRequest_t *)table->cpu_addr;int i, j, r, c;
@@ -3505,9 +3506,9 @@ static int sienna_cichlid_i2c_xfer(struct i2c_adapter *i2c_adap, } } } -mutex_lock (&adev->smu.mutex); - r =smu_cmn_update_table (&adev->smu,SMU_TABLE_I2C_COMMANDS ,0 , req, true); -mutex_unlock (&adev->smu.mutex); +mutex_lock (&smu->mutex); + r =smu_cmn_update_table (smu,SMU_TABLE_I2C_COMMANDS ,0 , req, true); +mutex_unlock (&smu->mutex);if (r) goto fail;
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +2 -2
@@ -1372,7 +1372,7 @@ static int smu_v11_0_set_irq_state(struct amdgpu_device *adev,unsigned tyep, enum amdgpu_interrupt_state state) { - struct smu_context *smu = &adev->smu; + struct smu_context *smu = adev->powerplay.pp_handle;uint32_t low, high;uint32_t val =0 ;
@@ -1441,7 +1441,7 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,struct amdgpu_irq_src *source, struct amdgpu_iv_entry *entry) { - struct smu_context *smu = &adev->smu; + struct smu_context *smu = adev->powerplay.pp_handle;uint32_t client_id = entry->client_id;uint32_t src_id = entry->src_id;/*
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +5 -4
@@ -1484,7 +1484,8 @@ static int aldebaran_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msg, int num_msgs) {struct amdgpu_device *adev =to_amdgpu_device (i2c_adap); -struct smu_table_context *smu_table = &adev->smu.smu_table; +struct smu_context *smu = adev->powerplay.pp_handle; +struct smu_table_context *smu_table = &smu->smu_table;struct smu_table *table = &smu_table->driver_table;SwI2cRequest_t *req, *res = (SwI2cRequest_t *)table->cpu_addr;int i, j, r, c;
@@ -1530,9 +1531,9 @@ static int aldebaran_i2c_xfer(struct i2c_adapter *i2c_adap, } } } -mutex_lock (&adev->smu.mutex); - r =smu_cmn_update_table (&adev->smu,SMU_TABLE_I2C_COMMANDS ,0 , req, true); -mutex_unlock (&adev->smu.mutex); +mutex_lock (&smu->mutex); + r =smu_cmn_update_table (smu,SMU_TABLE_I2C_COMMANDS ,0 , req, true); +mutex_unlock (&smu->mutex);if (r) goto fail;
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +4 -4
@@ -1195,7 +1195,7 @@ static int smu_v13_0_set_irq_state(struct amdgpu_device *adev,unsigned tyep, enum amdgpu_interrupt_state state) { - struct smu_context *smu = &adev->smu; + struct smu_context *smu = adev->powerplay.pp_handle;uint32_t low, high;uint32_t val =0 ;
@@ -1270,7 +1270,7 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,struct amdgpu_irq_src *source, struct amdgpu_iv_entry *entry) { - struct smu_context *smu = &adev->smu; + struct smu_context *smu = adev->powerplay.pp_handle;uint32_t client_id = entry->client_id;uint32_t src_id = entry->src_id;/*
@@ -1316,11 +1316,11 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,switch (ctxid) {case 0x3 :dev_dbg (adev->dev,"Switched to AC mode!\n" ); -smu_v13_0_ack_ac_dc_interrupt (&adev->smu); +smu_v13_0_ack_ac_dc_interrupt (smu);break ;case 0x4 :dev_dbg (adev->dev,"Switched to DC mode!\n" ); -smu_v13_0_ack_ac_dc_interrupt (&adev->smu); +smu_v13_0_ack_ac_dc_interrupt (smu);break ;case 0x7 :/*
Signature · 1 line
2.29.0
PATCH v5 13/16 drm/amd/pm: relocate the power related headers
In reply to Evan QuanInstead of centralizing all headers in the same folder. Separate them into different folders and place them among those source files those who really need them.
--v1->v2:
- create separate holders for driver_if and ppsmc headers(Lijo)
---
drivers/gpu/drm/amd/pm/Makefile | 12 ++++---
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile | 32 +++++++++++++++++++
.../pm/{powerplay => legacy-dpm}/cik_dpm.h | 0
.../amd/pm/{powerplay => legacy-dpm}/kv_dpm.c | 0
.../amd/pm/{powerplay => legacy-dpm}/kv_dpm.h | 0
.../amd/pm/{powerplay => legacy-dpm}/kv_smc.c | 0
.../pm/{powerplay => legacy-dpm}/legacy_dpm.c | 0
.../pm/{powerplay => legacy-dpm}/legacy_dpm.h | 0
.../amd/pm/{powerplay => legacy-dpm}/ppsmc.h | 0
.../pm/{powerplay => legacy-dpm}/r600_dpm.h | 0
.../amd/pm/{powerplay => legacy-dpm}/si_dpm.c | 0
.../amd/pm/{powerplay => legacy-dpm}/si_dpm.h | 0
.../amd/pm/{powerplay => legacy-dpm}/si_smc.c | 0
.../{powerplay => legacy-dpm}/sislands_smc.h | 0
drivers/gpu/drm/amd/pm/powerplay/Makefile | 6 +---
.../pm/{ => powerplay}/inc/amd_powerplay.h | 0
.../drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h | 0
.../amd/pm/{ => powerplay}/inc/fiji_ppsmc.h | 0
.../pm/{ => powerplay}/inc/hardwaremanager.h | 0
.../drm/amd/pm/{ => powerplay}/inc/hwmgr.h | 0
.../{ => powerplay}/inc/polaris10_pwrvirus.h | 0
.../amd/pm/{ => powerplay}/inc/power_state.h | 0
.../drm/amd/pm/{ => powerplay}/inc/pp_debug.h | 0
.../amd/pm/{ => powerplay}/inc/pp_endian.h | 0
.../amd/pm/{ => powerplay}/inc/pp_thermal.h | 0
.../amd/pm/{ => powerplay}/inc/ppinterrupt.h | 0
.../drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h | 0
.../drm/amd/pm/{ => powerplay}/inc/smu10.h | 0
.../pm/{ => powerplay}/inc/smu10_driver_if.h | 0
.../pm/{ => powerplay}/inc/smu11_driver_if.h | 0
.../gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h | 0
.../drm/amd/pm/{ => powerplay}/inc/smu71.h | 0
.../pm/{ => powerplay}/inc/smu71_discrete.h | 0
.../drm/amd/pm/{ => powerplay}/inc/smu72.h | 0
.../pm/{ => powerplay}/inc/smu72_discrete.h | 0
.../drm/amd/pm/{ => powerplay}/inc/smu73.h | 0
.../pm/{ => powerplay}/inc/smu73_discrete.h | 0
.../drm/amd/pm/{ => powerplay}/inc/smu74.h | 0
.../pm/{ => powerplay}/inc/smu74_discrete.h | 0
.../drm/amd/pm/{ => powerplay}/inc/smu75.h | 0
.../pm/{ => powerplay}/inc/smu75_discrete.h | 0
.../amd/pm/{ => powerplay}/inc/smu7_common.h | 0
.../pm/{ => powerplay}/inc/smu7_discrete.h | 0
.../amd/pm/{ => powerplay}/inc/smu7_fusion.h | 0
.../amd/pm/{ => powerplay}/inc/smu7_ppsmc.h | 0
.../gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h | 0
.../amd/pm/{ => powerplay}/inc/smu8_fusion.h | 0
.../gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h | 0
.../pm/{ => powerplay}/inc/smu9_driver_if.h | 0
.../{ => powerplay}/inc/smu_ucode_xfer_cz.h | 0
.../{ => powerplay}/inc/smu_ucode_xfer_vi.h | 0
.../drm/amd/pm/{ => powerplay}/inc/smumgr.h | 0
.../amd/pm/{ => powerplay}/inc/tonga_ppsmc.h | 0
.../amd/pm/{ => powerplay}/inc/vega10_ppsmc.h | 0
.../inc/vega12/smu9_driver_if.h | 0
.../amd/pm/{ => powerplay}/inc/vega12_ppsmc.h | 0
.../amd/pm/{ => powerplay}/inc/vega20_ppsmc.h | 0
.../drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h | 0
.../inc/interface}/smu11_driver_if_arcturus.h | 0
.../smu11_driver_if_cyan_skillfish.h | 0
.../inc/interface}/smu11_driver_if_navi10.h | 0
.../smu11_driver_if_sienna_cichlid.h | 0
.../inc/interface}/smu11_driver_if_vangogh.h | 0
.../inc/interface}/smu12_driver_if.h | 0
.../interface}/smu13_driver_if_aldebaran.h | 0
.../interface}/smu13_driver_if_yellow_carp.h | 0
.../inc/interface}/smu_v11_5_pmfw.h | 0
.../inc/interface}/smu_v11_8_pmfw.h | 0
.../inc/interface}/smu_v13_0_1_pmfw.h | 0
.../inc/message}/aldebaran_ppsmc.h | 0
.../inc/message}/arcturus_ppsmc.h | 0
.../inc/message}/smu_v11_0_7_ppsmc.h | 0
.../inc/message}/smu_v11_0_ppsmc.h | 0
.../inc/message}/smu_v11_5_ppsmc.h | 0
.../inc/message}/smu_v11_8_ppsmc.h | 0
.../inc/message}/smu_v12_0_ppsmc.h | 0
.../inc/message}/smu_v13_0_1_ppsmc.h | 0
.../pm/{ => swsmu}/inc/smu_11_0_cdr_table.h | 0
.../drm/amd/pm/{ => swsmu}/inc/smu_types.h | 0
.../drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h | 0
.../pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h | 0
.../pm/{ => swsmu}/inc/smu_v11_0_pptable.h | 0
.../drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h | 0
.../drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h | 0
.../pm/{ => swsmu}/inc/smu_v13_0_pptable.h | 0
.../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 1 -
.../drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 1 -
87 files changed, 41 insertions(+), 11 deletions(-)
create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/Makefile
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/cik_dpm.h (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.c (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.h (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_smc.c (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/legacy_dpm.c (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/legacy_dpm.h (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/r600_dpm.h (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.c (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.h (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_smc.c (100%)
rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/sislands_smc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/amd_powerplay.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/fiji_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/hardwaremanager.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/hwmgr.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/polaris10_pwrvirus.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/power_state.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_debug.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_endian.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_thermal.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/ppinterrupt.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu10.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu10_driver_if.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu11_driver_if.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71_discrete.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72_discrete.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73_discrete.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74_discrete.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75_discrete.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_common.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_discrete.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_fusion.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8_fusion.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9_driver_if.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu_ucode_xfer_cz.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu_ucode_xfer_vi.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smumgr.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/tonga_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega10_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega12/smu9_driver_if.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega12_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega20_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu11_driver_if_arcturus.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu11_driver_if_cyan_skillfish.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu11_driver_if_navi10.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu11_driver_if_sienna_cichlid.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu11_driver_if_vangogh.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu12_driver_if.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu13_driver_if_aldebaran.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu13_driver_if_yellow_carp.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu_v11_5_pmfw.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu_v11_8_pmfw.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu_v13_0_1_pmfw.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/aldebaran_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/arcturus_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/smu_v11_0_7_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/smu_v11_0_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/smu_v11_5_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/smu_v11_8_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/smu_v12_0_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/smu_v13_0_1_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_11_0_cdr_table.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_types.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0_pptable.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0_pptable.h (100%)drivers/gpu/drm/amd/pm/Makefile +8 -4
@@ -21,20 +21,24 @@ # subdir-ccflags-y += \ - -I$(FULL_AMD_PATH)/pm/inc/ \ -I$(FULL_AMD_PATH)/include/asic_reg \ -I$(FULL_AMD_PATH)/include \ + -I$(FULL_AMD_PATH)/pm/inc/ \ -I$(FULL_AMD_PATH)/pm/swsmu \ + -I$(FULL_AMD_PATH)/pm/swsmu/inc \ + -I$(FULL_AMD_PATH)/pm/swsmu/inc/interface \ + -I$(FULL_AMD_PATH)/pm/swsmu/inc/message \ -I$(FULL_AMD_PATH)/pm/swsmu/smu11 \ -I$(FULL_AMD_PATH)/pm/swsmu/smu12 \ -I$(FULL_AMD_PATH)/pm/swsmu/smu13 \ - -I$(FULL_AMD_PATH)/pm/powerplay \ + -I$(FULL_AMD_PATH)/pm/powerplay/inc \ -I$(FULL_AMD_PATH)/pm/powerplay/smumgr\ - -I$(FULL_AMD_PATH)/pm/powerplay/hwmgr + -I$(FULL_AMD_PATH)/pm/powerplay/hwmgr \ + -I$(FULL_AMD_PATH)/pm/legacy-dpm AMD_PM_PATH = ../pm -PM_LIBS = swsmu powerplay +PM_LIBS = swsmu powerplay legacy-dpm AMD_PM = $(addsuffix /Makefile,$(addprefix $(FULL_AMD_PATH)/pm/,$(PM_LIBS)))
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +32 -0
@@ -0,0 +1,32 @@ +# +# Copyright 2021 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. +# + +AMD_LEGACYDPM_PATH = ../pm/legacy-dpm + +LEGACYDPM_MGR-y = legacy_dpm.o + +LEGACYDPM_MGR-$(CONFIG_DRM_AMDGPU_CIK)+= kv_dpm.o kv_smc.o +LEGACYDPM_MGR-$(CONFIG_DRM_AMDGPU_SI)+= si_dpm.o si_smc.o + +AMD_LEGACYDPM_POWER = $(addprefix $(AMD_LEGACYDPM_PATH)/,$(LEGACYDPM_MGR-y)) + +AMD_POWERPLAY_FILES += $(AMD_LEGACYDPM_POWER)
drivers/gpu/drm/amd/pm/legacy-dpm/cik_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/cik_dpm.h +0 -0
drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c renamed from drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c +0 -0
drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/kv_dpm.h +0 -0
drivers/gpu/drm/amd/pm/legacy-dpm/kv_smc.c renamed from drivers/gpu/drm/amd/pm/powerplay/kv_smc.c +0 -0
drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c renamed from drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.c +0 -0
drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.h +0 -0
drivers/gpu/drm/amd/pm/legacy-dpm/ppsmc.h renamed from drivers/gpu/drm/amd/pm/powerplay/ppsmc.h +0 -0
drivers/gpu/drm/amd/pm/legacy-dpm/r600_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/r600_dpm.h +0 -0
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c renamed from drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +0 -0
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/si_dpm.h +0 -0
drivers/gpu/drm/amd/pm/legacy-dpm/si_smc.c renamed from drivers/gpu/drm/amd/pm/powerplay/si_smc.c +0 -0
drivers/gpu/drm/amd/pm/legacy-dpm/sislands_smc.h renamed from drivers/gpu/drm/amd/pm/powerplay/sislands_smc.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/Makefile +1 -5
@@ -28,11 +28,7 @@ AMD_POWERPLAY = $(addsuffix /Makefile,$(addprefix $(FULL_AMD_PATH)/pm/powerplay/ include $(AMD_POWERPLAY) -POWER_MGR-y = amd_powerplay.o legacy_dpm.o - -POWER_MGR-$(CONFIG_DRM_AMDGPU_CIK)+= kv_dpm.o kv_smc.o - -POWER_MGR-$(CONFIG_DRM_AMDGPU_SI)+= si_dpm.o si_smc.o +POWER_MGR-y = amd_powerplay.o AMD_PP_POWER = $(addprefix $(AMD_PP_PATH)/,$(POWER_MGR-y))
drivers/gpu/drm/amd/pm/powerplay/inc/amd_powerplay.h renamed from drivers/gpu/drm/amd/pm/inc/amd_powerplay.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/cz_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/cz_ppsmc.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/fiji_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/fiji_ppsmc.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/hardwaremanager.h renamed from drivers/gpu/drm/amd/pm/inc/hardwaremanager.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h renamed from drivers/gpu/drm/amd/pm/inc/hwmgr.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/polaris10_pwrvirus.h renamed from drivers/gpu/drm/amd/pm/inc/polaris10_pwrvirus.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/power_state.h renamed from drivers/gpu/drm/amd/pm/inc/power_state.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/pp_debug.h renamed from drivers/gpu/drm/amd/pm/inc/pp_debug.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/pp_endian.h renamed from drivers/gpu/drm/amd/pm/inc/pp_endian.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/pp_thermal.h renamed from drivers/gpu/drm/amd/pm/inc/pp_thermal.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/ppinterrupt.h renamed from drivers/gpu/drm/amd/pm/inc/ppinterrupt.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/rv_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/rv_ppsmc.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu10.h renamed from drivers/gpu/drm/amd/pm/inc/smu10.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu10_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/smu10_driver_if.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu11_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/smu11_driver_if.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu7.h renamed from drivers/gpu/drm/amd/pm/inc/smu7.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu71.h renamed from drivers/gpu/drm/amd/pm/inc/smu71.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu71_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu71_discrete.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu72.h renamed from drivers/gpu/drm/amd/pm/inc/smu72.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu72_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu72_discrete.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu73.h renamed from drivers/gpu/drm/amd/pm/inc/smu73.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu73_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu73_discrete.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu74.h renamed from drivers/gpu/drm/amd/pm/inc/smu74.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu74_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu74_discrete.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu75.h renamed from drivers/gpu/drm/amd/pm/inc/smu75.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu75_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu75_discrete.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu7_common.h renamed from drivers/gpu/drm/amd/pm/inc/smu7_common.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu7_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu7_discrete.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu7_fusion.h renamed from drivers/gpu/drm/amd/pm/inc/smu7_fusion.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu7_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu7_ppsmc.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu8.h renamed from drivers/gpu/drm/amd/pm/inc/smu8.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu8_fusion.h renamed from drivers/gpu/drm/amd/pm/inc/smu8_fusion.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu9.h renamed from drivers/gpu/drm/amd/pm/inc/smu9.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu9_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/smu9_driver_if.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu_ucode_xfer_cz.h renamed from drivers/gpu/drm/amd/pm/inc/smu_ucode_xfer_cz.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smu_ucode_xfer_vi.h renamed from drivers/gpu/drm/amd/pm/inc/smu_ucode_xfer_vi.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/smumgr.h renamed from drivers/gpu/drm/amd/pm/inc/smumgr.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/tonga_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/tonga_ppsmc.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/vega10_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/vega10_ppsmc.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/vega12/smu9_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/vega12/smu9_driver_if.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/vega12_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/vega12_ppsmc.h +0 -0
drivers/gpu/drm/amd/pm/powerplay/inc/vega20_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/vega20_ppsmc.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h renamed from drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_arcturus.h renamed from drivers/gpu/drm/amd/pm/inc/smu11_driver_if_arcturus.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_cyan_skillfish.h renamed from drivers/gpu/drm/amd/pm/inc/smu11_driver_if_cyan_skillfish.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_navi10.h renamed from drivers/gpu/drm/amd/pm/inc/smu11_driver_if_navi10.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_sienna_cichlid.h renamed from drivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_vangogh.h renamed from drivers/gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu12_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/smu12_driver_if.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu13_driver_if_aldebaran.h renamed from drivers/gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu13_driver_if_yellow_carp.h renamed from drivers/gpu/drm/amd/pm/inc/smu13_driver_if_yellow_carp.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v11_5_pmfw.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_5_pmfw.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v11_8_pmfw.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_8_pmfw.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v13_0_1_pmfw.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_pmfw.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/message/aldebaran_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/message/arcturus_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/arcturus_ppsmc.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_0_7_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_7_ppsmc.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_0_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_ppsmc.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_5_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_8_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_8_ppsmc.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v12_0_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v12_0_ppsmc.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v13_0_1_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_ppsmc.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/smu_11_0_cdr_table.h renamed from drivers/gpu/drm/amd/pm/inc/smu_11_0_cdr_table.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h renamed from drivers/gpu/drm/amd/pm/inc/smu_types.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_7_pptable.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_7_pptable.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_pptable.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_pptable.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v12_0.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v12_0.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v13_0.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0_pptable.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v13_0_pptable.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +0 -1
@@ -33,7 +33,6 @@#include "smu11_driver_if_arcturus.h" #include "soc15_common.h" #include "atom.h" -#include "power_state.h" #include "arcturus_ppt.h" #include "smu_v11_0_pptable.h" #include "arcturus_ppsmc.h"
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +0 -1
@@ -33,7 +33,6 @@#include "smu13_driver_if_aldebaran.h" #include "soc15_common.h" #include "atom.h" -#include "power_state.h" #include "aldebaran_ppt.h" #include "smu_v13_0_pptable.h" #include "aldebaran_ppsmc.h"
Signature · 1 line
2.29.0
Re: [PATCH V5 13/16] drm/amd/pm: relocate the power related headers
Quoted 165 lines · Evan Quan
Instead of centralizing all headers in the same folder. Separate them into different folders and place them among those source files those who really need them.
Signed-off-by Evan Quan <[email protected]>Change-Id Id74cb4c7006327ca7ecd22daf17321e417c4aa71--
v1->v2:
- create separate holders fordriver_ifand ppsmc headers(Lijo)--- drivers/gpu/drm/amd/pm/Makefile | 12 ++++--- drivers/gpu/drm/amd/pm/legacy-dpm/Makefile | 32 +++++++++++++++++++ .../pm/{powerplay => legacy-dpm}/cik_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/kv_dpm.c | 0 .../amd/pm/{powerplay => legacy-dpm}/kv_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/kv_smc.c | 0 .../pm/{powerplay => legacy-dpm}/legacy_dpm.c | 0 .../pm/{powerplay => legacy-dpm}/legacy_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/ppsmc.h | 0 .../pm/{powerplay => legacy-dpm}/r600_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/si_dpm.c | 0 .../amd/pm/{powerplay => legacy-dpm}/si_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/si_smc.c | 0 .../{powerplay => legacy-dpm}/sislands_smc.h | 0 drivers/gpu/drm/amd/pm/powerplay/Makefile | 6 +--- .../pm/{ => powerplay}/inc/amd_powerplay.h | 0 .../drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h | 0 .../amd/pm/{ => powerplay}/inc/fiji_ppsmc.h | 0 .../pm/{ => powerplay}/inc/hardwaremanager.h | 0 .../drm/amd/pm/{ => powerplay}/inc/hwmgr.h | 0 .../{ => powerplay}/inc/polaris10_pwrvirus.h | 0 .../amd/pm/{ => powerplay}/inc/power_state.h | 0 .../drm/amd/pm/{ => powerplay}/inc/pp_debug.h | 0 .../amd/pm/{ => powerplay}/inc/pp_endian.h | 0 .../amd/pm/{ => powerplay}/inc/pp_thermal.h | 0 .../amd/pm/{ => powerplay}/inc/ppinterrupt.h | 0 .../drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu10.h | 0 .../pm/{ => powerplay}/inc/smu10_driver_if.h | 0 .../pm/{ => powerplay}/inc/smu11_driver_if.h | 0 .../gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu71.h | 0 .../pm/{ => powerplay}/inc/smu71_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu72.h | 0 .../pm/{ => powerplay}/inc/smu72_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu73.h | 0 .../pm/{ => powerplay}/inc/smu73_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu74.h | 0 .../pm/{ => powerplay}/inc/smu74_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu75.h | 0 .../pm/{ => powerplay}/inc/smu75_discrete.h | 0 .../amd/pm/{ => powerplay}/inc/smu7_common.h | 0 .../pm/{ => powerplay}/inc/smu7_discrete.h | 0 .../amd/pm/{ => powerplay}/inc/smu7_fusion.h | 0 .../amd/pm/{ => powerplay}/inc/smu7_ppsmc.h | 0 .../gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h | 0 .../amd/pm/{ => powerplay}/inc/smu8_fusion.h | 0 .../gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h | 0 .../pm/{ => powerplay}/inc/smu9_driver_if.h | 0 .../{ => powerplay}/inc/smu_ucode_xfer_cz.h | 0 .../{ => powerplay}/inc/smu_ucode_xfer_vi.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smumgr.h | 0 .../amd/pm/{ => powerplay}/inc/tonga_ppsmc.h | 0 .../amd/pm/{ => powerplay}/inc/vega10_ppsmc.h | 0 .../inc/vega12/smu9_driver_if.h | 0 .../amd/pm/{ => powerplay}/inc/vega12_ppsmc.h | 0 .../amd/pm/{ => powerplay}/inc/vega20_ppsmc.h | 0 .../drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h | 0 .../inc/interface}/smu11_driver_if_arcturus.h | 0 .../smu11_driver_if_cyan_skillfish.h | 0 .../inc/interface}/smu11_driver_if_navi10.h | 0 .../smu11_driver_if_sienna_cichlid.h | 0 .../inc/interface}/smu11_driver_if_vangogh.h | 0 .../inc/interface}/smu12_driver_if.h | 0 .../interface}/smu13_driver_if_aldebaran.h | 0 .../interface}/smu13_driver_if_yellow_carp.h | 0 .../inc/interface}/smu_v11_5_pmfw.h | 0 .../inc/interface}/smu_v11_8_pmfw.h | 0 .../inc/interface}/smu_v13_0_1_pmfw.h | 0 .../inc/message}/aldebaran_ppsmc.h | 0 .../inc/message}/arcturus_ppsmc.h | 0 .../inc/message}/smu_v11_0_7_ppsmc.h | 0 .../inc/message}/smu_v11_0_ppsmc.h | 0 .../inc/message}/smu_v11_5_ppsmc.h | 0 .../inc/message}/smu_v11_8_ppsmc.h | 0 .../inc/message}/smu_v12_0_ppsmc.h | 0 .../inc/message}/smu_v13_0_1_ppsmc.h | 0 .../pm/{ => swsmu}/inc/smu_11_0_cdr_table.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_types.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h | 0 .../pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h | 0 .../pm/{ => swsmu}/inc/smu_v11_0_pptable.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h | 0 .../pm/{ => swsmu}/inc/smu_v13_0_pptable.h | 0 .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 1 - .../drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 1 - 87 files changed, 41 insertions(+), 11 deletions(-)create mode 100644
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/cik_dpm.h(100%)
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/kv_dpm.c(100%)
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/kv_dpm.h(100%)
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/kv_smc.c(100%)
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/legacy_dpm.c(100%)
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/legacy_dpm.h(100%)
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/ppsmc.h(100%)
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/r600_dpm.h(100%)
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/si_dpm.c(100%)
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/si_dpm.h(100%)
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/si_smc.c(100%)
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/sislands_smc.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/amd_powerplay.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/cz_ppsmc.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/fiji_ppsmc.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/hardwaremanager.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/hwmgr.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/polaris10_pwrvirus.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/power_state.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/pp_debug.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/pp_endian.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/pp_thermal.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/ppinterrupt.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/rv_ppsmc.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu10.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu10_driver_if.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu11_driver_if.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu7.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu71.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu71_discrete.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu72.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu72_discrete.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu73.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu73_discrete.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu74.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu74_discrete.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu75.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu75_discrete.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu7_common.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu7_discrete.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu7_fusion.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu7_ppsmc.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu8.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu8_fusion.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu9.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu9_driver_if.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu_ucode_xfer_cz.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu_ucode_xfer_vi.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smumgr.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/tonga_ppsmc.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/vega10_ppsmc.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/vega12/smu9_driver_if.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/vega12_ppsmc.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/vega20_ppsmc.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/amdgpu_smu.h(100%)
renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu11_driver_if_arcturus.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu11_driver_if_cyan_skillfish.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu11_driver_if_navi10.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu11_driver_if_sienna_cichlid.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu11_driver_if_vangogh.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu12_driver_if.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu13_driver_if_aldebaran.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu13_driver_if_yellow_carp.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu_v11_5_pmfw.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu_v11_8_pmfw.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu_v13_0_1_pmfw.h(100%)
Quoted 8 lines
rename
drivers/gpu/drm/amd/pm/{inc=>swsmu/inc/message}/aldebaran_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/message}/arcturus_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/message}/smu_v11_0_7_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/message}/smu_v11_0_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/message}/smu_v11_5_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/message}/smu_v11_8_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/message}/smu_v12_0_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/message}/smu_v13_0_1_ppsmc.h(100%)
I didn't mean to separate them to two different folders. Original intention was to group together FW headers as 'third party component' headers in a separate folder.
As another thought, 'interface' folder also looks good but for a different purpose - to keep the public API headers of swsmu and powerplay components to other components.
Thanks,
Lijo
Quoted 450 lines
rename
drivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_11_0_cdr_table.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_types.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v11_0.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v11_0_7_pptable.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v11_0_pptable.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v12_0.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v13_0.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v13_0_pptable.h(100%)drivers/gpu/drm/amd/pm/Makefile +8
-4@@ -21,20 +21,24 @@ # subdir-ccflags-y += \ - -I$(FULL_AMD_PATH)/pm/inc/ \ -I$(FULL_AMD_PATH)/include/asic_reg \ -I$(FULL_AMD_PATH)/include \ + -I$(FULL_AMD_PATH)/pm/inc/ \ -I$(FULL_AMD_PATH)/pm/swsmu \ + -I$(FULL_AMD_PATH)/pm/swsmu/inc \ + -I$(FULL_AMD_PATH)/pm/swsmu/inc/interface \ + -I$(FULL_AMD_PATH)/pm/swsmu/inc/message \ -I$(FULL_AMD_PATH)/pm/swsmu/smu11 \ -I$(FULL_AMD_PATH)/pm/swsmu/smu12 \ -I$(FULL_AMD_PATH)/pm/swsmu/smu13 \ - -I$(FULL_AMD_PATH)/pm/powerplay \ + -I$(FULL_AMD_PATH)/pm/powerplay/inc \ -I$(FULL_AMD_PATH)/pm/powerplay/smumgr\ - -I$(FULL_AMD_PATH)/pm/powerplay/hwmgr + -I$(FULL_AMD_PATH)/pm/powerplay/hwmgr \ + -I$(FULL_AMD_PATH)/pm/legacy-dpm AMD_PM_PATH = ../pm -PM_LIBS = swsmu powerplay +PM_LIBS = swsmu powerplay legacy-dpm AMD_PM = $(addsuffix /Makefile,$(addprefix $(FULL_AMD_PATH)/pm/,$(PM_LIBS)))drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +32
-0@@ -0,0 +1,32 @@ +# +# Copyright 2021 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. +# + +AMD_LEGACYDPM_PATH = ../pm/legacy-dpm + +LEGACYDPM_MGR-y = legacy_dpm.o + +LEGACYDPM_MGR-$(CONFIG_DRM_AMDGPU_CIK)+= kv_dpm.o kv_smc.o +LEGACYDPM_MGR-$(CONFIG_DRM_AMDGPU_SI)+= si_dpm.o si_smc.o + +AMD_LEGACYDPM_POWER = $(addprefix $(AMD_LEGACYDPM_PATH)/,$(LEGACYDPM_MGR-y)) + +AMD_POWERPLAY_FILES += $(AMD_LEGACYDPM_POWER)drivers/gpu/drm/amd/pm/legacy-dpm/cik_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/cik_dpm.h +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c renamed from drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/kv_dpm.h +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/kv_smc.c renamed from drivers/gpu/drm/amd/pm/powerplay/kv_smc.c +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c renamed from drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.c +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.h +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/ppsmc.h renamed from drivers/gpu/drm/amd/pm/powerplay/ppsmc.h +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/r600_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/r600_dpm.h +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c renamed from drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/si_dpm.h +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/si_smc.c renamed from drivers/gpu/drm/amd/pm/powerplay/si_smc.c +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/sislands_smc.h renamed from drivers/gpu/drm/amd/pm/powerplay/sislands_smc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/Makefile +1
-5@@ -28,11 +28,7 @@ AMD_POWERPLAY = $(addsuffix /Makefile,$(addprefix $(FULL_AMD_PATH)/pm/powerplay/ include $(AMD_POWERPLAY) -POWER_MGR-y = amd_powerplay.o legacy_dpm.o - -POWER_MGR-$(CONFIG_DRM_AMDGPU_CIK)+= kv_dpm.o kv_smc.o - -POWER_MGR-$(CONFIG_DRM_AMDGPU_SI)+= si_dpm.o si_smc.o +POWER_MGR-y = amd_powerplay.o AMD_PP_POWER = $(addprefix $(AMD_PP_PATH)/,$(POWER_MGR-y))drivers/gpu/drm/amd/pm/powerplay/inc/amd_powerplay.h renamed from drivers/gpu/drm/amd/pm/inc/amd_powerplay.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/cz_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/cz_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/fiji_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/fiji_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/hardwaremanager.h renamed from drivers/gpu/drm/amd/pm/inc/hardwaremanager.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h renamed from drivers/gpu/drm/amd/pm/inc/hwmgr.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/polaris10_pwrvirus.h renamed from drivers/gpu/drm/amd/pm/inc/polaris10_pwrvirus.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/power_state.h renamed from drivers/gpu/drm/amd/pm/inc/power_state.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/pp_debug.h renamed from drivers/gpu/drm/amd/pm/inc/pp_debug.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/pp_endian.h renamed from drivers/gpu/drm/amd/pm/inc/pp_endian.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/pp_thermal.h renamed from drivers/gpu/drm/amd/pm/inc/pp_thermal.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/ppinterrupt.h renamed from drivers/gpu/drm/amd/pm/inc/ppinterrupt.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/rv_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/rv_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu10.h renamed from drivers/gpu/drm/amd/pm/inc/smu10.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu10_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/smu10_driver_if.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu11_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/smu11_driver_if.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu7.h renamed from drivers/gpu/drm/amd/pm/inc/smu7.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu71.h renamed from drivers/gpu/drm/amd/pm/inc/smu71.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu71_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu71_discrete.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu72.h renamed from drivers/gpu/drm/amd/pm/inc/smu72.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu72_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu72_discrete.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu73.h renamed from drivers/gpu/drm/amd/pm/inc/smu73.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu73_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu73_discrete.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu74.h renamed from drivers/gpu/drm/amd/pm/inc/smu74.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu74_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu74_discrete.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu75.h renamed from drivers/gpu/drm/amd/pm/inc/smu75.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu75_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu75_discrete.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu7_common.h renamed from drivers/gpu/drm/amd/pm/inc/smu7_common.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu7_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu7_discrete.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu7_fusion.h renamed from drivers/gpu/drm/amd/pm/inc/smu7_fusion.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu7_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu7_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu8.h renamed from drivers/gpu/drm/amd/pm/inc/smu8.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu8_fusion.h renamed from drivers/gpu/drm/amd/pm/inc/smu8_fusion.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu9.h renamed from drivers/gpu/drm/amd/pm/inc/smu9.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu9_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/smu9_driver_if.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu_ucode_xfer_cz.h renamed from drivers/gpu/drm/amd/pm/inc/smu_ucode_xfer_cz.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu_ucode_xfer_vi.h renamed from drivers/gpu/drm/amd/pm/inc/smu_ucode_xfer_vi.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smumgr.h renamed from drivers/gpu/drm/amd/pm/inc/smumgr.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/tonga_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/tonga_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/vega10_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/vega10_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/vega12/smu9_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/vega12/smu9_driver_if.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/vega12_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/vega12_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/vega20_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/vega20_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h renamed from drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_arcturus.h renamed from drivers/gpu/drm/amd/pm/inc/smu11_driver_if_arcturus.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_cyan_skillfish.h renamed from drivers/gpu/drm/amd/pm/inc/smu11_driver_if_cyan_skillfish.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_navi10.h renamed from drivers/gpu/drm/amd/pm/inc/smu11_driver_if_navi10.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_sienna_cichlid.h renamed from drivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_vangogh.h renamed from drivers/gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu12_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/smu12_driver_if.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu13_driver_if_aldebaran.h renamed from drivers/gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu13_driver_if_yellow_carp.h renamed from drivers/gpu/drm/amd/pm/inc/smu13_driver_if_yellow_carp.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v11_5_pmfw.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_5_pmfw.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v11_8_pmfw.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_8_pmfw.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v13_0_1_pmfw.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_pmfw.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/message/aldebaran_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/message/arcturus_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/arcturus_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_0_7_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_7_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_0_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_5_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_8_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_8_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v12_0_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v12_0_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v13_0_1_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_11_0_cdr_table.h renamed from drivers/gpu/drm/amd/pm/inc/smu_11_0_cdr_table.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h renamed from drivers/gpu/drm/amd/pm/inc/smu_types.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_7_pptable.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_7_pptable.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_pptable.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_pptable.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_v12_0.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v12_0.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v13_0.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0_pptable.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v13_0_pptable.h +0
-0drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +0
-1@@ -33,7 +33,6 @@#include "smu11_driver_if_arcturus.h" #include "soc15_common.h" #include "atom.h" -#include "power_state.h" #include "arcturus_ppt.h" #include "smu_v11_0_pptable.h" #include "arcturus_ppsmc.h" drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +0
-1@@ -33,7 +33,6 @@#include "smu13_driver_if_aldebaran.h" #include "soc15_common.h" #include "atom.h" -#include "power_state.h" #include "aldebaran_ppt.h" #include "smu_v13_0_pptable.h" #include "aldebaran_ppsmc.h"
RE: [PATCH V5 13/16] drm/amd/pm: relocate the power related headers
[AMD Official Use Only]
Quoted 244 lines
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Tuesday, December 21, 2021 2:22 PM
To: Quan, Evan <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: Re: [PATCH V5 13/16] drm/amd/pm: relocate the power related headersQuoted 4 lines · Evan Quan
Instead of centralizing all headers in the same folder. Separate them into different folders and place them among those source files those who really need them.
Quoted 8 lines
Signed-off-by Evan Quan <[email protected]>Change-Id Id74cb4c7006327ca7ecd22daf17321e417c4aa71--
v1->v2:
- create separate holders fordriver_ifand ppsmc headers(Lijo)--- drivers/gpu/drm/amd/pm/Makefile | 12 ++++--- drivers/gpu/drm/amd/pm/legacy-dpm/Makefile | 32+++++++++++++++++++
Quoted 86 lines
.../pm/{powerplay => legacy-dpm}/cik_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/kv_dpm.c | 0 .../amd/pm/{powerplay => legacy-dpm}/kv_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/kv_smc.c | 0 .../pm/{powerplay => legacy-dpm}/legacy_dpm.c | 0 .../pm/{powerplay => legacy-dpm}/legacy_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/ppsmc.h | 0 .../pm/{powerplay => legacy-dpm}/r600_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/si_dpm.c | 0 .../amd/pm/{powerplay => legacy-dpm}/si_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/si_smc.c | 0 .../{powerplay => legacy-dpm}/sislands_smc.h | 0 drivers/gpu/drm/amd/pm/powerplay/Makefile | 6 +--- .../pm/{ => powerplay}/inc/amd_powerplay.h | 0 .../drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h | 0 .../amd/pm/{ => powerplay}/inc/fiji_ppsmc.h | 0 .../pm/{ => powerplay}/inc/hardwaremanager.h | 0 .../drm/amd/pm/{ => powerplay}/inc/hwmgr.h | 0 .../{ => powerplay}/inc/polaris10_pwrvirus.h | 0 .../amd/pm/{ => powerplay}/inc/power_state.h | 0 .../drm/amd/pm/{ => powerplay}/inc/pp_debug.h | 0 .../amd/pm/{ => powerplay}/inc/pp_endian.h | 0 .../amd/pm/{ => powerplay}/inc/pp_thermal.h | 0 .../amd/pm/{ => powerplay}/inc/ppinterrupt.h | 0 .../drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu10.h | 0 .../pm/{ => powerplay}/inc/smu10_driver_if.h | 0 .../pm/{ => powerplay}/inc/smu11_driver_if.h | 0 .../gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu71.h | 0 .../pm/{ => powerplay}/inc/smu71_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu72.h | 0 .../pm/{ => powerplay}/inc/smu72_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu73.h | 0 .../pm/{ => powerplay}/inc/smu73_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu74.h | 0 .../pm/{ => powerplay}/inc/smu74_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu75.h | 0 .../pm/{ => powerplay}/inc/smu75_discrete.h | 0 .../amd/pm/{ => powerplay}/inc/smu7_common.h | 0 .../pm/{ => powerplay}/inc/smu7_discrete.h | 0 .../amd/pm/{ => powerplay}/inc/smu7_fusion.h | 0 .../amd/pm/{ => powerplay}/inc/smu7_ppsmc.h | 0 .../gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h | 0 .../amd/pm/{ => powerplay}/inc/smu8_fusion.h | 0 .../gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h | 0 .../pm/{ => powerplay}/inc/smu9_driver_if.h | 0 .../{ => powerplay}/inc/smu_ucode_xfer_cz.h | 0 .../{ => powerplay}/inc/smu_ucode_xfer_vi.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smumgr.h | 0 .../amd/pm/{ => powerplay}/inc/tonga_ppsmc.h | 0 .../amd/pm/{ => powerplay}/inc/vega10_ppsmc.h | 0 .../inc/vega12/smu9_driver_if.h | 0 .../amd/pm/{ => powerplay}/inc/vega12_ppsmc.h | 0 .../amd/pm/{ => powerplay}/inc/vega20_ppsmc.h | 0 .../drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h | 0 .../inc/interface}/smu11_driver_if_arcturus.h | 0 .../smu11_driver_if_cyan_skillfish.h | 0 .../inc/interface}/smu11_driver_if_navi10.h | 0 .../smu11_driver_if_sienna_cichlid.h | 0 .../inc/interface}/smu11_driver_if_vangogh.h | 0 .../inc/interface}/smu12_driver_if.h | 0 .../interface}/smu13_driver_if_aldebaran.h | 0 .../interface}/smu13_driver_if_yellow_carp.h | 0 .../inc/interface}/smu_v11_5_pmfw.h | 0 .../inc/interface}/smu_v11_8_pmfw.h | 0 .../inc/interface}/smu_v13_0_1_pmfw.h | 0 .../inc/message}/aldebaran_ppsmc.h | 0 .../inc/message}/arcturus_ppsmc.h | 0 .../inc/message}/smu_v11_0_7_ppsmc.h | 0 .../inc/message}/smu_v11_0_ppsmc.h | 0 .../inc/message}/smu_v11_5_ppsmc.h | 0 .../inc/message}/smu_v11_8_ppsmc.h | 0 .../inc/message}/smu_v12_0_ppsmc.h | 0 .../inc/message}/smu_v13_0_1_ppsmc.h | 0 .../pm/{ => swsmu}/inc/smu_11_0_cdr_table.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_types.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h | 0 .../pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h | 0 .../pm/{ => swsmu}/inc/smu_v11_0_pptable.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h | 0 .../pm/{ => swsmu}/inc/smu_v13_0_pptable.h | 0 .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 1 - .../drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 1 - 87 files changed, 41 insertions(+), 11 deletions(-)Quoted 2 lines
create mode 100644
drivers/gpu/drm/amd/pm/legacy-dpm/Makefilerenamedrivers/gpu/drm/amd/pm/{powerplay=> legacy-
dpm}/cik_dpm.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/kv_dpm.c(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=> legacy-
dpm}/kv_dpm.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/kv_smc.c(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=> legacy-
dpm}/legacy_dpm.c(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=> legacy-
dpm}/legacy_dpm.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/ppsmc.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=> legacy-
dpm}/r600_dpm.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/si_dpm.c(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/si_dpm.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/si_smc.c(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=> legacy-
dpm}/sislands_smc.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
powerplay}/inc/amd_powerplay.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/cz_ppsmc.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/fiji_ppsmc.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
powerplay}/inc/hardwaremanager.h(100%)Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/hwmgr.h(100%) renamedrivers/gpu/drm/amd/pm/{=>
powerplay}/inc/polaris10_pwrvirus.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/power_state.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/pp_debug.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/pp_endian.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/pp_thermal.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/ppinterrupt.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/rv_ppsmc.h(100%)
Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu10.h(100%) renamedrivers/gpu/drm/amd/pm/{=>
powerplay}/inc/smu10_driver_if.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
powerplay}/inc/smu11_driver_if.h(100%)Quoted 3 lines
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu7.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu71.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu71_discrete.h(100%)
Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu72.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu72_discrete.h(100%)
Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu73.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu73_discrete.h(100%)
Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu74.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu74_discrete.h(100%)
Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu75.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu75_discrete.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu7_common.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu7_discrete.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu7_fusion.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu7_ppsmc.h(100%)
Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu8.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu8_fusion.h(100%)
Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu9.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu9_driver_if.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
powerplay}/inc/smu_ucode_xfer_cz.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
powerplay}/inc/smu_ucode_xfer_vi.h(100%)Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smumgr.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/tonga_ppsmc.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/vega10_ppsmc.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
powerplay}/inc/vega12/smu9_driver_if.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/vega12_ppsmc.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/vega20_ppsmc.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>swsmu}/inc/amdgpu_smu.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu11_driver_if_arcturus.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu11_driver_if_cyan_skillfish.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu11_driver_if_navi10.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu11_driver_if_sienna_cichlid.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu11_driver_if_vangogh.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu12_driver_if.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu13_driver_if_aldebaran.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu13_driver_if_yellow_carp.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu_v11_5_pmfw.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu_v11_8_pmfw.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu_v13_0_1_pmfw.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/message}/aldebaran_ppsmc.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/message}/arcturus_ppsmc.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/message}/smu_v11_0_7_ppsmc.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/message}/smu_v11_0_ppsmc.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/message}/smu_v11_5_ppsmc.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/message}/smu_v11_8_ppsmc.h(100%)
Quoted 8 lines
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/message}/smu_v12_0_ppsmc.h(100%)Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{inc=>swsmu/inc/message}/smu_v13_0_1_ppsmc.h(100%)I didn't mean to separate them to two different folders. Original intention was to group together FW headers as 'third party component' headers in a separate folder.
[Quan, Evan] OK, if I gather all those pmfw related headers into a separate folder named "pmfw_if", does that make sense to you?
BR
Evan
Quoted 619 lines
As another thought, 'interface' folder also looks good but for a different purpose - to keep the public API headers of swsmu and powerplay components to other components.
Thanks,
LijoQuoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
swsmu}/inc/smu_11_0_cdr_table.h(100%)Quoted 3 lines
rename
drivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_types.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v11_0.h(100%) renamedrivers/gpu/drm/amd/pm/{=>
swsmu}/inc/smu_v11_0_7_pptable.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
swsmu}/inc/smu_v11_0_pptable.h(100%)Quoted 3 lines
rename
drivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v12_0.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v13_0.h(100%) renamedrivers/gpu/drm/amd/pm/{=>
swsmu}/inc/smu_v13_0_pptable.hQuoted 44 lines
(100%)
(quoted diff) +0
-0b/drivers/gpu/drm/amd/pm/Makefile index
d35ffde387f1..3d17ffb77f31100644drivers/gpu/drm/amd/pm/Makefile +8
-4@@ -21,20 +21,24 @@ # subdir-ccflags-y += \ - -I$(FULL_AMD_PATH)/pm/inc/ \ -I$(FULL_AMD_PATH)/include/asic_reg \ -I$(FULL_AMD_PATH)/include \ + -I$(FULL_AMD_PATH)/pm/inc/ \ -I$(FULL_AMD_PATH)/pm/swsmu \ + -I$(FULL_AMD_PATH)/pm/swsmu/inc \ + -I$(FULL_AMD_PATH)/pm/swsmu/inc/interface \ + -I$(FULL_AMD_PATH)/pm/swsmu/inc/message \ -I$(FULL_AMD_PATH)/pm/swsmu/smu11 \ -I$(FULL_AMD_PATH)/pm/swsmu/smu12 \ -I$(FULL_AMD_PATH)/pm/swsmu/smu13 \ - -I$(FULL_AMD_PATH)/pm/powerplay \ + -I$(FULL_AMD_PATH)/pm/powerplay/inc \ -I$(FULL_AMD_PATH)/pm/powerplay/smumgr\ - -I$(FULL_AMD_PATH)/pm/powerplay/hwmgr + -I$(FULL_AMD_PATH)/pm/powerplay/hwmgr \ + -I$(FULL_AMD_PATH)/pm/legacy-dpm AMD_PM_PATH = ../pm -PM_LIBS = swsmu powerplay +PM_LIBS = swsmu powerplay legacy-dpm AMD_PM = $(addsuffix /Makefile,$(addprefix $(FULL_AMD_PATH)/pm/,$(PM_LIBS)))drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/Makefile line 9
Quoted 9 lines
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +9
-0@@ -0,0 +1,32 @@ +# +# Copyright 2021 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 isfurnished to do so, subject to the following conditions:
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile line 14
Quoted 5 lines
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +5
-0+# +# 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 ANYKIND,
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile line 15
Quoted 1 line
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +1
-0+EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THEWARRANTIES OF
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile line 17
Quoted 2 lines
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +2
-0+MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL # THE COPYRIGHT HOLDER(S)OR
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile line 19
Quoted 2 lines
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +2
-0+AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR # OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISINGFROM,
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile line 20
Quoted 1 line
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +1
-0+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR #OTHER DEALINGS IN THE SOFTWARE.
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile
Quoted 7 lines
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +7
-0+# + +AMD_LEGACYDPM_PATH = ../pm/legacy-dpm + +LEGACYDPM_MGR-y = legacy_dpm.o + +LEGACYDPM_MGR-$(CONFIG_DRM_AMDGPU_CIK)+= kv_dpm.okv_smc.o
drivers/gpu/drm/amd/pm/powerplay/Makefile AMD_POWERPLAY = $(addsuffix
Quoted 72 lines
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +6
-0+LEGACYDPM_MGR-$(CONFIG_DRM_AMDGPU_SI)+= si_dpm.o si_smc.o + +AMD_LEGACYDPM_POWER = $(addprefix +$(AMD_LEGACYDPM_PATH)/,$(LEGACYDPM_MGR-y)) + +AMD_POWERPLAY_FILES += $(AMD_LEGACYDPM_POWER)drivers/gpu/drm/amd/pm/legacy-dpm/cik_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/cik_dpm.h +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c renamed from drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/kv_dpm.h +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/kv_smc.c renamed from drivers/gpu/drm/amd/pm/powerplay/kv_smc.c +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c renamed from drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.c +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.h +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/ppsmc.h renamed from drivers/gpu/drm/amd/pm/powerplay/ppsmc.h +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/r600_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/r600_dpm.h +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c renamed from drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/si_dpm.h +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/si_smc.c renamed from drivers/gpu/drm/amd/pm/powerplay/si_smc.c +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/sislands_smc.h renamed from drivers/gpu/drm/amd/pm/powerplay/sislands_smc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/Makefile +0
-0@@ -28,11 +28,7 @@ AMD_POWERPLAY = $(addsuffix/Makefile,$(addprefix
Quoted 187 lines
$(FULL_AMD_PATH)/pm/powerplay/
include $(AMD_POWERPLAY)drivers/gpu/drm/amd/pm/powerplay/Makefile +1
-5-POWER_MGR-y = amd_powerplay.o legacy_dpm.o - -POWER_MGR-$(CONFIG_DRM_AMDGPU_CIK)+= kv_dpm.o kv_smc.o - -POWER_MGR-$(CONFIG_DRM_AMDGPU_SI)+= si_dpm.o si_smc.o +POWER_MGR-y = amd_powerplay.o AMD_PP_POWER = $(addprefix $(AMD_PP_PATH)/,$(POWER_MGR-y))drivers/gpu/drm/amd/pm/powerplay/inc/amd_powerplay.h renamed from drivers/gpu/drm/amd/pm/inc/amd_powerplay.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/cz_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/cz_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/fiji_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/fiji_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/hardwaremanager.h renamed from drivers/gpu/drm/amd/pm/inc/hardwaremanager.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h renamed from drivers/gpu/drm/amd/pm/inc/hwmgr.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/polaris10_pwrvirus.h renamed from drivers/gpu/drm/amd/pm/inc/polaris10_pwrvirus.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/power_state.h renamed from drivers/gpu/drm/amd/pm/inc/power_state.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/pp_debug.h renamed from drivers/gpu/drm/amd/pm/inc/pp_debug.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/pp_endian.h renamed from drivers/gpu/drm/amd/pm/inc/pp_endian.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/pp_thermal.h renamed from drivers/gpu/drm/amd/pm/inc/pp_thermal.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/ppinterrupt.h renamed from drivers/gpu/drm/amd/pm/inc/ppinterrupt.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/rv_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/rv_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu10.h renamed from drivers/gpu/drm/amd/pm/inc/smu10.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu10_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/smu10_driver_if.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu11_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/smu11_driver_if.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu7.h renamed from drivers/gpu/drm/amd/pm/inc/smu7.h rename to +0
-0
drivers/gpu/drm/amd/pm/powerplay/inc/smu7.hdrivers/gpu/drm/amd/pm/powerplay/inc/smu71.h renamed from drivers/gpu/drm/amd/pm/inc/smu71.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu71_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu71_discrete.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu72.h renamed from drivers/gpu/drm/amd/pm/inc/smu72.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu72_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu72_discrete.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu73.h renamed from drivers/gpu/drm/amd/pm/inc/smu73.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu73_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu73_discrete.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu74.h renamed from drivers/gpu/drm/amd/pm/inc/smu74.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu74_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu74_discrete.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu75.h renamed from drivers/gpu/drm/amd/pm/inc/smu75.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu75_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu75_discrete.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu7_common.h renamed from drivers/gpu/drm/amd/pm/inc/smu7_common.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu7_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu7_discrete.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu7_fusion.h renamed from drivers/gpu/drm/amd/pm/inc/smu7_fusion.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu7_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu7_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu8.h renamed from drivers/gpu/drm/amd/pm/inc/smu8.h rename to +0
-0
drivers/gpu/drm/amd/pm/powerplay/inc/smu8.hdrivers/gpu/drm/amd/pm/powerplay/inc/smu8_fusion.h renamed from drivers/gpu/drm/amd/pm/inc/smu8_fusion.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu9.h renamed from drivers/gpu/drm/amd/pm/inc/smu9.h rename to +0
-0
drivers/gpu/drm/amd/pm/powerplay/inc/smu9.hdrivers/gpu/drm/amd/pm/powerplay/inc/smu9_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/smu9_driver_if.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu_ucode_xfer_cz.h renamed from drivers/gpu/drm/amd/pm/inc/smu_ucode_xfer_cz.h +0
-0Quoted 1 line
rename to
drivers/gpu/drm/amd/pm/powerplay/inc/smu_ucode_xfer_cz.hQuoted 5 lines
drivers/gpu/drm/amd/pm/powerplay/inc/smu_ucode_xfer_vi.h renamed from drivers/gpu/drm/amd/pm/inc/smu_ucode_xfer_vi.h +0
-0rename to
drivers/gpu/drm/amd/pm/powerplay/inc/smu_ucode_xfer_vi.hQuoted 19 lines
drivers/gpu/drm/amd/pm/powerplay/inc/smumgr.h renamed from drivers/gpu/drm/amd/pm/inc/smumgr.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/tonga_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/tonga_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/vega10_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/vega10_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/vega12/smu9_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/vega12/smu9_driver_if.h +0
-0Quoted 1 line
rename to
drivers/gpu/drm/amd/pm/powerplay/inc/vega12/smu9_driver_if.hReview
Quoted 17 lines
drivers/gpu/drm/amd/pm/powerplay/inc/vega12_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/vega12_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/vega20_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/vega20_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h renamed from drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0
-0(quoted diff) +0
-0b/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_arcturu s.
Quoted 5 lines
h
similarity index 100%
rename fromdrivers/gpu/drm/amd/pm/inc/smu11_driver_if_arcturus.hrename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_arcturus.hQuoted 3 lines
diff --git
a/drivers/gpu/drm/amd/pm/inc/smu11_driver_if_cyan_skillfish.hb/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_cyan_s kil
Quoted 6 lines
lfish.h
similarity index 100%
rename fromdrivers/gpu/drm/amd/pm/inc/smu11_driver_if_cyan_skillfish.hrename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_cyan_skillfQuoted 2 lines
ish.hdiff --gita/drivers/gpu/drm/amd/pm/inc/smu11_driver_if_navi10.hb/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_navi10. h
Quoted 7 lines
similarity index 100%
rename fromdrivers/gpu/drm/amd/pm/inc/smu11_driver_if_navi10.hrename todrivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_navi10.hdiff --gita/drivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.hb/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_sienna_ ci
Quoted 6 lines
chlid.h
similarity index 100%
rename fromdrivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.hrename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_sienna_cichQuoted 3 lines
lid.hdiff --gita/drivers/gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.hb/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_vangog
h.hQuoted 4 lines
similarity index 100%
rename fromdrivers/gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.hrename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_vangogh. hQuoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu12_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/smu12_driver_if.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu12_driver_if.hReview
Quoted 2 lines
(quoted diff) +0
-0b/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu13_driver_if_aldebar an
Quoted 5 lines
.h
similarity index 100%
rename fromdrivers/gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.hrename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu13_driver_if_aldebaran.hReview
Quoted 2 lines
(quoted diff) +0
-0b/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu13_driver_if_yellow_ ca
Quoted 3 lines
rp.h
similarity index 100%
rename from
drivers/gpu/drm/amd/pm/inc/smu13_driver_if_yellow_carp.hQuoted 2 lines
rename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu13_driver_if_yellow_carpQuoted 5 lines
.h diff --git
a/drivers/gpu/drm/amd/pm/inc/smu_v11_5_pmfw.hb/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v11_5_pmfw.hsimilarity index 100%
rename fromdrivers/gpu/drm/amd/pm/inc/smu_v11_5_pmfw.hrename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v11_5_pmfw.hQuoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v11_8_pmfw.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_8_pmfw.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v11_8_pmfw.hQuoted 11 lines
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v13_0_1_pmfw.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_pmfw.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v13_0_1_pmfw.hdrivers/gpu/drm/amd/pm/swsmu/inc/message/aldebaran_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/message/aldebaran_ppsmc.hQuoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/inc/message/arcturus_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/arcturus_ppsmc.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/message/arcturus_ppsmc.hQuoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_0_7_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_7_ppsmc.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_0_7_ppsmc.hQuoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_0_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_ppsmc.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_0_ppsmc.hQuoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_5_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_5_ppsmc.hQuoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_8_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_8_ppsmc.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_8_ppsmc.hQuoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v12_0_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v12_0_ppsmc.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v12_0_ppsmc.hQuoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v13_0_1_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_ppsmc.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v13_0_1_ppsmc.hQuoted 67 lines
drivers/gpu/drm/amd/pm/swsmu/inc/smu_11_0_cdr_table.h renamed from drivers/gpu/drm/amd/pm/inc/smu_11_0_cdr_table.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h renamed from drivers/gpu/drm/amd/pm/inc/smu_types.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_7_pptable.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_7_pptable.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_pptable.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_pptable.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_v12_0.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v12_0.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v13_0.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0_pptable.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v13_0_pptable.h +0
-0drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +0
-1@@ -33,7 +33,6 @@#include "smu11_driver_if_arcturus.h" #include "soc15_common.h" #include "atom.h" -#include "power_state.h" #include "arcturus_ppt.h" #include "smu_v11_0_pptable.h" #include "arcturus_ppsmc.h" drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +0
-1@@ -33,7 +33,6 @@#include "smu13_driver_if_aldebaran.h" #include "soc15_common.h" #include "atom.h" -#include "power_state.h" #include "aldebaran_ppt.h" #include "smu_v13_0_pptable.h" #include "aldebaran_ppsmc.h"
Re: [PATCH V5 13/16] drm/amd/pm: relocate the power related headers
Quoted 249 lines · Evan
[AMD Official Use Only]
Quoted 245 lines
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Tuesday, December 21, 2021 2:22 PM
To: Quan, Evan <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: Re: [PATCH V5 13/16] drm/amd/pm: relocate the power related headersQuoted 4 lines · Evan Quan
Instead of centralizing all headers in the same folder. Separate them into different folders and place them among those source files those who really need them.
Quoted 8 lines
Signed-off-by Evan Quan <[email protected]>Change-Id Id74cb4c7006327ca7ecd22daf17321e417c4aa71--
v1->v2:
- create separate holders fordriver_ifand ppsmc headers(Lijo)--- drivers/gpu/drm/amd/pm/Makefile | 12 ++++--- drivers/gpu/drm/amd/pm/legacy-dpm/Makefile | 32+++++++++++++++++++
Quoted 86 lines
.../pm/{powerplay => legacy-dpm}/cik_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/kv_dpm.c | 0 .../amd/pm/{powerplay => legacy-dpm}/kv_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/kv_smc.c | 0 .../pm/{powerplay => legacy-dpm}/legacy_dpm.c | 0 .../pm/{powerplay => legacy-dpm}/legacy_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/ppsmc.h | 0 .../pm/{powerplay => legacy-dpm}/r600_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/si_dpm.c | 0 .../amd/pm/{powerplay => legacy-dpm}/si_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/si_smc.c | 0 .../{powerplay => legacy-dpm}/sislands_smc.h | 0 drivers/gpu/drm/amd/pm/powerplay/Makefile | 6 +--- .../pm/{ => powerplay}/inc/amd_powerplay.h | 0 .../drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h | 0 .../amd/pm/{ => powerplay}/inc/fiji_ppsmc.h | 0 .../pm/{ => powerplay}/inc/hardwaremanager.h | 0 .../drm/amd/pm/{ => powerplay}/inc/hwmgr.h | 0 .../{ => powerplay}/inc/polaris10_pwrvirus.h | 0 .../amd/pm/{ => powerplay}/inc/power_state.h | 0 .../drm/amd/pm/{ => powerplay}/inc/pp_debug.h | 0 .../amd/pm/{ => powerplay}/inc/pp_endian.h | 0 .../amd/pm/{ => powerplay}/inc/pp_thermal.h | 0 .../amd/pm/{ => powerplay}/inc/ppinterrupt.h | 0 .../drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu10.h | 0 .../pm/{ => powerplay}/inc/smu10_driver_if.h | 0 .../pm/{ => powerplay}/inc/smu11_driver_if.h | 0 .../gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu71.h | 0 .../pm/{ => powerplay}/inc/smu71_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu72.h | 0 .../pm/{ => powerplay}/inc/smu72_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu73.h | 0 .../pm/{ => powerplay}/inc/smu73_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu74.h | 0 .../pm/{ => powerplay}/inc/smu74_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu75.h | 0 .../pm/{ => powerplay}/inc/smu75_discrete.h | 0 .../amd/pm/{ => powerplay}/inc/smu7_common.h | 0 .../pm/{ => powerplay}/inc/smu7_discrete.h | 0 .../amd/pm/{ => powerplay}/inc/smu7_fusion.h | 0 .../amd/pm/{ => powerplay}/inc/smu7_ppsmc.h | 0 .../gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h | 0 .../amd/pm/{ => powerplay}/inc/smu8_fusion.h | 0 .../gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h | 0 .../pm/{ => powerplay}/inc/smu9_driver_if.h | 0 .../{ => powerplay}/inc/smu_ucode_xfer_cz.h | 0 .../{ => powerplay}/inc/smu_ucode_xfer_vi.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smumgr.h | 0 .../amd/pm/{ => powerplay}/inc/tonga_ppsmc.h | 0 .../amd/pm/{ => powerplay}/inc/vega10_ppsmc.h | 0 .../inc/vega12/smu9_driver_if.h | 0 .../amd/pm/{ => powerplay}/inc/vega12_ppsmc.h | 0 .../amd/pm/{ => powerplay}/inc/vega20_ppsmc.h | 0 .../drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h | 0 .../inc/interface}/smu11_driver_if_arcturus.h | 0 .../smu11_driver_if_cyan_skillfish.h | 0 .../inc/interface}/smu11_driver_if_navi10.h | 0 .../smu11_driver_if_sienna_cichlid.h | 0 .../inc/interface}/smu11_driver_if_vangogh.h | 0 .../inc/interface}/smu12_driver_if.h | 0 .../interface}/smu13_driver_if_aldebaran.h | 0 .../interface}/smu13_driver_if_yellow_carp.h | 0 .../inc/interface}/smu_v11_5_pmfw.h | 0 .../inc/interface}/smu_v11_8_pmfw.h | 0 .../inc/interface}/smu_v13_0_1_pmfw.h | 0 .../inc/message}/aldebaran_ppsmc.h | 0 .../inc/message}/arcturus_ppsmc.h | 0 .../inc/message}/smu_v11_0_7_ppsmc.h | 0 .../inc/message}/smu_v11_0_ppsmc.h | 0 .../inc/message}/smu_v11_5_ppsmc.h | 0 .../inc/message}/smu_v11_8_ppsmc.h | 0 .../inc/message}/smu_v12_0_ppsmc.h | 0 .../inc/message}/smu_v13_0_1_ppsmc.h | 0 .../pm/{ => swsmu}/inc/smu_11_0_cdr_table.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_types.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h | 0 .../pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h | 0 .../pm/{ => swsmu}/inc/smu_v11_0_pptable.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h | 0 .../pm/{ => swsmu}/inc/smu_v13_0_pptable.h | 0 .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 1 - .../drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 1 - 87 files changed, 41 insertions(+), 11 deletions(-)Quoted 2 lines
create mode 100644
drivers/gpu/drm/amd/pm/legacy-dpm/Makefilerenamedrivers/gpu/drm/amd/pm/{powerplay=> legacy-
dpm}/cik_dpm.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/kv_dpm.c(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=> legacy-
dpm}/kv_dpm.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/kv_smc.c(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=> legacy-
dpm}/legacy_dpm.c(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=> legacy-
dpm}/legacy_dpm.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/ppsmc.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=> legacy-
dpm}/r600_dpm.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/si_dpm.c(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/si_dpm.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/si_smc.c(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{powerplay=> legacy-
dpm}/sislands_smc.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
powerplay}/inc/amd_powerplay.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/cz_ppsmc.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/fiji_ppsmc.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
powerplay}/inc/hardwaremanager.h(100%)Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/hwmgr.h(100%) renamedrivers/gpu/drm/amd/pm/{=>
powerplay}/inc/polaris10_pwrvirus.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/power_state.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/pp_debug.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/pp_endian.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/pp_thermal.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/ppinterrupt.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/rv_ppsmc.h(100%)
Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu10.h(100%) renamedrivers/gpu/drm/amd/pm/{=>
powerplay}/inc/smu10_driver_if.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
powerplay}/inc/smu11_driver_if.h(100%)Quoted 3 lines
rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71_discrete.h(100%)
Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu72.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu72_discrete.h(100%)
Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu73.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu73_discrete.h(100%)
Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu74.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu74_discrete.h(100%)
Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu75.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu75_discrete.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu7_common.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu7_discrete.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu7_fusion.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu7_ppsmc.h(100%)
Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu8.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu8_fusion.h(100%)
Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu9.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu9_driver_if.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
powerplay}/inc/smu_ucode_xfer_cz.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
powerplay}/inc/smu_ucode_xfer_vi.h(100%)Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/smumgr.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/tonga_ppsmc.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/vega10_ppsmc.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
powerplay}/inc/vega12/smu9_driver_if.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/vega12_ppsmc.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>powerplay}/inc/vega20_ppsmc.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>swsmu}/inc/amdgpu_smu.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu11_driver_if_arcturus.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu11_driver_if_cyan_skillfish.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu11_driver_if_navi10.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu11_driver_if_sienna_cichlid.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu11_driver_if_vangogh.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu12_driver_if.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu13_driver_if_aldebaran.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu13_driver_if_yellow_carp.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu_v11_5_pmfw.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu_v11_8_pmfw.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/interface}/smu_v13_0_1_pmfw.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/message}/aldebaran_ppsmc.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/message}/arcturus_ppsmc.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/message}/smu_v11_0_7_ppsmc.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/message}/smu_v11_0_ppsmc.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/message}/smu_v11_5_ppsmc.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
swsmu/inc/message}/smu_v11_8_ppsmc.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{inc=>
Quoted 9 lines
Quoted 7 lines
swsmu/inc/message}/smu_v12_0_ppsmc.h(100%)Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{inc=>swsmu/inc/message}/smu_v13_0_1_ppsmc.h(100%)I didn't mean to separate them to two different folders. Original intention was to group together FW headers as 'third party component' headers in a separate folder.
[Quan, Evan] OK, if I gather all those pmfw related headers into a separate folder named "
pmfw_if", does that make sense to you?
Yes, that's fine.
Thanks,
Lijo
Quoted 621 lines
BR
EvanQuoted 619 lines
As another thought, 'interface' folder also looks good but for a different purpose - to keep the public API headers of swsmu and powerplay components to other components.
Thanks,
LijoQuoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
swsmu}/inc/smu_11_0_cdr_table.h(100%)Quoted 3 lines
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_types.h (100%) rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h (100%) rename drivers/gpu/drm/amd/pm/{ =>
swsmu}/inc/smu_v11_0_7_pptable.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
swsmu}/inc/smu_v11_0_pptable.h(100%)Quoted 3 lines
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h (100%) rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h (100%) rename drivers/gpu/drm/amd/pm/{ =>
swsmu}/inc/smu_v13_0_pptable.hQuoted 44 lines
(100%)
(quoted diff) +0
-0b/drivers/gpu/drm/amd/pm/Makefile index
d35ffde387f1..3d17ffb77f31100644drivers/gpu/drm/amd/pm/Makefile +8
-4@@ -21,20 +21,24 @@ # subdir-ccflags-y += \ - -I$(FULL_AMD_PATH)/pm/inc/ \ -I$(FULL_AMD_PATH)/include/asic_reg \ -I$(FULL_AMD_PATH)/include \ + -I$(FULL_AMD_PATH)/pm/inc/ \ -I$(FULL_AMD_PATH)/pm/swsmu \ + -I$(FULL_AMD_PATH)/pm/swsmu/inc \ + -I$(FULL_AMD_PATH)/pm/swsmu/inc/interface \ + -I$(FULL_AMD_PATH)/pm/swsmu/inc/message \ -I$(FULL_AMD_PATH)/pm/swsmu/smu11 \ -I$(FULL_AMD_PATH)/pm/swsmu/smu12 \ -I$(FULL_AMD_PATH)/pm/swsmu/smu13 \ - -I$(FULL_AMD_PATH)/pm/powerplay \ + -I$(FULL_AMD_PATH)/pm/powerplay/inc \ -I$(FULL_AMD_PATH)/pm/powerplay/smumgr\ - -I$(FULL_AMD_PATH)/pm/powerplay/hwmgr + -I$(FULL_AMD_PATH)/pm/powerplay/hwmgr \ + -I$(FULL_AMD_PATH)/pm/legacy-dpm AMD_PM_PATH = ../pm -PM_LIBS = swsmu powerplay +PM_LIBS = swsmu powerplay legacy-dpm AMD_PM = $(addsuffix /Makefile,$(addprefix $(FULL_AMD_PATH)/pm/,$(PM_LIBS)))drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/Makefile line 9
Quoted 9 lines
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +9
-0@@ -0,0 +1,32 @@ +# +# Copyright 2021 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 isfurnished to do so, subject to the following conditions:
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile line 14
Quoted 5 lines
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +5
-0+# +# 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 ANYKIND,
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile line 15
Quoted 1 line
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +1
-0+EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THEWARRANTIES OF
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile line 17
Quoted 2 lines
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +2
-0+MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL # THE COPYRIGHT HOLDER(S)OR
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile line 19
Quoted 2 lines
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +2
-0+AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR # OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISINGFROM,
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile line 20
Quoted 1 line
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +1
-0+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR #OTHER DEALINGS IN THE SOFTWARE.
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile
Quoted 7 lines
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +7
-0+# + +AMD_LEGACYDPM_PATH = ../pm/legacy-dpm + +LEGACYDPM_MGR-y = legacy_dpm.o + +LEGACYDPM_MGR-$(CONFIG_DRM_AMDGPU_CIK)+= kv_dpm.okv_smc.o
drivers/gpu/drm/amd/pm/powerplay/Makefile AMD_POWERPLAY = $(addsuffix
Quoted 72 lines
drivers/gpu/drm/amd/pm/legacy-dpm/Makefile new file +6
-0+LEGACYDPM_MGR-$(CONFIG_DRM_AMDGPU_SI)+= si_dpm.o si_smc.o + +AMD_LEGACYDPM_POWER = $(addprefix +$(AMD_LEGACYDPM_PATH)/,$(LEGACYDPM_MGR-y)) + +AMD_POWERPLAY_FILES += $(AMD_LEGACYDPM_POWER)drivers/gpu/drm/amd/pm/legacy-dpm/cik_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/cik_dpm.h +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c renamed from drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/kv_dpm.h +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/kv_smc.c renamed from drivers/gpu/drm/amd/pm/powerplay/kv_smc.c +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c renamed from drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.c +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.h +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/ppsmc.h renamed from drivers/gpu/drm/amd/pm/powerplay/ppsmc.h +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/r600_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/r600_dpm.h +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c renamed from drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.h renamed from drivers/gpu/drm/amd/pm/powerplay/si_dpm.h +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/si_smc.c renamed from drivers/gpu/drm/amd/pm/powerplay/si_smc.c +0
-0drivers/gpu/drm/amd/pm/legacy-dpm/sislands_smc.h renamed from drivers/gpu/drm/amd/pm/powerplay/sislands_smc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/Makefile +0
-0@@ -28,11 +28,7 @@ AMD_POWERPLAY = $(addsuffix/Makefile,$(addprefix
Quoted 187 lines
$(FULL_AMD_PATH)/pm/powerplay/
include $(AMD_POWERPLAY)drivers/gpu/drm/amd/pm/powerplay/Makefile +1
-5-POWER_MGR-y = amd_powerplay.o legacy_dpm.o - -POWER_MGR-$(CONFIG_DRM_AMDGPU_CIK)+= kv_dpm.o kv_smc.o - -POWER_MGR-$(CONFIG_DRM_AMDGPU_SI)+= si_dpm.o si_smc.o +POWER_MGR-y = amd_powerplay.o AMD_PP_POWER = $(addprefix $(AMD_PP_PATH)/,$(POWER_MGR-y))drivers/gpu/drm/amd/pm/powerplay/inc/amd_powerplay.h renamed from drivers/gpu/drm/amd/pm/inc/amd_powerplay.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/cz_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/cz_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/fiji_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/fiji_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/hardwaremanager.h renamed from drivers/gpu/drm/amd/pm/inc/hardwaremanager.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h renamed from drivers/gpu/drm/amd/pm/inc/hwmgr.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/polaris10_pwrvirus.h renamed from drivers/gpu/drm/amd/pm/inc/polaris10_pwrvirus.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/power_state.h renamed from drivers/gpu/drm/amd/pm/inc/power_state.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/pp_debug.h renamed from drivers/gpu/drm/amd/pm/inc/pp_debug.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/pp_endian.h renamed from drivers/gpu/drm/amd/pm/inc/pp_endian.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/pp_thermal.h renamed from drivers/gpu/drm/amd/pm/inc/pp_thermal.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/ppinterrupt.h renamed from drivers/gpu/drm/amd/pm/inc/ppinterrupt.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/rv_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/rv_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu10.h renamed from drivers/gpu/drm/amd/pm/inc/smu10.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu10_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/smu10_driver_if.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu11_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/smu11_driver_if.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu7.h renamed from drivers/gpu/drm/amd/pm/inc/smu7.h rename to +0
-0
drivers/gpu/drm/amd/pm/powerplay/inc/smu7.hdrivers/gpu/drm/amd/pm/powerplay/inc/smu71.h renamed from drivers/gpu/drm/amd/pm/inc/smu71.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu71_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu71_discrete.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu72.h renamed from drivers/gpu/drm/amd/pm/inc/smu72.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu72_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu72_discrete.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu73.h renamed from drivers/gpu/drm/amd/pm/inc/smu73.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu73_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu73_discrete.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu74.h renamed from drivers/gpu/drm/amd/pm/inc/smu74.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu74_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu74_discrete.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu75.h renamed from drivers/gpu/drm/amd/pm/inc/smu75.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu75_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu75_discrete.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu7_common.h renamed from drivers/gpu/drm/amd/pm/inc/smu7_common.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu7_discrete.h renamed from drivers/gpu/drm/amd/pm/inc/smu7_discrete.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu7_fusion.h renamed from drivers/gpu/drm/amd/pm/inc/smu7_fusion.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu7_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu7_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu8.h renamed from drivers/gpu/drm/amd/pm/inc/smu8.h rename to +0
-0
drivers/gpu/drm/amd/pm/powerplay/inc/smu8.hdrivers/gpu/drm/amd/pm/powerplay/inc/smu8_fusion.h renamed from drivers/gpu/drm/amd/pm/inc/smu8_fusion.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu9.h renamed from drivers/gpu/drm/amd/pm/inc/smu9.h rename to +0
-0
drivers/gpu/drm/amd/pm/powerplay/inc/smu9.hdrivers/gpu/drm/amd/pm/powerplay/inc/smu9_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/smu9_driver_if.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/smu_ucode_xfer_cz.h renamed from drivers/gpu/drm/amd/pm/inc/smu_ucode_xfer_cz.h +0
-0Quoted 1 line
rename to
drivers/gpu/drm/amd/pm/powerplay/inc/smu_ucode_xfer_cz.hQuoted 5 lines
drivers/gpu/drm/amd/pm/powerplay/inc/smu_ucode_xfer_vi.h renamed from drivers/gpu/drm/amd/pm/inc/smu_ucode_xfer_vi.h +0
-0rename to
drivers/gpu/drm/amd/pm/powerplay/inc/smu_ucode_xfer_vi.hQuoted 19 lines
drivers/gpu/drm/amd/pm/powerplay/inc/smumgr.h renamed from drivers/gpu/drm/amd/pm/inc/smumgr.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/tonga_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/tonga_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/vega10_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/vega10_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/vega12/smu9_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/vega12/smu9_driver_if.h +0
-0Quoted 1 line
rename to
drivers/gpu/drm/amd/pm/powerplay/inc/vega12/smu9_driver_if.hReview
Quoted 17 lines
drivers/gpu/drm/amd/pm/powerplay/inc/vega12_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/vega12_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/powerplay/inc/vega20_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/vega20_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h renamed from drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0
-0(quoted diff) +0
-0b/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_arcturu s.
Quoted 5 lines
h
similarity index 100%
rename fromdrivers/gpu/drm/amd/pm/inc/smu11_driver_if_arcturus.hrename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_arcturus.hQuoted 3 lines
diff --git
a/drivers/gpu/drm/amd/pm/inc/smu11_driver_if_cyan_skillfish.hb/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_cyan_s kil
Quoted 6 lines
lfish.h
similarity index 100%
rename fromdrivers/gpu/drm/amd/pm/inc/smu11_driver_if_cyan_skillfish.hrename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_cyan_skillfQuoted 2 lines
ish.hdiff --gita/drivers/gpu/drm/amd/pm/inc/smu11_driver_if_navi10.hb/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_navi10. h
Quoted 7 lines
similarity index 100%
rename fromdrivers/gpu/drm/amd/pm/inc/smu11_driver_if_navi10.hrename todrivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_navi10.hdiff --gita/drivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.hb/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_sienna_ ci
Quoted 6 lines
chlid.h
similarity index 100%
rename fromdrivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.hrename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_sienna_cichQuoted 3 lines
lid.hdiff --gita/drivers/gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.hb/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_vangog
h.hQuoted 4 lines
similarity index 100%
rename fromdrivers/gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.hrename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_vangogh. hQuoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu12_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/smu12_driver_if.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu12_driver_if.hReview
Quoted 2 lines
(quoted diff) +0
-0b/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu13_driver_if_aldebar an
Quoted 5 lines
.h
similarity index 100%
rename fromdrivers/gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.hrename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu13_driver_if_aldebaran.hReview
Quoted 2 lines
(quoted diff) +0
-0b/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu13_driver_if_yellow_ ca
Quoted 3 lines
rp.h
similarity index 100%
rename from
drivers/gpu/drm/amd/pm/inc/smu13_driver_if_yellow_carp.hQuoted 2 lines
rename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu13_driver_if_yellow_carpQuoted 5 lines
.h diff --git
a/drivers/gpu/drm/amd/pm/inc/smu_v11_5_pmfw.hb/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v11_5_pmfw.hsimilarity index 100%
rename fromdrivers/gpu/drm/amd/pm/inc/smu_v11_5_pmfw.hrename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v11_5_pmfw.hQuoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v11_8_pmfw.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_8_pmfw.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v11_8_pmfw.hQuoted 11 lines
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v13_0_1_pmfw.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_pmfw.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v13_0_1_pmfw.hdrivers/gpu/drm/amd/pm/swsmu/inc/message/aldebaran_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/message/aldebaran_ppsmc.hQuoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/inc/message/arcturus_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/arcturus_ppsmc.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/message/arcturus_ppsmc.hQuoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_0_7_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_7_ppsmc.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_0_7_ppsmc.hQuoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_0_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_ppsmc.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_0_ppsmc.hQuoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_5_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_5_ppsmc.hQuoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_8_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_8_ppsmc.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_8_ppsmc.hQuoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v12_0_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v12_0_ppsmc.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v12_0_ppsmc.hQuoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v13_0_1_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_ppsmc.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v13_0_1_ppsmc.hQuoted 67 lines
drivers/gpu/drm/amd/pm/swsmu/inc/smu_11_0_cdr_table.h renamed from drivers/gpu/drm/amd/pm/inc/smu_11_0_cdr_table.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h renamed from drivers/gpu/drm/amd/pm/inc/smu_types.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_7_pptable.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_7_pptable.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_pptable.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_pptable.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_v12_0.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v12_0.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v13_0.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0_pptable.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v13_0_pptable.h +0
-0drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +0
-1@@ -33,7 +33,6 @@#include "smu11_driver_if_arcturus.h" #include "soc15_common.h" #include "atom.h" -#include "power_state.h" #include "arcturus_ppt.h" #include "smu_v11_0_pptable.h" #include "arcturus_ppsmc.h" drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +0
-1@@ -33,7 +33,6 @@#include "smu13_driver_if_aldebaran.h" #include "soc15_common.h" #include "atom.h" -#include "power_state.h" #include "aldebaran_ppt.h" #include "smu_v13_0_pptable.h" #include "aldebaran_ppsmc.h"
PATCH v5 14/16 drm/amd/pm: drop unnecessary gfxoff controls
In reply to Evan QuanThose gfxoff controls added for some specific ASICs are unnecessary. The functionalities are not affected without them. Also to align with other ASICs, they should also be dropped.
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 4 --- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 25 +------------------ .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 7 ------ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 7 ------ 4 files changed, 1 insertion(+), 42 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0 -4
@@ -1536,8 +1536,6 @@ static int smu_reset(struct smu_context *smu)struct amdgpu_device *adev = smu->adev;int ret; -amdgpu_gfx_off_ctrl (smu->adev, false); - ret =smu_hw_fini (adev);if (ret)return ret;
@@ -1550,8 +1548,6 @@ static int smu_reset(struct smu_context *smu)if (ret)return ret; -amdgpu_gfx_off_ctrl (smu->adev, true); -return 0 ; }
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +1 -24
@@ -1036,10 +1036,6 @@ static int sienna_cichlid_print_clk_levels(struct smu_context *smu,if (ret) goto print_clk_out; -/* no need to disable gfxoff when retrieving the current gfxclk */ -if ((clk_type ==SMU_GFXCLK ) || (clk_type ==SMU_SCLK )) -amdgpu_gfx_off_ctrl (adev, false); - ret =smu_v11_0_get_dpm_level_count (smu, clk_type, &count);if (ret) goto print_clk_out;
@@ -1168,25 +1164,18 @@ static int sienna_cichlid_print_clk_levels(struct smu_context *smu, } print_clk_out: -if ((clk_type ==SMU_GFXCLK ) || (clk_type ==SMU_SCLK )) -amdgpu_gfx_off_ctrl (adev, true); -return size; }static int sienna_cichlid_force_clk_levels (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t mask) { -struct amdgpu_device *adev = smu->adev;int ret =0 ;uint32_t soft_min_level =0 , soft_max_level =0 , min_freq =0 , max_freq =0 ; soft_min_level = mask ? (ffs (mask) -1 ) :0 ; soft_max_level = mask ? (fls (mask) -1 ) :0 ; -if ((clk_type ==SMU_GFXCLK ) || (clk_type ==SMU_SCLK )) -amdgpu_gfx_off_ctrl (adev, false); -switch (clk_type) {case SMU_GFXCLK :case SMU_SCLK :
@@ -1220,9 +1209,6 @@ static int sienna_cichlid_force_clk_levels(struct smu_context *smu, } forec_level_out: -if ((clk_type ==SMU_GFXCLK ) || (clk_type ==SMU_SCLK )) -amdgpu_gfx_off_ctrl (adev, true); -return 0 ; }
@@ -1865,16 +1851,7 @@ static int sienna_cichlid_get_dpm_ultimate_freq(struct smu_context *smu,enum smu_clk_type clk_type, uint32_t *min, uint32_t *max) { - struct amdgpu_device *adev = smu->adev; -int ret; - -if (clk_type ==SMU_GFXCLK ) -amdgpu_gfx_off_ctrl (adev, false); - ret =smu_v11_0_get_dpm_ultimate_freq (smu, clk_type, min, max); -if (clk_type ==SMU_GFXCLK ) -amdgpu_gfx_off_ctrl (adev, true); - -return ret; + return smu_v11_0_get_dpm_ultimate_freq(smu, clk_type, min, max); } static void sienna_cichlid_dump_od_table(struct smu_context *smu,
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +0 -7
@@ -1798,7 +1798,6 @@ int smu_v11_0_set_soft_freq_limited_range(struct smu_context *smu,uint32_t min, uint32_t max) { -struct amdgpu_device *adev = smu->adev; int ret = 0, clk_id = 0;uint32_t param;
@@ -1811,9 +1810,6 @@ int smu_v11_0_set_soft_freq_limited_range(struct smu_context *smu,if (clk_id <0 )return clk_id; -if (clk_type ==SMU_GFXCLK ) -amdgpu_gfx_off_ctrl (adev, false); -if (max >0 ) { param = (uint32_t )((clk_id <<16 ) | (max &0xffff )); ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetSoftMaxByFreq,
@@ -1831,9 +1827,6 @@ int smu_v11_0_set_soft_freq_limited_range(struct smu_context *smu, } out: -if (clk_type ==SMU_GFXCLK ) -amdgpu_gfx_off_ctrl (adev, true); -return ret; }
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +0 -7
@@ -1528,7 +1528,6 @@ int smu_v13_0_set_soft_freq_limited_range(struct smu_context *smu,uint32_t min, uint32_t max) { -struct amdgpu_device *adev = smu->adev; int ret = 0, clk_id = 0;uint32_t param;
@@ -1541,9 +1540,6 @@ int smu_v13_0_set_soft_freq_limited_range(struct smu_context *smu,if (clk_id <0 )return clk_id; -if (clk_type ==SMU_GFXCLK ) -amdgpu_gfx_off_ctrl (adev, false); -if (max >0 ) { param = (uint32_t )((clk_id <<16 ) | (max &0xffff )); ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetSoftMaxByFreq,
@@ -1561,9 +1557,6 @@ int smu_v13_0_set_soft_freq_limited_range(struct smu_context *smu, } out: -if (clk_type ==SMU_GFXCLK ) -amdgpu_gfx_off_ctrl (adev, true); -return ret; }
Signature · 1 line
2.29.0
PATCH v5 15/16 drm/amd/pm: revise the performance level setting APIs
In reply to Evan QuanAvoid cross callings which make lock protection enforcement on amdgpu_dpm_force_performance_level() impossible.
--v1->v2:
- drop unused enable_umd_pstate callback(Lijo)
--- drivers/gpu/drm/amd/include/amd_shared.h | 2 -- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 29 ++++++++++++++++--- .../gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 17 ++++++----- .../gpu/drm/amd/pm/powerplay/amd_powerplay.c | 12 -------- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 15 ---------- drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 1 - 6 files changed, 34 insertions(+), 42 deletions(-)
drivers/gpu/drm/amd/include/amd_shared.h +0 -2
@@ -268,7 +268,6 @@ enum amd_dpm_forced_level;* @set_clockgating_state: enable/disable cg for the IP block * @set_powergating_state: enable/disable pg for the IP block * @get_clockgating_state: get current clockgating status -* @enable_umd_pstate: enable UMD powerstate * * These hooks provide an interface for controlling the operational state * of IP blocks. After acquiring a list of IP blocks for the GPU in use,
@@ -299,7 +298,6 @@ struct amd_ip_funcs {int (*set_powergating_state)(void *handle,enum amd_powergating_state state);void (*get_clockgating_state)(void *handle,u32 *flags); -int (*enable_umd_pstate)(void *handle,enum amd_dpm_forced_level *level); };
drivers/gpu/drm/amd/pm/amdgpu_pm.c +25 -4
@@ -301,6 +301,10 @@ static ssize_t amdgpu_set_power_dpm_force_performance_level(struct device *dev,enum amd_dpm_forced_level level;enum amd_dpm_forced_level current_level;int ret =0 ; +uint32_t profile_mode_mask =AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD | +AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK | +AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK | +AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ;if (amdgpu_in_reset (adev))return -EPERM ;
@@ -354,10 +358,7 @@ static ssize_t amdgpu_set_power_dpm_force_performance_level(struct device *dev, }/* profile_exit setting is valid only when current mode is in profile mode */ -if (!(current_level & (AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD | -AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK | -AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK | -AMD_DPM_FORCED_LEVEL_PROFILE_PEAK )) && +if (!(current_level & profile_mode_mask) && (level ==AMD_DPM_FORCED_LEVEL_PROFILE_EXIT )) {pr_err ("Currently not in any profile mode!\n" );pm_runtime_mark_last_busy (ddev->dev);
@@ -365,6 +366,26 @@ static ssize_t amdgpu_set_power_dpm_force_performance_level(struct device *dev,return -EINVAL ; } +if (!(current_level & profile_mode_mask) && + (level & profile_mode_mask)) { +/* enter UMD Pstate */ +amdgpu_device_ip_set_powergating_state (adev, +AMD_IP_BLOCK_TYPE_GFX , +AMD_PG_STATE_UNGATE ); +amdgpu_device_ip_set_clockgating_state (adev, +AMD_IP_BLOCK_TYPE_GFX , +AMD_CG_STATE_UNGATE ); + }else if ((current_level & profile_mode_mask) && + !(level & profile_mode_mask)) { +/* exit UMD Pstate */ +amdgpu_device_ip_set_clockgating_state (adev, +AMD_IP_BLOCK_TYPE_GFX , +AMD_CG_STATE_GATE ); +amdgpu_device_ip_set_powergating_state (adev, +AMD_IP_BLOCK_TYPE_GFX , +AMD_PG_STATE_GATE ); + } +if (amdgpu_dpm_force_performance_level (adev, level)) {pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c +9 -8
@@ -953,6 +953,7 @@ static struct amdgpu_ps *amdgpu_dpm_pick_power_state(struct amdgpu_device *adev,static int amdgpu_dpm_change_power_state_locked (struct amdgpu_device *adev) { +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;struct amdgpu_ps *ps;enum amd_pm_state_type dpm_state;int ret;
@@ -976,7 +977,7 @@ static int amdgpu_dpm_change_power_state_locked(struct amdgpu_device *adev)else return -EINVAL ; -if (amdgpu_dpm ==1 && adev->powerplay.pp_funcs->print_power_state) { +if (amdgpu_dpm ==1 && pp_funcs->print_power_state) {printk ("switching from power state:\n" );amdgpu_dpm_print_power_state (adev, adev->pm.dpm.current_ps);printk ("switching to power state:\n" );
@@ -985,14 +986,14 @@ static int amdgpu_dpm_change_power_state_locked(struct amdgpu_device *adev)/* update whether vce is active */ ps->vce_active = adev->pm.dpm.vce_active; -if (adev->powerplay.pp_funcs->display_configuration_changed) +if (pp_funcs->display_configuration_changed)amdgpu_dpm_display_configuration_changed (adev); ret =amdgpu_dpm_pre_set_power_state (adev);if (ret)return ret; -if (adev->powerplay.pp_funcs->check_state_equal) { +if (pp_funcs->check_state_equal) {if (0 !=amdgpu_dpm_check_state_equal (adev, adev->pm.dpm.current_ps, adev->pm.dpm.requested_ps, &equal)) equal = false; }
@@ -1000,24 +1001,24 @@ static int amdgpu_dpm_change_power_state_locked(struct amdgpu_device *adev)if (equal)return 0 ; -if (adev->powerplay.pp_funcs->set_power_state) - adev->powerplay.pp_funcs->set_power_state (adev->powerplay.pp_handle); +if (pp_funcs->set_power_state) + pp_funcs->set_power_state (adev->powerplay.pp_handle);amdgpu_dpm_post_set_power_state (adev); adev->pm.dpm.current_active_crtcs = adev->pm.dpm.new_active_crtcs; adev->pm.dpm.current_active_crtc_count = adev->pm.dpm.new_active_crtc_count; -if (adev->powerplay.pp_funcs->force_performance_level) { +if (pp_funcs->force_performance_level) {if (adev->pm.dpm.thermal_active) {enum amd_dpm_forced_level level = adev->pm.dpm.forced_level;/* force low perf level for thermal */ -amdgpu_dpm_force_performance_level (adev,AMD_DPM_FORCED_LEVEL_LOW ); + pp_funcs->force_performance_level (adev,AMD_DPM_FORCED_LEVEL_LOW );/* save the user's level */ adev->pm.dpm.forced_level = level; }else {/* otherwise, user selected level */ -amdgpu_dpm_force_performance_level (adev, adev->pm.dpm.forced_level); + pp_funcs->force_performance_level (adev, adev->pm.dpm.forced_level); } }
drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c +0 -12
@@ -323,12 +323,6 @@ static void pp_dpm_en_umd_pstate(struct pp_hwmgr *hwmgr,if (*level & profile_mode_mask) { hwmgr->saved_dpm_level = hwmgr->dpm_level; hwmgr->en_umd_pstate = true; -amdgpu_device_ip_set_powergating_state (hwmgr->adev, -AMD_IP_BLOCK_TYPE_GFX , -AMD_PG_STATE_UNGATE ); -amdgpu_device_ip_set_clockgating_state (hwmgr->adev, -AMD_IP_BLOCK_TYPE_GFX , -AMD_CG_STATE_UNGATE ); } }else {/* exit umd pstate, restore level, enable gfx cg*/
@@ -336,12 +330,6 @@ static void pp_dpm_en_umd_pstate(struct pp_hwmgr *hwmgr,if (*level ==AMD_DPM_FORCED_LEVEL_PROFILE_EXIT ) *level = hwmgr->saved_dpm_level; hwmgr->en_umd_pstate = false; -amdgpu_device_ip_set_clockgating_state (hwmgr->adev, -AMD_IP_BLOCK_TYPE_GFX , -AMD_CG_STATE_GATE ); -amdgpu_device_ip_set_powergating_state (hwmgr->adev, -AMD_IP_BLOCK_TYPE_GFX , -AMD_PG_STATE_GATE ); } } }
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0 -15
@@ -1674,14 +1674,7 @@ static int smu_enable_umd_pstate(void *handle,/* enter umd pstate, save current level, disable gfx cg*/ if (*level & profile_mode_mask) { smu_dpm_ctx->saved_dpm_level = smu_dpm_ctx->dpm_level; - smu_dpm_ctx->enable_umd_pstate = true;smu_gpo_control (smu, false); -amdgpu_device_ip_set_powergating_state (smu->adev, -AMD_IP_BLOCK_TYPE_GFX , -AMD_PG_STATE_UNGATE ); -amdgpu_device_ip_set_clockgating_state (smu->adev, -AMD_IP_BLOCK_TYPE_GFX , -AMD_CG_STATE_UNGATE );smu_gfx_ulv_control (smu, false);smu_deep_sleep_control (smu, false);amdgpu_asic_update_umd_stable_pstate (smu->adev, true);
@@ -1691,16 +1684,9 @@ static int smu_enable_umd_pstate(void *handle,if (!(*level & profile_mode_mask)) {if (*level ==AMD_DPM_FORCED_LEVEL_PROFILE_EXIT ) *level = smu_dpm_ctx->saved_dpm_level; - smu_dpm_ctx->enable_umd_pstate = false;amdgpu_asic_update_umd_stable_pstate (smu->adev, false);smu_deep_sleep_control (smu, true);smu_gfx_ulv_control (smu, true); -amdgpu_device_ip_set_clockgating_state (smu->adev, -AMD_IP_BLOCK_TYPE_GFX , -AMD_CG_STATE_GATE ); -amdgpu_device_ip_set_powergating_state (smu->adev, -AMD_IP_BLOCK_TYPE_GFX , -AMD_PG_STATE_GATE );smu_gpo_control (smu, true); } }
@@ -2146,7 +2132,6 @@ const struct amd_ip_funcs smu_ip_funcs = { .soft_reset = NULL, .set_clockgating_state = smu_set_clockgating_state, .set_powergating_state = smu_set_powergating_state, - .enable_umd_pstate = smu_enable_umd_pstate, }; const struct amdgpu_ip_block_version smu_v11_0_ip_block =
drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +0 -1
@@ -363,7 +363,6 @@ struct smu_dpm_context {uint32_t dpm_context_size;void *dpm_context;void *golden_dpm_context; -bool enable_umd_pstate;enum amd_dpm_forced_level dpm_level;enum amd_dpm_forced_level saved_dpm_level;enum amd_dpm_forced_level requested_dpm_level;
Signature · 1 line
2.29.0
RE: [PATCH V5 15/16] drm/amd/pm: revise the performance level setting APIs
[Public]
A coding style nitpick.
int ret = 0;
+ uint32_t profile_mode_mask = AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD |
+ AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK |
+ AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK |
+ AMD_DPM_FORCED_LEVEL_PROFILE_PEAK;
It's better to declare short variable at the end. So pls move "int ret = 0;" after profile_mode_mask.
Regards,
Guchun
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Evan Quan
Sent: Monday, December 13, 2021 11:52 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Lazar, Lijo <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH V5 15/16] drm/amd/pm: revise the performance level setting APIs
Avoid cross callings which make lock protection enforcement on amdgpu_dpm_force_performance_level() impossible.
--v1->v2:
- drop unused enable_umd_pstate callback(Lijo)
--- drivers/gpu/drm/amd/include/amd_shared.h | 2 -- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 29 ++++++++++++++++--- .../gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 17 ++++++----- .../gpu/drm/amd/pm/powerplay/amd_powerplay.c | 12 -------- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 15 ---------- drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 1 - 6 files changed, 34 insertions(+), 42 deletions(-)
drivers/gpu/drm/amd/include/amd_shared.h +0 -1
@@ -268,7 +268,6 @@ enum amd_dpm_forced_level;* @set_clockgating_state: enable/disable cg for the IP block * @set_powergating_state: enable/disable pg for the IP block * @get_clockgating_state: get current clockgating status -* @enable_umd_pstate: enable UMD powerstate * * These hooks provide an interface for controlling the operational state * of IP blocks. After acquiring a list of IP blocks for the GPU in use, @@ -299,7 +298,6 @@ struct amd_ip_funcs {
int (*set_powergating_state)(void *handle,
enum amd_powergating_state state);
void (*get_clockgating_state)(void *handle, u32 *flags);
- int (*enable_umd_pstate)(void *handle, enum amd_dpm_forced_level *level);
};
drivers/gpu/drm/amd/pm/amdgpu_pm.c +25 -4
@@ -301,6 +301,10 @@ static ssize_t amdgpu_set_power_dpm_force_performance_level(struct device *dev,enum amd_dpm_forced_level level;enum amd_dpm_forced_level current_level;int ret =0 ; +uint32_t profile_mode_mask =AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD | +AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK | +AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK | +AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ;if (amdgpu_in_reset (adev))return -EPERM ;
@@ -354,10 +358,7 @@ static ssize_t amdgpu_set_power_dpm_force_performance_level(struct device *dev, }/* profile_exit setting is valid only when current mode is in profile mode */ -if (!(current_level & (AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD | -AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK | -AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK | -AMD_DPM_FORCED_LEVEL_PROFILE_PEAK )) && +if (!(current_level & profile_mode_mask) && (level ==AMD_DPM_FORCED_LEVEL_PROFILE_EXIT )) {pr_err ("Currently not in any profile mode!\n" );pm_runtime_mark_last_busy (ddev->dev);
@@ -365,6 +366,26 @@ static ssize_t amdgpu_set_power_dpm_force_performance_level(struct device *dev,return -EINVAL ; } +if (!(current_level & profile_mode_mask) && + (level & profile_mode_mask)) { +/* enter UMD Pstate */ +amdgpu_device_ip_set_powergating_state (adev, +AMD_IP_BLOCK_TYPE_GFX , +AMD_PG_STATE_UNGATE ); +amdgpu_device_ip_set_clockgating_state (adev, +AMD_IP_BLOCK_TYPE_GFX , +AMD_CG_STATE_UNGATE ); + }else if ((current_level & profile_mode_mask) && + !(level & profile_mode_mask)) { +/* exit UMD Pstate */ +amdgpu_device_ip_set_clockgating_state (adev, +AMD_IP_BLOCK_TYPE_GFX , +AMD_CG_STATE_GATE ); +amdgpu_device_ip_set_powergating_state (adev, +AMD_IP_BLOCK_TYPE_GFX , +AMD_PG_STATE_GATE ); + } +if (amdgpu_dpm_force_performance_level (adev, level)) {pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c +2 -1
@@ -953,6 +953,7 @@ static struct amdgpu_ps *amdgpu_dpm_pick_power_state(struct amdgpu_device *adev,static int amdgpu_dpm_change_power_state_locked (struct amdgpu_device *adev) { +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;struct amdgpu_ps *ps;enum amd_pm_state_type dpm_state;int ret;
@@ -976,7 +977,7 @@ static int amdgpu_dpm_change_power_state_locked(struct amdgpu_device *adev)else return -EINVAL ; -if (amdgpu_dpm ==1 && adev->powerplay.pp_funcs->print_power_state) { +if (amdgpu_dpm ==1 && pp_funcs->print_power_state) {printk ("switching from power state:\n" );amdgpu_dpm_print_power_state (adev, adev->pm.dpm.current_ps); printk("switching to power state:\n"); @@ -985,14 +986,14 @@ static int amdgpu_dpm_change_power_state_locked(struct amdgpu_device *adev)
/* update whether vce is active */ ps->vce_active = adev->pm.dpm.vce_active;
- if (adev->powerplay.pp_funcs->display_configuration_changed)
+ if (pp_funcs->display_configuration_changed)
amdgpu_dpm_display_configuration_changed(adev);
ret = amdgpu_dpm_pre_set_power_state(adev); if (ret)
return ret;
- if (adev->powerplay.pp_funcs->check_state_equal) {
+ if (pp_funcs->check_state_equal) {
if (0 != amdgpu_dpm_check_state_equal(adev, adev->pm.dpm.current_ps, adev->pm.dpm.requested_ps, &equal))
equal = false;
}
@@ -1000,24 +1001,24 @@ static int amdgpu_dpm_change_power_state_locked(struct amdgpu_device *adev)
if (equal)
return 0;
- if (adev->powerplay.pp_funcs->set_power_state)
- adev->powerplay.pp_funcs->set_power_state(adev->powerplay.pp_handle);
+ if (pp_funcs->set_power_state)
+ pp_funcs->set_power_state(adev->powerplay.pp_handle);
amdgpu_dpm_post_set_power_state(adev);
adev->pm.dpm.current_active_crtcs = adev->pm.dpm.new_active_crtcs; adev->pm.dpm.current_active_crtc_count = adev->pm.dpm.new_active_crtc_count;
- if (adev->powerplay.pp_funcs->force_performance_level) {
+ if (pp_funcs->force_performance_level) {
if (adev->pm.dpm.thermal_active) {
enum amd_dpm_forced_level level = adev->pm.dpm.forced_level; /* force low perf level for thermal */
- amdgpu_dpm_force_performance_level(adev, AMD_DPM_FORCED_LEVEL_LOW);
+ pp_funcs->force_performance_level(adev, AMD_DPM_FORCED_LEVEL_LOW);
/* save the user's level */ adev->pm.dpm.forced_level = level;
} else {
/* otherwise, user selected level */
- amdgpu_dpm_force_performance_level(adev, adev->pm.dpm.forced_level);
+ pp_funcs->force_performance_level(adev, adev->pm.dpm.forced_level);
}
}
drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c +0 -6
@@ -323,12 +323,6 @@ static void pp_dpm_en_umd_pstate(struct pp_hwmgr *hwmgr,if (*level & profile_mode_mask) { hwmgr->saved_dpm_level = hwmgr->dpm_level; hwmgr->en_umd_pstate = true; -amdgpu_device_ip_set_powergating_state (hwmgr->adev, -AMD_IP_BLOCK_TYPE_GFX , -AMD_PG_STATE_UNGATE ); -amdgpu_device_ip_set_clockgating_state (hwmgr->adev, -AMD_IP_BLOCK_TYPE_GFX , -AMD_CG_STATE_UNGATE ); } }else { /* exit umd pstate, restore level, enable gfx cg*/ @@ -336,12 +330,6 @@ static void pp_dpm_en_umd_pstate(struct pp_hwmgr *hwmgr,
if (*level == AMD_DPM_FORCED_LEVEL_PROFILE_EXIT)
*level = hwmgr->saved_dpm_level;
hwmgr->en_umd_pstate = false;
- amdgpu_device_ip_set_clockgating_state(hwmgr->adev,
- AMD_IP_BLOCK_TYPE_GFX,
- AMD_CG_STATE_GATE);
- amdgpu_device_ip_set_powergating_state(hwmgr->adev,
- AMD_IP_BLOCK_TYPE_GFX,
- AMD_PG_STATE_GATE);
}
}
}
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0 -7
@@ -1674,14 +1674,7 @@ static int smu_enable_umd_pstate(void *handle,/* enter umd pstate, save current level, disable gfx cg*/ if (*level & profile_mode_mask) { smu_dpm_ctx->saved_dpm_level = smu_dpm_ctx->dpm_level; - smu_dpm_ctx->enable_umd_pstate = true;smu_gpo_control (smu, false); -amdgpu_device_ip_set_powergating_state (smu->adev, -AMD_IP_BLOCK_TYPE_GFX , -AMD_PG_STATE_UNGATE ); -amdgpu_device_ip_set_clockgating_state (smu->adev, -AMD_IP_BLOCK_TYPE_GFX , -AMD_CG_STATE_UNGATE );smu_gfx_ulv_control (smu, false);smu_deep_sleep_control (smu, false); amdgpu_asic_update_umd_stable_pstate(smu->adev, true); @@ -1691,16 +1684,9 @@ static int smu_enable_umd_pstate(void *handle,
if (!(*level & profile_mode_mask)) {
if (*level == AMD_DPM_FORCED_LEVEL_PROFILE_EXIT)
*level = smu_dpm_ctx->saved_dpm_level;
- smu_dpm_ctx->enable_umd_pstate = false;
amdgpu_asic_update_umd_stable_pstate(smu->adev, false); smu_deep_sleep_control(smu, true); smu_gfx_ulv_control(smu, true);
- amdgpu_device_ip_set_clockgating_state(smu->adev,
- AMD_IP_BLOCK_TYPE_GFX,
- AMD_CG_STATE_GATE);
- amdgpu_device_ip_set_powergating_state(smu->adev,
- AMD_IP_BLOCK_TYPE_GFX,
- AMD_PG_STATE_GATE);
smu_gpo_control(smu, true);
}
}
@@ -2146,7 +2132,6 @@ const struct amd_ip_funcs smu_ip_funcs = {
.soft_reset = NULL,
.set_clockgating_state = smu_set_clockgating_state, .set_powergating_state = smu_set_powergating_state,
- .enable_umd_pstate = smu_enable_umd_pstate,
};
const struct amdgpu_ip_block_version smu_v11_0_ip_block = diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
index 9d4a85c39ad2..778196167de2 100644
drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +0 -1
@@ -363,7 +363,6 @@ struct smu_dpm_context {uint32_t dpm_context_size;void *dpm_context;void *golden_dpm_context; -bool enable_umd_pstate;enum amd_dpm_forced_level dpm_level;enum amd_dpm_forced_level saved_dpm_level;enum amd_dpm_forced_level requested_dpm_level;
--
2.29.0
RE: [PATCH V5 15/16] drm/amd/pm: revise the performance level setting APIs
[Public]
Quoted 21 lines
-----Original Message-----
From: Chen, Guchun <[email protected]>
Sent: Monday, December 13, 2021 1:15 PM
To: Quan, Evan <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>; Lazar, Lijo <[email protected]>; Quan, Evan <[email protected]>
Subject: RE: [PATCH V5 15/16] drm/amd/pm: revise the performance level setting APIs[Public]
A coding style nitpick.
int ret = 0;(quoted diff) +1
-0+ uint32_t profile_mode_mask =
AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD|
+
AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK|
+
AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK|
+
Quoted 4 lines
AMD_DPM_FORCED_LEVEL_PROFILE_PEAK;It's better to declare short variable at the end. So pls move "int ret = 0;" after
profile_mode_mask.
[Quan, Evan] Sure, will update that.
BR
Evan
Quoted 320 lines
Regards,
Guchun-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Evan Quan
Sent: Monday, December 13, 2021 11:52 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Lazar, Lijo <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH V5 15/16] drm/amd/pm: revise the performance level setting APIsAvoid cross callings which make lock protection enforcement on
amdgpu_dpm_force_performance_level()impossible.Signed-off-by Evan Quan <[email protected]>Change-Id Ie658140f40ab906ce2ec47576a086062b61076a6--
v1->v2:
- drop unusedenable_umd_pstatecallback(Lijo)--- drivers/gpu/drm/amd/include/amd_shared.h | 2 -- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 29 ++++++++++++++++--- .../gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 17 ++++++----- .../gpu/drm/amd/pm/powerplay/amd_powerplay.c | 12 -------- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 15 ---------- drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 1 - 6 files changed, 34 insertions(+), 42 deletions(-)drivers/gpu/drm/amd/include/amd_shared.h +0
-1@@ -268,7 +268,6 @@ enum amd_dpm_forced_level;* @set_clockgating_state: enable/disable cg for the IP block * @set_powergating_state: enable/disable pg for the IP block * @get_clockgating_state: get current clockgating status -* @enable_umd_pstate: enable UMD powerstate * * These hooks provide an interface for controlling the operational state * of IP blocks. After acquiring a list of IP blocks for the GPU in use, @@ - 299,7 +298,6 @@ struct
amd_ip_funcs{drivers/gpu/drm/amd/include/amd_shared.h +0
-1int (*set_powergating_state)(void *handle,enum amd_powergating_state state);void (*get_clockgating_state)(void *handle,u32 *flags); - int (*enable_umd_pstate)(void *handle, enum
amd_dpm_forced_level*level);
};drivers/gpu/drm/amd/pm/amdgpu_pm.c +1
-0@@ -301,6 +301,10 @@ static ssize_t amdgpu_set_power_dpm_force_performance_level(struct device *dev, enum amd_dpm_forced_level level;enum amd_dpm_forced_level current_level;int ret =0 ; + uint32_t profile_mode_mask =
AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD|
+
AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK|
+
AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK|
+AMD_DPM_FORCED_LEVEL_PROFILE_PEAK;drivers/gpu/drm/amd/pm/amdgpu_pm.c +0
-0if (amdgpu_in_reset (adev))return -EPERM ;@@ -354,10 +358,7 @@ static ssize_t amdgpu_set_power_dpm_force_performance_level(struct device *dev, }/* profile_exit setting is valid only when current mode is in profile mode */
drivers/gpu/drm/amd/pm/amdgpu_pm.c +0
-1- if (!(current_level &(
AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD|drivers/gpu/drm/amd/pm/amdgpu_pm.c +9
-3- AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK | - AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK | - AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)) && +if (!(current_level & profile_mode_mask) && (level ==AMD_DPM_FORCED_LEVEL_PROFILE_EXIT )) {pr_err ("Currently not in any profile mode!\n" );pm_runtime_mark_last_busy (ddev->dev);@@ -365,6 +366,26 @@ static ssize_t amdgpu_set_power_dpm_force_performance_level(struct device *dev, return -EINVAL; } +if (!(current_level & profile_mode_mask) && + (level & profile_mode_mask)) { +/* enter UMD Pstate */ +amdgpu_device_ip_set_powergating_state (adev, +AMD_IP_BLOCK_TYPE_GFX , +AMD_PG_STATE_UNGATE ); + amdgpu_device_ip_set_clockgating_state(adev, +
AMD_IP_BLOCK_TYPE_GFX,
+AMD_CG_STATE_UNGATE);drivers/gpu/drm/amd/pm/amdgpu_pm.c +5
-0+ }else if ((current_level & profile_mode_mask) && + !(level & profile_mode_mask)) { +/* exit UMD Pstate */ + amdgpu_device_ip_set_clockgating_state(adev, +
AMD_IP_BLOCK_TYPE_GFX,drivers/gpu/drm/amd/pm/amdgpu_pm.c +3
-0+ AMD_CG_STATE_GATE); + amdgpu_device_ip_set_powergating_state(adev, +
AMD_IP_BLOCK_TYPE_GFX,drivers/gpu/drm/amd/pm/amdgpu_pm.c +3
-0+ AMD_PG_STATE_GATE); + } +if (amdgpu_dpm_force_performance_level (adev, level)) {pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c +1
-0@@ -953,6 +953,7 @@ static struct amdgpu_ps *amdgpu_dpm_pick_power_state(struct amdgpu_device *adev, static int amdgpu_dpm_change_power_state_locked(struct amdgpu_device *adev) { + const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; struct amdgpu_ps *ps; enum amd_pm_state_type dpm_state;drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c +1
-1int ret;@@ -976,7 +977,7 @@ static int amdgpu_dpm_change_power_state_locked(struct amdgpu_device *adev) elsereturn -EINVAL ; -if (amdgpu_dpm ==1 && adev->powerplay.pp_funcs- >print_power_state) { +if (amdgpu_dpm ==1 && pp_funcs->print_power_state) {printk ("switching from power state:\n" );amdgpu_dpm_print_power_state(adev, adev-
Quoted 1 line
pm.dpm.current_ps);
printk("switching to power state:\n"); @@ -985,14 +986,14
@@ static intamdgpu_dpm_change_power_state_locked(struct amdgpu_device *adev)drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c +2
-2/* update whether vce is active */ ps->vce_active = adev->pm.dpm.vce_active; -if (adev->powerplay.pp_funcs->display_configuration_changed) +if (pp_funcs->display_configuration_changed)amdgpu_dpm_display_configuration_changed (adev); ret =amdgpu_dpm_pre_set_power_state (adev);if (ret)return ret; - if (adev->powerplay.pp_funcs->check_state_equal) { + if (pp_funcs->check_state_equal) { if (0 != amdgpu_dpm_check_state_equal(adev, adev-Quoted 1 line
pm.dpm.current_ps,
adev->pm.dpm.requested_ps, &equal))drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c +4
-4equal = false; }@@ -1000,24 +1001,24 @@ static int amdgpu_dpm_change_power_state_locked(struct amdgpu_device *adev) if (equal) return 0; -if (adev->powerplay.pp_funcs->set_power_state) - adev->powerplay.pp_funcs->set_power_state (adev- >powerplay.pp_handle); + if (pp_funcs->set_power_state) + pp_funcs->set_power_state(adev->powerplay.pp_handle);amdgpu_dpm_post_set_power_state (adev); adev->pm.dpm.current_active_crtcs = adev- >pm.dpm.new_active_crtcs; adev->pm.dpm.current_active_crtc_count = adev- >pm.dpm.new_active_crtc_count; -if (adev->powerplay.pp_funcs->force_performance_level) { + if (pp_funcs->force_performance_level) {if (adev->pm.dpm.thermal_active) {enum amd_dpm_forced_level level = adev- >pm.dpm.forced_level;/* force low perf level for thermal */ -amdgpu_dpm_force_performance_level (adev, AMD_DPM_FORCED_LEVEL_LOW); + pp_funcs->force_performance_level (adev,AMD_DPM_FORCED_LEVEL_LOW );/* save the user's level */ drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c +0
-1adev->pm.dpm.forced_level = level; }else {/* otherwise, user selected level */ - amdgpu_dpm_force_performance_level(adev,
adev->pm.dpm.forced_level);drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c +1
-0+ pp_funcs->force_performance_level(adev, adev-Quoted 1 line
pm.dpm.forced_level);
drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c +0
-0} }drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c +0
-6@@ -323,12 +323,6 @@ static void pp_dpm_en_umd_pstate(struct pp_hwmgr *hwmgr, if (*level & profile_mode_mask) { hwmgr->saved_dpm_level = hwmgr->dpm_level; hwmgr->en_umd_pstate = true; -amdgpu_device_ip_set_powergating_state (hwmgr- >adev, -AMD_IP_BLOCK_TYPE_GFX , -AMD_PG_STATE_UNGATE ); -amdgpu_device_ip_set_clockgating_state (hwmgr- >adev, -AMD_IP_BLOCK_TYPE_GFX , -AMD_CG_STATE_UNGATE );drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c +1
-0} }else { /* exit umd pstate, restore level, enable gfx cg*/ @@ -336,12 +330,6 @@ static void pp_dpm_en_umd_pstate(struct pp_hwmgr *hwmgr, if (*level ==
AMD_DPM_FORCED_LEVEL_PROFILE_EXIT)drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c +0
-1*level = hwmgr->saved_dpm_level; hwmgr->en_umd_pstate = false; - amdgpu_device_ip_set_clockgating_state(hwmgr-Quoted 1 line
adev,
drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c +0
-3-AMD_IP_BLOCK_TYPE_GFX , - AMD_CG_STATE_GATE); - amdgpu_device_ip_set_powergating_state(hwmgr-Quoted 1 line
adev,
drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c +0
-2-AMD_IP_BLOCK_TYPE_GFX , - AMD_PG_STATE_GATE); } } }drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-4@@ -1674,14 +1674,7 @@ static int smu_enable_umd_pstate(void *handle,/* enter umd pstate, save current level, disable gfx cg*/ if (*level & profile_mode_mask) { smu_dpm_ctx->saved_dpm_level = smu_dpm_ctx- >dpm_level; - smu_dpm_ctx->enable_umd_pstate = true;smu_gpo_control (smu, false); - amdgpu_device_ip_set_powergating_state(smu- >adev, - AMD_IP_BLOCK_TYPE_GFX, -
AMD_PG_STATE_UNGATE);drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-1- amdgpu_device_ip_set_clockgating_state(smu-Quoted 1 line
adev,
-
AMD_IP_BLOCK_TYPE_GFX,
-AMD_CG_STATE_UNGATE);drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0smu_gfx_ulv_control (smu, false);smu_deep_sleep_control (smu, false); amdgpu_asic_update_umd_stable_pstate(smu-Quoted 1 line
adev, true); @@ -1691,16 +1684,9 @@ static int
smu_enable_umd_pstate(void *handle,
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0if (!(*level & profile_mode_mask)) { if (*level ==
AMD_DPM_FORCED_LEVEL_PROFILE_EXIT)drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-1*level = smu_dpm_ctx->saved_dpm_level; - smu_dpm_ctx->enable_umd_pstate = false; amdgpu_asic_update_umd_stable_pstate(smu-Quoted 1 line
adev, false);
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-1smu_deep_sleep_control (smu, true);smu_gfx_ulv_control (smu, true); - amdgpu_device_ip_set_clockgating_state(smu-Quoted 1 line
adev,
-
AMD_IP_BLOCK_TYPE_GFX,
-AMD_CG_STATE_GATE);drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-1- amdgpu_device_ip_set_powergating_state(smu-Quoted 1 line
adev,
-
AMD_IP_BLOCK_TYPE_GFX,
-AMD_PG_STATE_GATE);drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-1smu_gpo_control (smu, true); } }@@ -2146,7 +2132,6 @@ const struct amd_ip_funcs smu_ip_funcs = { .soft_reset = NULL, .set_clockgating_state = smu_set_clockgating_state, .set_powergating_state = smu_set_powergating_state, - .enable_umd_pstate = smu_enable_umd_pstate, }; const struct amdgpu_ip_block_version smu_v11_0_ip_block = diff --git
a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.hb/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
index9d4a85c39ad2..778196167de2100644drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +0
-2@@ -363,7 +363,6 @@ struct smu_dpm_context {uint32_t dpm_context_size;void *dpm_context;void *golden_dpm_context; -bool enable_umd_pstate;enum amd_dpm_forced_level dpm_level;enum amd_dpm_forced_level saved_dpm_level;enum amd_dpm_forced_level requested_dpm_level; --2.29.0
PATCH v5 16/16 drm/amd/pm: unified lock protections in amdgpu_dpm.c
In reply to Evan QuanAs the only entry point, it's now safe and reasonable to enforce the lock protections in amdgpu_dpm.c. And with this, we can drop other internal used power locks.
--- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 707 +++++++++++++++------ drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 16 +- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 16 +- 3 files changed, 526 insertions(+), 213 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +524 -183
@@ -39,15 +39,33 @@int amdgpu_dpm_get_sclk (struct amdgpu_device *adev,bool low) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ; + +if (!pp_funcs->get_sclk) +return 0 ; -return pp_funcs->get_sclk ((adev)->powerplay.pp_handle, (low)); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_sclk ((adev)->powerplay.pp_handle, + low); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_get_mclk (struct amdgpu_device *adev,bool low) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ; + +if (!pp_funcs->get_mclk) +return 0 ; + +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_mclk ((adev)->powerplay.pp_handle, + low); +mutex_unlock (&adev->pm.mutex); -return pp_funcs->get_mclk ((adev)->powerplay.pp_handle, (low)); +return ret; }int amdgpu_dpm_set_powergating_by_smu (struct amdgpu_device *adev,uint32_t block_type,bool gate)
@@ -62,52 +80,20 @@ int amdgpu_dpm_set_powergating_by_smu(struct amdgpu_device *adev, uint32_t blockreturn 0 ; } +mutex_lock (&adev->pm.mutex); +switch (block_type) {case AMD_IP_BLOCK_TYPE_UVD :case AMD_IP_BLOCK_TYPE_VCE : -if (pp_funcs && pp_funcs->set_powergating_by_smu) { -/* -* TODO: need a better lock mechanism -* -* Here adev->pm.mutex lock protection is enforced on -* UVD and VCE cases only. Since for other cases, there -* may be already lock protection in amdgpu_pm.c. -* This is a quick fix for the deadlock issue below. -* NFO: task ocltst:2028 blocked for more than 120 seconds. -* Tainted: G OE 5.0.0-37-generic #40~18.04.1-Ubuntu -* echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. -* cltst D 0 2028 2026 0x00000000 -* all Trace: -* __schedule+0x2c0/0x870 -* schedule+0x2c/0x70 -* schedule_preempt_disabled+0xe/0x10 -* __mutex_lock.isra.9+0x26d/0x4e0 -* __mutex_lock_slowpath+0x13/0x20 -* ? __mutex_lock_slowpath+0x13/0x20 -* mutex_lock+0x2f/0x40 -* amdgpu_dpm_set_powergating_by_smu+0x64/0xe0 [amdgpu] -* gfx_v8_0_enable_gfx_static_mg_power_gating+0x3c/0x70 [amdgpu] -* gfx_v8_0_set_powergating_state+0x66/0x260 [amdgpu] -* amdgpu_device_ip_set_powergating_state+0x62/0xb0 [amdgpu] -* pp_dpm_force_performance_level+0xe7/0x100 [amdgpu] -* amdgpu_set_dpm_forced_performance_level+0x129/0x330 [amdgpu] -*/ -mutex_lock (&adev->pm.mutex); - ret = (pp_funcs->set_powergating_by_smu ( - (adev)->powerplay.pp_handle, block_type, gate)); -mutex_unlock (&adev->pm.mutex); - } -break ;case AMD_IP_BLOCK_TYPE_GFX :case AMD_IP_BLOCK_TYPE_VCN :case AMD_IP_BLOCK_TYPE_SDMA :case AMD_IP_BLOCK_TYPE_JPEG :case AMD_IP_BLOCK_TYPE_GMC :case AMD_IP_BLOCK_TYPE_ACP : -if (pp_funcs && pp_funcs->set_powergating_by_smu) { +if (pp_funcs && pp_funcs->set_powergating_by_smu) ret = (pp_funcs->set_powergating_by_smu ( (adev)->powerplay.pp_handle, block_type, gate)); - }break ;default :break ;
@@ -116,6 +102,8 @@ int amdgpu_dpm_set_powergating_by_smu(struct amdgpu_device *adev, uint32_t blockif (!ret)atomic_set (&adev->pm.pwr_state[block_type], pwr_state); +mutex_unlock (&adev->pm.mutex); +return ret; }
@@ -128,9 +116,13 @@ int amdgpu_dpm_baco_enter(struct amdgpu_device *adev)if (!pp_funcs || !pp_funcs->set_asic_baco_state)return -ENOENT ; +mutex_lock (&adev->pm.mutex); +/* enter BACO state */ ret = pp_funcs->set_asic_baco_state (pp_handle,1 ); +mutex_unlock (&adev->pm.mutex); +return ret; }
@@ -143,9 +135,13 @@ int amdgpu_dpm_baco_exit(struct amdgpu_device *adev)if (!pp_funcs || !pp_funcs->set_asic_baco_state)return -ENOENT ; +mutex_lock (&adev->pm.mutex); +/* exit BACO state */ ret = pp_funcs->set_asic_baco_state (pp_handle,0 ); +mutex_unlock (&adev->pm.mutex); +return ret; }
@@ -156,9 +152,13 @@ int amdgpu_dpm_set_mp1_state(struct amdgpu_device *adev,const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;if (pp_funcs && pp_funcs->set_mp1_state) { +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_mp1_state ( adev->powerplay.pp_handle, mp1_state); + +mutex_unlock (&adev->pm.mutex); }return ret;
@@ -169,25 +169,37 @@ bool amdgpu_dpm_is_baco_supported(struct amdgpu_device *adev)const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;void *pp_handle = adev->powerplay.pp_handle;bool baco_cap; +int ret =0 ;if (!pp_funcs || !pp_funcs->get_asic_baco_capability)return false; -if (pp_funcs->get_asic_baco_capability (pp_handle, &baco_cap)) -return false; +mutex_lock (&adev->pm.mutex); + + ret = pp_funcs->get_asic_baco_capability (pp_handle, + &baco_cap); -return baco_cap; +mutex_unlock (&adev->pm.mutex); + +return ret ? false : baco_cap; }int amdgpu_dpm_mode2_reset (struct amdgpu_device *adev) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;void *pp_handle = adev->powerplay.pp_handle; +int ret =0 ;if (!pp_funcs || !pp_funcs->asic_reset_mode_2)return -ENOENT ; -return pp_funcs->asic_reset_mode_2 (pp_handle); +mutex_lock (&adev->pm.mutex); + + ret = pp_funcs->asic_reset_mode_2 (pp_handle); + +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_baco_reset (struct amdgpu_device *adev)
@@ -199,37 +211,47 @@ int amdgpu_dpm_baco_reset(struct amdgpu_device *adev)if (!pp_funcs || !pp_funcs->set_asic_baco_state)return -ENOENT ; +mutex_lock (&adev->pm.mutex); +/* enter BACO state */ ret = pp_funcs->set_asic_baco_state (pp_handle,1 );if (ret) -return ret; + goto out;/* exit BACO state */ ret = pp_funcs->set_asic_baco_state (pp_handle,0 ); -if (ret) -return ret; -return 0 ; +out: +mutex_unlock (&adev->pm.mutex); +return ret; }bool amdgpu_dpm_is_mode1_reset_supported (struct amdgpu_device *adev) {struct smu_context *smu = adev->powerplay.pp_handle; +bool support_mode1_reset = false; -if (is_support_sw_smu (adev)) -return smu_mode1_reset_is_support (smu); +if (is_support_sw_smu (adev)) { +mutex_lock (&adev->pm.mutex); + support_mode1_reset =smu_mode1_reset_is_support (smu); +mutex_unlock (&adev->pm.mutex); + } -return false; +return support_mode1_reset; }int amdgpu_dpm_mode1_reset (struct amdgpu_device *adev) {struct smu_context *smu = adev->powerplay.pp_handle; +int ret = -EOPNOTSUPP ; -if (is_support_sw_smu (adev)) -return smu_mode1_reset (smu); +if (is_support_sw_smu (adev)) { +mutex_lock (&adev->pm.mutex); + ret =smu_mode1_reset (smu); +mutex_unlock (&adev->pm.mutex); + } -return -EOPNOTSUPP ; +return ret; } int amdgpu_dpm_switch_power_profile(struct amdgpu_device *adev,
@@ -242,9 +264,12 @@ int amdgpu_dpm_switch_power_profile(struct amdgpu_device *adev,if (amdgpu_sriov_vf (adev))return 0 ; -if (pp_funcs && pp_funcs->switch_power_profile) +if (pp_funcs && pp_funcs->switch_power_profile) { +mutex_lock (&adev->pm.mutex); ret = pp_funcs->switch_power_profile ( adev->powerplay.pp_handle, type, en); +mutex_unlock (&adev->pm.mutex); + }return ret; }
@@ -255,9 +280,12 @@ int amdgpu_dpm_set_xgmi_pstate(struct amdgpu_device *adev,const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;int ret =0 ; -if (pp_funcs && pp_funcs->set_xgmi_pstate) +if (pp_funcs && pp_funcs->set_xgmi_pstate) { +mutex_lock (&adev->pm.mutex); ret = pp_funcs->set_xgmi_pstate (adev->powerplay.pp_handle, pstate); +mutex_unlock (&adev->pm.mutex); + }return ret; }
@@ -269,8 +297,11 @@ int amdgpu_dpm_set_df_cstate(struct amdgpu_device *adev,const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;void *pp_handle = adev->powerplay.pp_handle; -if (pp_funcs && pp_funcs->set_df_cstate) +if (pp_funcs && pp_funcs->set_df_cstate) { +mutex_lock (&adev->pm.mutex); ret = pp_funcs->set_df_cstate (pp_handle, cstate); +mutex_unlock (&adev->pm.mutex); + }return ret; }
@@ -278,11 +309,15 @@ int amdgpu_dpm_set_df_cstate(struct amdgpu_device *adev,int amdgpu_dpm_allow_xgmi_power_down (struct amdgpu_device *adev,bool en) {struct smu_context *smu = adev->powerplay.pp_handle; +int ret =0 ; -if (is_support_sw_smu (adev)) -return smu_allow_xgmi_power_down (smu, en); +if (is_support_sw_smu (adev)) { +mutex_lock (&adev->pm.mutex); + ret =smu_allow_xgmi_power_down (smu, en); +mutex_unlock (&adev->pm.mutex); + } -return 0 ; +return ret; }int amdgpu_dpm_enable_mgpu_fan_boost (struct amdgpu_device *adev)
@@ -292,8 +327,11 @@ int amdgpu_dpm_enable_mgpu_fan_boost(struct amdgpu_device *adev) adev->powerplay.pp_funcs;int ret =0 ; -if (pp_funcs && pp_funcs->enable_mgpu_fan_boost) +if (pp_funcs && pp_funcs->enable_mgpu_fan_boost) { +mutex_lock (&adev->pm.mutex); ret = pp_funcs->enable_mgpu_fan_boost (pp_handle); +mutex_unlock (&adev->pm.mutex); + }return ret; }
@@ -306,9 +344,12 @@ int amdgpu_dpm_set_clockgating_by_smu(struct amdgpu_device *adev, adev->powerplay.pp_funcs;int ret =0 ; -if (pp_funcs && pp_funcs->set_clockgating_by_smu) +if (pp_funcs && pp_funcs->set_clockgating_by_smu) { +mutex_lock (&adev->pm.mutex); ret = pp_funcs->set_clockgating_by_smu (pp_handle, msg_id); +mutex_unlock (&adev->pm.mutex); + }return ret; }
@@ -321,9 +362,12 @@ int amdgpu_dpm_smu_i2c_bus_access(struct amdgpu_device *adev, adev->powerplay.pp_funcs;int ret = -EOPNOTSUPP ; -if (pp_funcs && pp_funcs->smu_i2c_bus_access) +if (pp_funcs && pp_funcs->smu_i2c_bus_access) { +mutex_lock (&adev->pm.mutex); ret = pp_funcs->smu_i2c_bus_access (pp_handle, acquire); +mutex_unlock (&adev->pm.mutex); + }return ret; }
@@ -336,13 +380,15 @@ void amdgpu_pm_acpi_event_handler(struct amdgpu_device *adev) adev->pm.ac_power = true; else adev->pm.ac_power = false; +if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->enable_bapm)amdgpu_dpm_enable_bapm (adev, adev->pm.ac_power); -mutex_unlock (&adev->pm.mutex);if (is_support_sw_smu (adev))smu_set_ac_dc (adev->powerplay.pp_handle); + +mutex_unlock (&adev->pm.mutex); } }
@@ -350,16 +396,19 @@ int amdgpu_dpm_read_sensor(struct amdgpu_device *adev, enum amd_pp_sensors senso void *data, uint32_t *size) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; -int ret =0 ; +int ret = -EINVAL ;if (!data || !size)return -EINVAL ; -if (pp_funcs && pp_funcs->read_sensor) - ret = pp_funcs->read_sensor ((adev)->powerplay.pp_handle, - sensor, data, size); -else - ret = -EINVAL ; +if (pp_funcs && pp_funcs->read_sensor) { +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->read_sensor (adev->powerplay.pp_handle, + sensor, + data, + size); +mutex_unlock (&adev->pm.mutex); + }return ret; }
@@ -374,7 +423,9 @@ void amdgpu_dpm_compute_clocks(struct amdgpu_device *adev)if (!pp_funcs->pm_compute_clocks)return ; +mutex_lock (&adev->pm.mutex); pp_funcs->pm_compute_clocks (adev->powerplay.pp_handle); +mutex_unlock (&adev->pm.mutex); }void amdgpu_dpm_enable_uvd (struct amdgpu_device *adev,bool enable)
@@ -409,32 +460,51 @@ void amdgpu_dpm_enable_jpeg(struct amdgpu_device *adev, bool enable)int amdgpu_pm_load_smu_firmware (struct amdgpu_device *adev,uint32_t *smu_version) { -int r; +const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int r =0 ; -if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->load_firmware) { - r = adev->powerplay.pp_funcs->load_firmware (adev->powerplay.pp_handle); -if (r) { -pr_err ("smu firmware loading failed\n" ); -return r; - } +if (!pp_funcs->load_firmware) +return 0 ; -if (smu_version) - *smu_version = adev->pm.fw_version; +mutex_lock (&adev->pm.mutex); + r = pp_funcs->load_firmware (adev->powerplay.pp_handle); +if (r) { +pr_err ("smu firmware loading failed\n" ); + goto out; } -return 0 ; +if (smu_version) + *smu_version = adev->pm.fw_version; + +out: +mutex_unlock (&adev->pm.mutex); +return r; }int amdgpu_dpm_set_light_sbr (struct amdgpu_device *adev,bool enable) { -return smu_set_light_sbr (adev->powerplay.pp_handle, enable); +int ret =0 ; + +if (is_support_sw_smu (adev)) { +mutex_lock (&adev->pm.mutex); + ret =smu_set_light_sbr (adev->powerplay.pp_handle, + enable); +mutex_unlock (&adev->pm.mutex); + } + +return ret; }int amdgpu_dpm_send_hbm_bad_pages_num (struct amdgpu_device *adev,uint32_t size) {struct smu_context *smu = adev->powerplay.pp_handle; +int ret =0 ; + +mutex_lock (&adev->pm.mutex); + ret =smu_send_hbm_bad_pages_num (smu, size); +mutex_unlock (&adev->pm.mutex); -return smu_send_hbm_bad_pages_num (smu, size); +return ret; } int amdgpu_dpm_get_dpm_freq_range(struct amdgpu_device *adev,
@@ -442,15 +512,22 @@ int amdgpu_dpm_get_dpm_freq_range(struct amdgpu_device *adev,uint32_t *min, uint32_t *max) { + int ret = 0; + +if (type !=PP_SCLK ) +return -EINVAL ; +if (!is_support_sw_smu (adev))return -EOPNOTSUPP ; -switch (type) { -case PP_SCLK : -return smu_get_dpm_freq_range (adev->powerplay.pp_handle,SMU_SCLK , min, max); -default : -return -EINVAL ; - } +mutex_lock (&adev->pm.mutex); + ret =smu_get_dpm_freq_range (adev->powerplay.pp_handle, +SMU_SCLK , + min, + max); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_set_soft_freq_range(struct amdgpu_device *adev,
@@ -459,26 +536,37 @@ int amdgpu_dpm_set_soft_freq_range(struct amdgpu_device *adev, uint32_t max) {struct smu_context *smu = adev->powerplay.pp_handle; +int ret =0 ; + +if (type !=PP_SCLK ) +return -EINVAL ;if (!is_support_sw_smu (adev))return -EOPNOTSUPP ; -switch (type) { -case PP_SCLK : -return smu_set_soft_freq_range (smu,SMU_SCLK , min, max); -default : -return -EINVAL ; - } +mutex_lock (&adev->pm.mutex); + ret =smu_set_soft_freq_range (smu, +SMU_SCLK , + min, + max); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_write_watermarks_table (struct amdgpu_device *adev) {struct smu_context *smu = adev->powerplay.pp_handle; +int ret =0 ;if (!is_support_sw_smu (adev))return 0 ; -return smu_write_watermarks_table (smu); +mutex_lock (&adev->pm.mutex); + ret =smu_write_watermarks_table (smu); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_wait_for_event(struct amdgpu_device *adev,
@@ -486,27 +574,40 @@ int amdgpu_dpm_wait_for_event(struct amdgpu_device *adev, uint64_t event_arg) {struct smu_context *smu = adev->powerplay.pp_handle; +int ret =0 ;if (!is_support_sw_smu (adev))return -EOPNOTSUPP ; -return smu_wait_for_event (smu, event, event_arg); +mutex_lock (&adev->pm.mutex); + ret =smu_wait_for_event (smu, event, event_arg); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_get_status_gfxoff (struct amdgpu_device *adev,uint32_t *value) {struct smu_context *smu = adev->powerplay.pp_handle; +int ret =0 ;if (!is_support_sw_smu (adev))return -EOPNOTSUPP ; -return smu_get_status_gfxoff (smu, value); +mutex_lock (&adev->pm.mutex); + ret =smu_get_status_gfxoff (smu, value); +mutex_unlock (&adev->pm.mutex); + +return ret; }uint64_t amdgpu_dpm_get_thermal_throttling_counter (struct amdgpu_device *adev) {struct smu_context *smu = adev->powerplay.pp_handle; +if (!is_support_sw_smu (adev)) +return 0 ; +return atomic64_read (&smu->throttle_int_counter); }
@@ -541,12 +642,17 @@ struct amd_vce_state *amdgpu_dpm_get_vce_clock_state(struct amdgpu_device *adev, uint32_t idx) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +struct amd_vce_state *vstate =NULL ;if (!pp_funcs->get_vce_clock_state)return NULL ; -return pp_funcs->get_vce_clock_state (adev->powerplay.pp_handle, - idx); +mutex_lock (&adev->pm.mutex); + vstate = pp_funcs->get_vce_clock_state (adev->powerplay.pp_handle, + idx); +mutex_unlock (&adev->pm.mutex); + +return vstate; } void amdgpu_dpm_get_current_power_state(struct amdgpu_device *adev,
@@ -554,21 +660,28 @@ void amdgpu_dpm_get_current_power_state(struct amdgpu_device *adev, {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +mutex_lock (&adev->pm.mutex); +if (!pp_funcs->get_current_power_state) { *state = adev->pm.dpm.user_state; -return ; + goto out; } *state = pp_funcs->get_current_power_state (adev->powerplay.pp_handle);if (*state <POWER_STATE_TYPE_DEFAULT || *state >POWER_STATE_TYPE_INTERNAL_3DPERF ) *state = adev->pm.dpm.user_state; + +out: +mutex_unlock (&adev->pm.mutex); }void amdgpu_dpm_set_power_state (struct amdgpu_device *adev,enum amd_pm_state_type state) { +mutex_lock (&adev->pm.mutex); adev->pm.dpm.user_state = state; +mutex_unlock (&adev->pm.mutex);if (is_support_sw_smu (adev))return ;
@@ -584,10 +697,12 @@ enum amd_dpm_forced_level amdgpu_dpm_get_performance_level(struct amdgpu_deviceconst struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs;enum amd_dpm_forced_level level; +mutex_lock (&adev->pm.mutex);if (pp_funcs->get_performance_level) level = pp_funcs->get_performance_level (adev->powerplay.pp_handle);else level = adev->pm.dpm.forced_level; +mutex_unlock (&adev->pm.mutex);return level; }
@@ -596,30 +711,46 @@ int amdgpu_dpm_force_performance_level(struct amdgpu_device *adev, enum amd_dpm_forced_level level) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ; -if (pp_funcs->force_performance_level) { -if (adev->pm.dpm.thermal_active) -return -EINVAL ; +if (!pp_funcs->force_performance_level) +return 0 ; -if (pp_funcs->force_performance_level (adev->powerplay.pp_handle, - level)) -return -EINVAL ; +mutex_lock (&adev->pm.mutex); - adev->pm.dpm.forced_level = level; +if (adev->pm.dpm.thermal_active) { + ret = -EINVAL ; + goto out; } -return 0 ; +if (pp_funcs->force_performance_level (adev->powerplay.pp_handle, + level)) + ret = -EINVAL ; + +if (!ret) + adev->pm.dpm.forced_level = level; + +out: +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_get_pp_num_states (struct amdgpu_device *adev,struct pp_states_info *states) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->get_pp_num_states)return -EOPNOTSUPP ; -return pp_funcs->get_pp_num_states (adev->powerplay.pp_handle, states); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_pp_num_states (adev->powerplay.pp_handle, + states); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_dispatch_task(struct amdgpu_device *adev,
@@ -627,21 +758,34 @@ int amdgpu_dpm_dispatch_task(struct amdgpu_device *adev, enum amd_pm_state_type *user_state) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->dispatch_tasks)return -EOPNOTSUPP ; -return pp_funcs->dispatch_tasks (adev->powerplay.pp_handle, task_id, user_state); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->dispatch_tasks (adev->powerplay.pp_handle, + task_id, + user_state); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_get_pp_table (struct amdgpu_device *adev,char **table) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->get_pp_table)return 0 ; -return pp_funcs->get_pp_table (adev->powerplay.pp_handle, table); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_pp_table (adev->powerplay.pp_handle, + table); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_set_fine_grain_clk_vol(struct amdgpu_device *adev,
@@ -650,14 +794,19 @@ int amdgpu_dpm_set_fine_grain_clk_vol(struct amdgpu_device *adev, uint32_t size) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->set_fine_grain_clk_vol)return 0 ; -return pp_funcs->set_fine_grain_clk_vol (adev->powerplay.pp_handle, - type, - input, - size); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_fine_grain_clk_vol (adev->powerplay.pp_handle, + type, + input, + size); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_odn_edit_dpm_table(struct amdgpu_device *adev,
@@ -666,14 +815,19 @@ int amdgpu_dpm_odn_edit_dpm_table(struct amdgpu_device *adev, uint32_t size) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->odn_edit_dpm_table)return 0 ; -return pp_funcs->odn_edit_dpm_table (adev->powerplay.pp_handle, - type, - input, - size); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->odn_edit_dpm_table (adev->powerplay.pp_handle, + type, + input, + size); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_print_clock_levels(struct amdgpu_device *adev,
@@ -681,36 +835,51 @@ int amdgpu_dpm_print_clock_levels(struct amdgpu_device *adev, char *buf) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->print_clock_levels)return 0 ; -return pp_funcs->print_clock_levels (adev->powerplay.pp_handle, - type, - buf); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->print_clock_levels (adev->powerplay.pp_handle, + type, + buf); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_set_ppfeature_status (struct amdgpu_device *adev,uint64_t ppfeature_masks) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->set_ppfeature_status)return 0 ; -return pp_funcs->set_ppfeature_status (adev->powerplay.pp_handle, - ppfeature_masks); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_ppfeature_status (adev->powerplay.pp_handle, + ppfeature_masks); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_get_ppfeature_status (struct amdgpu_device *adev,char *buf) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->get_ppfeature_status)return 0 ; -return pp_funcs->get_ppfeature_status (adev->powerplay.pp_handle, - buf); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_ppfeature_status (adev->powerplay.pp_handle, + buf); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_force_clock_level(struct amdgpu_device *adev,
@@ -718,23 +887,33 @@ int amdgpu_dpm_force_clock_level(struct amdgpu_device *adev, uint32_t mask) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->force_clock_level)return 0 ; -return pp_funcs->force_clock_level (adev->powerplay.pp_handle, - type, - mask); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->force_clock_level (adev->powerplay.pp_handle, + type, + mask); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_get_sclk_od (struct amdgpu_device *adev) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->get_sclk_od)return 0 ; -return pp_funcs->get_sclk_od (adev->powerplay.pp_handle); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_sclk_od (adev->powerplay.pp_handle); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_set_sclk_od (struct amdgpu_device *adev,uint32_t value)
@@ -744,8 +923,10 @@ int amdgpu_dpm_set_sclk_od(struct amdgpu_device *adev, uint32_t value)if (is_support_sw_smu (adev))return 0 ; +mutex_lock (&adev->pm.mutex);if (pp_funcs->set_sclk_od) pp_funcs->set_sclk_od (adev->powerplay.pp_handle, value); +mutex_unlock (&adev->pm.mutex); if (amdgpu_dpm_dispatch_task(adev, AMD_PP_TASK_READJUST_POWER_STATE,
@@ -760,11 +941,16 @@ int amdgpu_dpm_set_sclk_od(struct amdgpu_device *adev, uint32_t value)int amdgpu_dpm_get_mclk_od (struct amdgpu_device *adev) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->get_mclk_od)return 0 ; -return pp_funcs->get_mclk_od (adev->powerplay.pp_handle); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_mclk_od (adev->powerplay.pp_handle); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_set_mclk_od (struct amdgpu_device *adev,uint32_t value)
@@ -774,8 +960,10 @@ int amdgpu_dpm_set_mclk_od(struct amdgpu_device *adev, uint32_t value)if (is_support_sw_smu (adev))return 0 ; +mutex_lock (&adev->pm.mutex);if (pp_funcs->set_mclk_od) pp_funcs->set_mclk_od (adev->powerplay.pp_handle, value); +mutex_unlock (&adev->pm.mutex); if (amdgpu_dpm_dispatch_task(adev, AMD_PP_TASK_READJUST_POWER_STATE,
@@ -791,35 +979,51 @@ int amdgpu_dpm_get_power_profile_mode(struct amdgpu_device *adev, char *buf) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->get_power_profile_mode)return -EOPNOTSUPP ; -return pp_funcs->get_power_profile_mode (adev->powerplay.pp_handle, - buf); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_power_profile_mode (adev->powerplay.pp_handle, + buf); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_set_power_profile_mode (struct amdgpu_device *adev,long *input,uint32_t size) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->set_power_profile_mode)return 0 ; -return pp_funcs->set_power_profile_mode (adev->powerplay.pp_handle, - input, - size); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_power_profile_mode (adev->powerplay.pp_handle, + input, + size); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_get_gpu_metrics (struct amdgpu_device *adev,void **table) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->get_gpu_metrics)return 0 ; -return pp_funcs->get_gpu_metrics (adev->powerplay.pp_handle, table); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_gpu_metrics (adev->powerplay.pp_handle, + table); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_get_fan_control_mode(struct amdgpu_device *adev,
@@ -830,7 +1034,9 @@ int amdgpu_dpm_get_fan_control_mode(struct amdgpu_device *adev,if (!pp_funcs->get_fan_control_mode)return -EOPNOTSUPP ; +mutex_lock (&adev->pm.mutex); *fan_mode = pp_funcs->get_fan_control_mode (adev->powerplay.pp_handle); +mutex_unlock (&adev->pm.mutex);return 0 ; }
@@ -839,44 +1045,68 @@ int amdgpu_dpm_set_fan_speed_pwm(struct amdgpu_device *adev, uint32_t speed) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->set_fan_speed_pwm)return -EINVAL ; -return pp_funcs->set_fan_speed_pwm (adev->powerplay.pp_handle, speed); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_fan_speed_pwm (adev->powerplay.pp_handle, + speed); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_get_fan_speed_pwm (struct amdgpu_device *adev,uint32_t *speed) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->get_fan_speed_pwm)return -EINVAL ; -return pp_funcs->get_fan_speed_pwm (adev->powerplay.pp_handle, speed); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_fan_speed_pwm (adev->powerplay.pp_handle, + speed); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_get_fan_speed_rpm (struct amdgpu_device *adev,uint32_t *speed) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->get_fan_speed_rpm)return -EINVAL ; -return pp_funcs->get_fan_speed_rpm (adev->powerplay.pp_handle, speed); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_fan_speed_rpm (adev->powerplay.pp_handle, + speed); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_set_fan_speed_rpm (struct amdgpu_device *adev,uint32_t speed) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->set_fan_speed_rpm)return -EINVAL ; -return pp_funcs->set_fan_speed_rpm (adev->powerplay.pp_handle, speed); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_fan_speed_rpm (adev->powerplay.pp_handle, + speed); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_set_fan_control_mode(struct amdgpu_device *adev,
@@ -887,7 +1117,10 @@ int amdgpu_dpm_set_fan_control_mode(struct amdgpu_device *adev,if (!pp_funcs->set_fan_control_mode)return -EOPNOTSUPP ; - pp_funcs->set_fan_control_mode (adev->powerplay.pp_handle, mode); +mutex_lock (&adev->pm.mutex); + pp_funcs->set_fan_control_mode (adev->powerplay.pp_handle, + mode); +mutex_unlock (&adev->pm.mutex);return 0 ; }
@@ -898,33 +1131,50 @@ int amdgpu_dpm_get_power_limit(struct amdgpu_device *adev, enum pp_power_type power_type) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->get_power_limit)return -ENODATA ; -return pp_funcs->get_power_limit (adev->powerplay.pp_handle, - limit, - pp_limit_level, - power_type); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_power_limit (adev->powerplay.pp_handle, + limit, + pp_limit_level, + power_type); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_set_power_limit (struct amdgpu_device *adev,uint32_t limit) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->set_power_limit)return -EINVAL ; -return pp_funcs->set_power_limit (adev->powerplay.pp_handle, limit); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_power_limit (adev->powerplay.pp_handle, + limit); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_is_cclk_dpm_supported (struct amdgpu_device *adev) { +bool cclk_dpm_supported = false; +if (!is_support_sw_smu (adev))return false; -return is_support_cclk_dpm (adev); +mutex_lock (&adev->pm.mutex); + cclk_dpm_supported =is_support_cclk_dpm (adev); +mutex_unlock (&adev->pm.mutex); + +return (int )cclk_dpm_supported; } int amdgpu_dpm_debugfs_print_current_performance_level(struct amdgpu_device *adev,
@@ -935,8 +1185,10 @@ int amdgpu_dpm_debugfs_print_current_performance_level(struct amdgpu_device *adeif (!pp_funcs->debugfs_print_current_performance_level)return -EOPNOTSUPP ; +mutex_lock (&adev->pm.mutex); pp_funcs->debugfs_print_current_performance_level (adev->powerplay.pp_handle, m); +mutex_unlock (&adev->pm.mutex);return 0 ; }
@@ -946,13 +1198,18 @@ int amdgpu_dpm_get_smu_prv_buf_details(struct amdgpu_device *adev, size_t *size) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->get_smu_prv_buf_details)return -ENOSYS ; -return pp_funcs->get_smu_prv_buf_details (adev->powerplay.pp_handle, - addr, - size); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_smu_prv_buf_details (adev->powerplay.pp_handle, + addr, + size); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_is_overdrive_supported (struct amdgpu_device *adev)
@@ -973,19 +1230,27 @@ int amdgpu_dpm_set_pp_table(struct amdgpu_device *adev, size_t size) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->set_pp_table)return -EOPNOTSUPP ; -return pp_funcs->set_pp_table (adev->powerplay.pp_handle, - buf, - size); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_pp_table (adev->powerplay.pp_handle, + buf, + size); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_get_num_cpu_cores (struct amdgpu_device *adev) {struct smu_context *smu = adev->powerplay.pp_handle; +if (!is_support_sw_smu (adev)) +return INT_MAX ; +return smu->cpu_core_num; }
@@ -1001,12 +1266,17 @@ int amdgpu_dpm_display_configuration_change(struct amdgpu_device *adev, const struct amd_pp_display_configuration *input) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->display_configuration_change)return 0 ; -return pp_funcs->display_configuration_change (adev->powerplay.pp_handle, - input); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->display_configuration_change (adev->powerplay.pp_handle, + input); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_get_clock_by_type(struct amdgpu_device *adev,
@@ -1014,25 +1284,35 @@ int amdgpu_dpm_get_clock_by_type(struct amdgpu_device *adev, struct amd_pp_clocks *clocks) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->get_clock_by_type)return 0 ; -return pp_funcs->get_clock_by_type (adev->powerplay.pp_handle, - type, - clocks); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_clock_by_type (adev->powerplay.pp_handle, + type, + clocks); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_get_display_mode_validation_clks (struct amdgpu_device *adev,struct amd_pp_simple_clock_info *clocks) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->get_display_mode_validation_clocks)return 0 ; -return pp_funcs->get_display_mode_validation_clocks (adev->powerplay.pp_handle, - clocks); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_display_mode_validation_clocks (adev->powerplay.pp_handle, + clocks); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_get_clock_by_type_with_latency(struct amdgpu_device *adev,
@@ -1040,13 +1320,18 @@ int amdgpu_dpm_get_clock_by_type_with_latency(struct amdgpu_device *adev, struct pp_clock_levels_with_latency *clocks) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->get_clock_by_type_with_latency)return 0 ; -return pp_funcs->get_clock_by_type_with_latency (adev->powerplay.pp_handle, - type, - clocks); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_clock_by_type_with_latency (adev->powerplay.pp_handle, + type, + clocks); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_get_clock_by_type_with_voltage(struct amdgpu_device *adev,
@@ -1054,49 +1339,69 @@ int amdgpu_dpm_get_clock_by_type_with_voltage(struct amdgpu_device *adev, struct pp_clock_levels_with_voltage *clocks) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->get_clock_by_type_with_voltage)return 0 ; -return pp_funcs->get_clock_by_type_with_voltage (adev->powerplay.pp_handle, - type, - clocks); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_clock_by_type_with_voltage (adev->powerplay.pp_handle, + type, + clocks); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_set_watermarks_for_clocks_ranges (struct amdgpu_device *adev,void *clock_ranges) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->set_watermarks_for_clocks_ranges)return -EOPNOTSUPP ; -return pp_funcs->set_watermarks_for_clocks_ranges (adev->powerplay.pp_handle, - clock_ranges); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_watermarks_for_clocks_ranges (adev->powerplay.pp_handle, + clock_ranges); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_display_clock_voltage_request (struct amdgpu_device *adev,struct pp_display_clock_request *clock) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->display_clock_voltage_request)return -EOPNOTSUPP ; -return pp_funcs->display_clock_voltage_request (adev->powerplay.pp_handle, - clock); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->display_clock_voltage_request (adev->powerplay.pp_handle, + clock); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_get_current_clocks (struct amdgpu_device *adev,struct amd_pp_clock_info *clocks) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->get_current_clocks)return -EOPNOTSUPP ; -return pp_funcs->get_current_clocks (adev->powerplay.pp_handle, - clocks); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_current_clocks (adev->powerplay.pp_handle, + clocks); +mutex_unlock (&adev->pm.mutex); + +return ret; }void amdgpu_dpm_notify_smu_enable_pwe (struct amdgpu_device *adev)
@@ -1106,31 +1411,43 @@ void amdgpu_dpm_notify_smu_enable_pwe(struct amdgpu_device *adev)if (!pp_funcs->notify_smu_enable_pwe)return ; +mutex_lock (&adev->pm.mutex); pp_funcs->notify_smu_enable_pwe (adev->powerplay.pp_handle); +mutex_unlock (&adev->pm.mutex); }int amdgpu_dpm_set_active_display_count (struct amdgpu_device *adev,uint32_t count) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->set_active_display_count)return -EOPNOTSUPP ; -return pp_funcs->set_active_display_count (adev->powerplay.pp_handle, - count); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_active_display_count (adev->powerplay.pp_handle, + count); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_set_min_deep_sleep_dcefclk (struct amdgpu_device *adev,uint32_t clock) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->set_min_deep_sleep_dcefclk)return -EOPNOTSUPP ; -return pp_funcs->set_min_deep_sleep_dcefclk (adev->powerplay.pp_handle, - clock); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_min_deep_sleep_dcefclk (adev->powerplay.pp_handle, + clock); +mutex_unlock (&adev->pm.mutex); + +return ret; } void amdgpu_dpm_set_hard_min_dcefclk_by_freq(struct amdgpu_device *adev,
@@ -1141,8 +1458,10 @@ void amdgpu_dpm_set_hard_min_dcefclk_by_freq(struct amdgpu_device *adev,if (!pp_funcs->set_hard_min_dcefclk_by_freq)return ; +mutex_lock (&adev->pm.mutex); pp_funcs->set_hard_min_dcefclk_by_freq (adev->powerplay.pp_handle, clock); +mutex_unlock (&adev->pm.mutex); } void amdgpu_dpm_set_hard_min_fclk_by_freq(struct amdgpu_device *adev,
@@ -1153,32 +1472,44 @@ void amdgpu_dpm_set_hard_min_fclk_by_freq(struct amdgpu_device *adev,if (!pp_funcs->set_hard_min_fclk_by_freq)return ; +mutex_lock (&adev->pm.mutex); pp_funcs->set_hard_min_fclk_by_freq (adev->powerplay.pp_handle, clock); +mutex_unlock (&adev->pm.mutex); }int amdgpu_dpm_display_disable_memory_clock_switch (struct amdgpu_device *adev,bool disable_memory_clock_switch) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->display_disable_memory_clock_switch)return 0 ; -return pp_funcs->display_disable_memory_clock_switch (adev->powerplay.pp_handle, - disable_memory_clock_switch); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->display_disable_memory_clock_switch (adev->powerplay.pp_handle, + disable_memory_clock_switch); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_get_max_sustainable_clocks_by_dc (struct amdgpu_device *adev,struct pp_smu_nv_clock_table *max_clocks) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->get_max_sustainable_clocks_by_dc)return -EOPNOTSUPP ; -return pp_funcs->get_max_sustainable_clocks_by_dc (adev->powerplay.pp_handle, - max_clocks); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_max_sustainable_clocks_by_dc (adev->powerplay.pp_handle, + max_clocks); +mutex_unlock (&adev->pm.mutex); + +return ret; } enum pp_smu_status amdgpu_dpm_get_uclk_dpm_states(struct amdgpu_device *adev,
@@ -1186,23 +1517,33 @@ enum pp_smu_status amdgpu_dpm_get_uclk_dpm_states(struct amdgpu_device *adev, unsigned int *num_states) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->get_uclk_dpm_states)return -EOPNOTSUPP ; -return pp_funcs->get_uclk_dpm_states (adev->powerplay.pp_handle, - clock_values_in_khz, - num_states); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_uclk_dpm_states (adev->powerplay.pp_handle, + clock_values_in_khz, + num_states); +mutex_unlock (&adev->pm.mutex); + +return ret; }int amdgpu_dpm_get_dpm_clock_table (struct amdgpu_device *adev,struct dpm_clocks *clock_table) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->get_dpm_clock_table)return -EOPNOTSUPP ; -return pp_funcs->get_dpm_clock_table (adev->powerplay.pp_handle, - clock_table); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_dpm_clock_table (adev->powerplay.pp_handle, + clock_table); +mutex_unlock (&adev->pm.mutex); + +return ret; }
drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c +1 -15
@@ -3040,21 +3040,18 @@ static int kv_dpm_sw_init(void *handle)return 0 ;INIT_WORK (&adev->pm.dpm.thermal.work, amdgpu_dpm_thermal_work_handler); -mutex_lock (&adev->pm.mutex); ret =kv_dpm_init (adev);if (ret) goto dpm_failed; adev->pm.dpm.current_ps = adev->pm.dpm.requested_ps = adev->pm.dpm.boot_ps;if (amdgpu_dpm ==1 )amdgpu_pm_print_power_states (adev); -mutex_unlock (&adev->pm.mutex);DRM_INFO ("amdgpu: dpm initialized\n" );return 0 ; dpm_failed:kv_dpm_fini (adev); -mutex_unlock (&adev->pm.mutex);DRM_ERROR ("amdgpu: dpm initialization failed\n" );return ret; }
@@ -3065,9 +3062,7 @@ static int kv_dpm_sw_fini(void *handle)flush_work (&adev->pm.dpm.thermal.work); -mutex_lock (&adev->pm.mutex);kv_dpm_fini (adev); -mutex_unlock (&adev->pm.mutex);return 0 ; }
@@ -3080,14 +3075,12 @@ static int kv_dpm_hw_init(void *handle)if (!amdgpu_dpm)return 0 ; -mutex_lock (&adev->pm.mutex);kv_dpm_setup_asic (adev); ret =kv_dpm_enable (adev);if (ret) adev->pm.dpm_enabled = false;else adev->pm.dpm_enabled = true; -mutex_unlock (&adev->pm.mutex);amdgpu_legacy_dpm_compute_clocks (adev);return ret; }
@@ -3096,11 +3089,8 @@ static int kv_dpm_hw_fini(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -if (adev->pm.dpm_enabled) { -mutex_lock (&adev->pm.mutex); +if (adev->pm.dpm_enabled)kv_dpm_disable (adev); -mutex_unlock (&adev->pm.mutex); - }return 0 ; }
@@ -3110,12 +3100,10 @@ static int kv_dpm_suspend(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;if (adev->pm.dpm_enabled) { -mutex_lock (&adev->pm.mutex);/* disable dpm */ kv_dpm_disable (adev);/* reset the power state */ adev->pm.dpm.current_ps = adev->pm.dpm.requested_ps = adev->pm.dpm.boot_ps; -mutex_unlock (&adev->pm.mutex); }return 0 ; }
@@ -3127,14 +3115,12 @@ static int kv_dpm_resume(void *handle)if (adev->pm.dpm_enabled) {/* asic init will reset to the boot state */ -mutex_lock (&adev->pm.mutex);kv_dpm_setup_asic (adev); ret =kv_dpm_enable (adev);if (ret) adev->pm.dpm_enabled = false;else adev->pm.dpm_enabled = true; -mutex_unlock (&adev->pm.mutex);if (adev->pm.dpm_enabled)amdgpu_legacy_dpm_compute_clocks (adev); }
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +1 -15
@@ -7786,21 +7786,18 @@ static int si_dpm_sw_init(void *handle)return ret;INIT_WORK (&adev->pm.dpm.thermal.work, amdgpu_dpm_thermal_work_handler); -mutex_lock (&adev->pm.mutex); ret =si_dpm_init (adev);if (ret) goto dpm_failed; adev->pm.dpm.current_ps = adev->pm.dpm.requested_ps = adev->pm.dpm.boot_ps;if (amdgpu_dpm ==1 )amdgpu_pm_print_power_states (adev); -mutex_unlock (&adev->pm.mutex);DRM_INFO ("amdgpu: dpm initialized\n" );return 0 ; dpm_failed:si_dpm_fini (adev); -mutex_unlock (&adev->pm.mutex);DRM_ERROR ("amdgpu: dpm initialization failed\n" );return ret; }
@@ -7811,9 +7808,7 @@ static int si_dpm_sw_fini(void *handle)flush_work (&adev->pm.dpm.thermal.work); -mutex_lock (&adev->pm.mutex);si_dpm_fini (adev); -mutex_unlock (&adev->pm.mutex);return 0 ; }
@@ -7827,14 +7822,12 @@ static int si_dpm_hw_init(void *handle)if (!amdgpu_dpm)return 0 ; -mutex_lock (&adev->pm.mutex);si_dpm_setup_asic (adev); ret =si_dpm_enable (adev);if (ret) adev->pm.dpm_enabled = false;else adev->pm.dpm_enabled = true; -mutex_unlock (&adev->pm.mutex);amdgpu_legacy_dpm_compute_clocks (adev);return ret; }
@@ -7843,11 +7836,8 @@ static int si_dpm_hw_fini(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -if (adev->pm.dpm_enabled) { -mutex_lock (&adev->pm.mutex); +if (adev->pm.dpm_enabled)si_dpm_disable (adev); -mutex_unlock (&adev->pm.mutex); - }return 0 ; }
@@ -7857,12 +7847,10 @@ static int si_dpm_suspend(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;if (adev->pm.dpm_enabled) { -mutex_lock (&adev->pm.mutex);/* disable dpm */ si_dpm_disable (adev);/* reset the power state */ adev->pm.dpm.current_ps = adev->pm.dpm.requested_ps = adev->pm.dpm.boot_ps; -mutex_unlock (&adev->pm.mutex); }return 0 ; }
@@ -7874,14 +7862,12 @@ static int si_dpm_resume(void *handle)if (adev->pm.dpm_enabled) {/* asic init will reset to the boot state */ -mutex_lock (&adev->pm.mutex);si_dpm_setup_asic (adev); ret =si_dpm_enable (adev);if (ret) adev->pm.dpm_enabled = false;else adev->pm.dpm_enabled = true; -mutex_unlock (&adev->pm.mutex);if (adev->pm.dpm_enabled)amdgpu_legacy_dpm_compute_clocks (adev); }
Signature · 1 line
2.29.0
[AMD Official Use Only]
Hi Lijo,
Please check the latest series. All your comments were addressed except those about return value(EOPNOTSUPP) on api unimplemented. That I would like to handle separately(with follow-up patches).
BR
Evan
Quoted 320 lines
-----Original Message-----
From: Quan, Evan <[email protected]>
Sent: Monday, December 13, 2021 11:52 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Lazar, Lijo <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH V5 00/16] Unified entry point for other blocks to interact with powerThere are several problems with current power implementations:
1. Too many internal details are exposed to other blocks. Thus to interact with
power, they need to know which power framework is used(powerplay vs
swsmu)
or even whether some API is implemented.
2. A lot of cross callings exist which make it hard to get a whole picture of the code hierarchy. And that makes any code change/increment error-
prone.
3. Many different types of lock are used. It is calculated there is totally 13 different locks are used within power. Some of them are even designed
for
the same purpose.To ease the problems above, this patch series try to
1. provide unified entry point for other blocks to interact with power.
2. relocate some source code piece/headers to avoid cross callings.
3. enforce a unified lock protection on those entry point APIs above. That makes the future optimization for unnecessary power locks possible.Evan Quan (16):
drm/amd/pm: do not expose implementation details to other blocks out
of power
drm/amd/pm: do not expose power implementation details toamdgpu_pm.c
drm/amd/pm: do not expose power implementation details to display drm/amd/pm: do not expose those APIs used internally only in
amdgpu_dpm.c
drm/amd/pm: do not expose those APIs used internally only insi_dpm.cdrm/amd/pm: do not expose the API used internally only inkv_dpm.cdrm/amd/pm: create a new holder for those APIs used only by legacy
ASICs(si/kv)
drm/amd/pm: movepp_force_state_enabledmember toamdgpu_pm
structure
drm/amd/pm: optimize theamdgpu_pm_compute_clocks()
implementations
drm/amd/pm: move those code piece used by Stoney only tosmu8_hwmgr.c
drm/amd/pm: drop redundant or unused APIs and data structures drm/amd/pm: do not expose thesmu_contextstructure used internally in
power
drm/amd/pm: relocate the power related headers
drm/amd/pm: drop unnecessary gfxoff controls
drm/amd/pm: revise the performance level setting APIs drm/amd/pm: unified lock protections inamdgpu_dpm.cdrivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 7 - drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 25 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 18 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 7 - drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 5 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 2 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +- .../amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 248 +- drivers/gpu/drm/amd/include/amd_shared.h | 2 - .../gpu/drm/amd/include/kgd_pp_interface.h | 8 + drivers/gpu/drm/amd/pm/Makefile | 14 +- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2467 ++++++++--------- drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c | 94 + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 552 ++-- drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 341 +-- .../gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h | 32 + drivers/gpu/drm/amd/pm/legacy-dpm/Makefile | 32 + .../pm/{powerplay => legacy-dpm}/cik_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/kv_dpm.c | 47 +- .../amd/pm/{powerplay => legacy-dpm}/kv_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/kv_smc.c | 0 .../gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 1081 ++++++++ .../gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h | 38 + .../amd/pm/{powerplay => legacy-dpm}/ppsmc.h | 0 .../pm/{powerplay => legacy-dpm}/r600_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/si_dpm.c | 163 +- .../amd/pm/{powerplay => legacy-dpm}/si_dpm.h | 15 +- .../amd/pm/{powerplay => legacy-dpm}/si_smc.c | 0 .../{powerplay => legacy-dpm}/sislands_smc.h | 0 drivers/gpu/drm/amd/pm/powerplay/Makefile | 4 - .../gpu/drm/amd/pm/powerplay/amd_powerplay.c | 51 +- .../drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 10 +- .../pm/{ => powerplay}/inc/amd_powerplay.h | 0 .../drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h | 0 .../amd/pm/{ => powerplay}/inc/fiji_ppsmc.h | 0 .../pm/{ => powerplay}/inc/hardwaremanager.h | 0 .../drm/amd/pm/{ => powerplay}/inc/hwmgr.h | 3 - .../{ => powerplay}/inc/polaris10_pwrvirus.h | 0 .../amd/pm/{ => powerplay}/inc/power_state.h | 0 .../drm/amd/pm/{ => powerplay}/inc/pp_debug.h | 0 .../amd/pm/{ => powerplay}/inc/pp_endian.h | 0 .../amd/pm/{ => powerplay}/inc/pp_thermal.h | 0 .../amd/pm/{ => powerplay}/inc/ppinterrupt.h | 0 .../drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu10.h | 0 .../pm/{ => powerplay}/inc/smu10_driver_if.h | 0 .../pm/{ => powerplay}/inc/smu11_driver_if.h | 0 .../gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu71.h | 0 .../pm/{ => powerplay}/inc/smu71_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu72.h | 0 .../pm/{ => powerplay}/inc/smu72_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu73.h | 0 .../pm/{ => powerplay}/inc/smu73_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu74.h | 0 .../pm/{ => powerplay}/inc/smu74_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu75.h | 0 .../pm/{ => powerplay}/inc/smu75_discrete.h | 0 .../amd/pm/{ => powerplay}/inc/smu7_common.h | 0 .../pm/{ => powerplay}/inc/smu7_discrete.h | 0 .../amd/pm/{ => powerplay}/inc/smu7_fusion.h | 0 .../amd/pm/{ => powerplay}/inc/smu7_ppsmc.h | 0 .../gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h | 0 .../amd/pm/{ => powerplay}/inc/smu8_fusion.h | 0 .../gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h | 0 .../pm/{ => powerplay}/inc/smu9_driver_if.h | 0 .../{ => powerplay}/inc/smu_ucode_xfer_cz.h | 0 .../{ => powerplay}/inc/smu_ucode_xfer_vi.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smumgr.h | 0 .../amd/pm/{ => powerplay}/inc/tonga_ppsmc.h | 0 .../amd/pm/{ => powerplay}/inc/vega10_ppsmc.h | 0 .../inc/vega12/smu9_driver_if.h | 0 .../amd/pm/{ => powerplay}/inc/vega12_ppsmc.h | 0 .../amd/pm/{ => powerplay}/inc/vega20_ppsmc.h | 0 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 94 +- .../drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h | 16 +- .../inc/interface}/smu11_driver_if_arcturus.h | 0 .../smu11_driver_if_cyan_skillfish.h | 0 .../inc/interface}/smu11_driver_if_navi10.h | 0 .../smu11_driver_if_sienna_cichlid.h | 0 .../inc/interface}/smu11_driver_if_vangogh.h | 0 .../inc/interface}/smu12_driver_if.h | 0 .../interface}/smu13_driver_if_aldebaran.h | 0 .../interface}/smu13_driver_if_yellow_carp.h | 0 .../inc/interface}/smu_v11_5_pmfw.h | 0 .../inc/interface}/smu_v11_8_pmfw.h | 0 .../inc/interface}/smu_v13_0_1_pmfw.h | 0 .../inc/message}/aldebaran_ppsmc.h | 0 .../inc/message}/arcturus_ppsmc.h | 0 .../inc/message}/smu_v11_0_7_ppsmc.h | 0 .../inc/message}/smu_v11_0_ppsmc.h | 0 .../inc/message}/smu_v11_5_ppsmc.h | 0 .../inc/message}/smu_v11_8_ppsmc.h | 0 .../inc/message}/smu_v12_0_ppsmc.h | 0 .../inc/message}/smu_v13_0_1_ppsmc.h | 0 .../pm/{ => swsmu}/inc/smu_11_0_cdr_table.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_types.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h | 0 .../pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h | 0 .../pm/{ => swsmu}/inc/smu_v11_0_pptable.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h | 0 .../pm/{ => swsmu}/inc/smu_v13_0_pptable.h | 0 .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 10 +- .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 9 +- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 34 +- .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 11 +- .../drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 10 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 15 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 4 + 117 files changed, 3232 insertions(+), 2264 deletions(-) create mode 100644 drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c create mode 100644 drivers/gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/Makefile rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/cik_dpm.h (100%) rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.c (99%) rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.h (100%) rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_smc.c (100%) create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/ppsmc.h (100%) rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/r600_dpm.h (100%) rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.c (98%) rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.h (99%) rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_smc.c (100%) rename drivers/gpu/drm/amd/pm/{powerplay => legacy- dpm}/sislands_smc.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/amd_powerplay.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/fiji_ppsmc.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/hardwaremanager.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/hwmgr.h (99%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/polaris10_pwrvirus.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/power_state.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_debug.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_endian.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_thermal.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/ppinterrupt.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu10.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu10_driver_if.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu11_driver_if.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71_discrete.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72_discrete.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73_discrete.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74_discrete.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75_discrete.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_common.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_discrete.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_fusion.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_ppsmc.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8_fusion.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9_driver_if.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu_ucode_xfer_cz.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu_ucode_xfer_vi.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smumgr.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/tonga_ppsmc.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega10_ppsmc.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega12/smu9_driver_if.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega12_ppsmc.h (100%) rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega20_ppsmc.h (100%) rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h (98%) rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu11_driver_if_arcturus.h (100%) rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu11_driver_if_cyan_skillfish.h (100%) rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu11_driver_if_navi10.h (100%) rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu11_driver_if_sienna_cichlid.h (100%) rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu11_driver_if_vangogh.h (100%) rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu12_driver_if.h (100%) rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu13_driver_if_aldebaran.h (100%) rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu13_driver_if_yellow_carp.h (100%) rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu_v11_5_pmfw.h (100%) rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu_v11_8_pmfw.h (100%) rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/interface}/smu_v13_0_1_pmfw.h (100%) rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/aldebaran_ppsmc.h (100%) rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/arcturus_ppsmc.h (100%) rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/smu_v11_0_7_ppsmc.h (100%) rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/smu_v11_0_ppsmc.h (100%) rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/smu_v11_5_ppsmc.h (100%) rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/smu_v11_8_ppsmc.h (100%) rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/smu_v12_0_ppsmc.h (100%) rename drivers/gpu/drm/amd/pm/{inc => swsmu/inc/message}/smu_v13_0_1_ppsmc.h (100%) rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_11_0_cdr_table.h (100%) rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_types.h (100%) rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h (100%) rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h (100%) rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0_pptable.h (100%) rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h (100%) rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h (100%) rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0_pptable.h(100%)
--
2.29.0
Quoted 29 lines · Evan Quan
There are several problems with current power implementations:
1. Too many internal details are exposed to other blocks. Thus to interact with power, they need to know which power framework is used(powerplay vs swsmu) or even whether some API is implemented.
2. A lot of cross callings exist which make it hard to get a whole picture of the code hierarchy. And that makes any code change/increment error-prone.
3. Many different types of lock are used. It is calculated there is totally 13 different locks are used within power. Some of them are even designed for the same purpose.To ease the problems above, this patch series try to
1. provide unified entry point for other blocks to interact with power.
2. relocate some source code piece/headers to avoid cross callings.
3. enforce a unified lock protection on those entry point APIs above. That makes the future optimization for unnecessary power locks possible.Evan Quan (16):
drm/amd/pm: do not expose implementation details to other blocks out
of power
drm/amd/pm: do not expose power implementation details toamdgpu_pm.cdrm/amd/pm: do not expose power implementation details to display drm/amd/pm: do not expose those APIs used internally only in
amdgpu_dpm.c
drm/amd/pm: do not expose those APIs used internally only insi_dpm.cdrm/amd/pm: do not expose the API used internally only inkv_dpm.cdrm/amd/pm: create a new holder for those APIs used only by legacy
ASICs(si/kv)
drm/amd/pm: movepp_force_state_enabledmember toamdgpu_pmstructure drm/amd/pm: optimize theamdgpu_pm_compute_clocks()implementations
Quoted 9 lines
drm/amd/pm: move those code piece used by Stoney only to
smu8_hwmgr.cdrm/amd/pm: drop redundant or unused APIs and data structures drm/amd/pm: do not expose thesmu_contextstructure used internally in
power
drm/amd/pm: relocate the power related headers
drm/amd/pm: drop unnecessary gfxoff controls
drm/amd/pm: revise the performance level setting APIs drm/amd/pm: unified lock protections inamdgpu_dpm.c
Have some nitpick comments on two patches. With/Without those addressed and with the understanding that there will be some follow up patches to
address some other comments made, the series is -
Thanks,
Lijo
Quoted 204 lines
drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 7 - drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 25 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 18 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 7 - drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 5 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 2 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +- .../amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 248 +- drivers/gpu/drm/amd/include/amd_shared.h | 2 - .../gpu/drm/amd/include/kgd_pp_interface.h | 8 + drivers/gpu/drm/amd/pm/Makefile | 14 +- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2467 ++++++++--------- drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c | 94 + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 552 ++-- drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 341 +-- .../gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h | 32 + drivers/gpu/drm/amd/pm/legacy-dpm/Makefile | 32 + .../pm/{powerplay => legacy-dpm}/cik_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/kv_dpm.c | 47 +- .../amd/pm/{powerplay => legacy-dpm}/kv_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/kv_smc.c | 0 .../gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 1081 ++++++++ .../gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h | 38 + .../amd/pm/{powerplay => legacy-dpm}/ppsmc.h | 0 .../pm/{powerplay => legacy-dpm}/r600_dpm.h | 0 .../amd/pm/{powerplay => legacy-dpm}/si_dpm.c | 163 +- .../amd/pm/{powerplay => legacy-dpm}/si_dpm.h | 15 +- .../amd/pm/{powerplay => legacy-dpm}/si_smc.c | 0 .../{powerplay => legacy-dpm}/sislands_smc.h | 0 drivers/gpu/drm/amd/pm/powerplay/Makefile | 4 - .../gpu/drm/amd/pm/powerplay/amd_powerplay.c | 51 +- .../drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 10 +- .../pm/{ => powerplay}/inc/amd_powerplay.h | 0 .../drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h | 0 .../amd/pm/{ => powerplay}/inc/fiji_ppsmc.h | 0 .../pm/{ => powerplay}/inc/hardwaremanager.h | 0 .../drm/amd/pm/{ => powerplay}/inc/hwmgr.h | 3 - .../{ => powerplay}/inc/polaris10_pwrvirus.h | 0 .../amd/pm/{ => powerplay}/inc/power_state.h | 0 .../drm/amd/pm/{ => powerplay}/inc/pp_debug.h | 0 .../amd/pm/{ => powerplay}/inc/pp_endian.h | 0 .../amd/pm/{ => powerplay}/inc/pp_thermal.h | 0 .../amd/pm/{ => powerplay}/inc/ppinterrupt.h | 0 .../drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu10.h | 0 .../pm/{ => powerplay}/inc/smu10_driver_if.h | 0 .../pm/{ => powerplay}/inc/smu11_driver_if.h | 0 .../gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu71.h | 0 .../pm/{ => powerplay}/inc/smu71_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu72.h | 0 .../pm/{ => powerplay}/inc/smu72_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu73.h | 0 .../pm/{ => powerplay}/inc/smu73_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu74.h | 0 .../pm/{ => powerplay}/inc/smu74_discrete.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smu75.h | 0 .../pm/{ => powerplay}/inc/smu75_discrete.h | 0 .../amd/pm/{ => powerplay}/inc/smu7_common.h | 0 .../pm/{ => powerplay}/inc/smu7_discrete.h | 0 .../amd/pm/{ => powerplay}/inc/smu7_fusion.h | 0 .../amd/pm/{ => powerplay}/inc/smu7_ppsmc.h | 0 .../gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h | 0 .../amd/pm/{ => powerplay}/inc/smu8_fusion.h | 0 .../gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h | 0 .../pm/{ => powerplay}/inc/smu9_driver_if.h | 0 .../{ => powerplay}/inc/smu_ucode_xfer_cz.h | 0 .../{ => powerplay}/inc/smu_ucode_xfer_vi.h | 0 .../drm/amd/pm/{ => powerplay}/inc/smumgr.h | 0 .../amd/pm/{ => powerplay}/inc/tonga_ppsmc.h | 0 .../amd/pm/{ => powerplay}/inc/vega10_ppsmc.h | 0 .../inc/vega12/smu9_driver_if.h | 0 .../amd/pm/{ => powerplay}/inc/vega12_ppsmc.h | 0 .../amd/pm/{ => powerplay}/inc/vega20_ppsmc.h | 0 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 94 +- .../drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h | 16 +- .../inc/interface}/smu11_driver_if_arcturus.h | 0 .../smu11_driver_if_cyan_skillfish.h | 0 .../inc/interface}/smu11_driver_if_navi10.h | 0 .../smu11_driver_if_sienna_cichlid.h | 0 .../inc/interface}/smu11_driver_if_vangogh.h | 0 .../inc/interface}/smu12_driver_if.h | 0 .../interface}/smu13_driver_if_aldebaran.h | 0 .../interface}/smu13_driver_if_yellow_carp.h | 0 .../inc/interface}/smu_v11_5_pmfw.h | 0 .../inc/interface}/smu_v11_8_pmfw.h | 0 .../inc/interface}/smu_v13_0_1_pmfw.h | 0 .../inc/message}/aldebaran_ppsmc.h | 0 .../inc/message}/arcturus_ppsmc.h | 0 .../inc/message}/smu_v11_0_7_ppsmc.h | 0 .../inc/message}/smu_v11_0_ppsmc.h | 0 .../inc/message}/smu_v11_5_ppsmc.h | 0 .../inc/message}/smu_v11_8_ppsmc.h | 0 .../inc/message}/smu_v12_0_ppsmc.h | 0 .../inc/message}/smu_v13_0_1_ppsmc.h | 0 .../pm/{ => swsmu}/inc/smu_11_0_cdr_table.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_types.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h | 0 .../pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h | 0 .../pm/{ => swsmu}/inc/smu_v11_0_pptable.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h | 0 .../pm/{ => swsmu}/inc/smu_v13_0_pptable.h | 0 .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 10 +- .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 9 +- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 34 +- .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 11 +- .../drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 10 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 15 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 4 + 117 files changed, 3232 insertions(+), 2264 deletions(-)create mode 100644
drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c
create mode 100644drivers/gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h
create mode 100644drivers/gpu/drm/amd/pm/legacy-dpm/Makefile
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/cik_dpm.h(100%)
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/kv_dpm.c(99%)
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/kv_dpm.h(100%)
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/kv_smc.c(100%)
create mode 100644drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c
create mode 100644drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/ppsmc.h(100%)
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/r600_dpm.h(100%)
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/si_dpm.c(98%)
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/si_dpm.h(99%)
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/si_smc.c(100%)
renamedrivers/gpu/drm/amd/pm/{powerplay=>legacy-dpm}/sislands_smc.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/amd_powerplay.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/cz_ppsmc.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/fiji_ppsmc.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/hardwaremanager.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/hwmgr.h(99%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/polaris10_pwrvirus.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/power_state.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/pp_debug.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/pp_endian.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/pp_thermal.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/ppinterrupt.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/rv_ppsmc.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu10.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu10_driver_if.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu11_driver_if.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu7.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu71.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu71_discrete.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu72.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu72_discrete.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu73.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu73_discrete.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu74.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu74_discrete.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu75.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu75_discrete.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu7_common.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu7_discrete.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu7_fusion.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu7_ppsmc.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu8.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu8_fusion.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu9.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu9_driver_if.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu_ucode_xfer_cz.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smu_ucode_xfer_vi.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/smumgr.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/tonga_ppsmc.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/vega10_ppsmc.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/vega12/smu9_driver_if.h(100%) renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/vega12_ppsmc.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>powerplay}/inc/vega20_ppsmc.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/amdgpu_smu.h(98%)
renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu11_driver_if_arcturus.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu11_driver_if_cyan_skillfish.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu11_driver_if_navi10.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu11_driver_if_sienna_cichlid.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu11_driver_if_vangogh.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu12_driver_if.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu13_driver_if_aldebaran.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu13_driver_if_yellow_carp.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu_v11_5_pmfw.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu_v11_8_pmfw.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/interface}/smu_v13_0_1_pmfw.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/message}/aldebaran_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/message}/arcturus_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/message}/smu_v11_0_7_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/message}/smu_v11_0_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/message}/smu_v11_5_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/message}/smu_v11_8_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/message}/smu_v12_0_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{inc=>swsmu/inc/message}/smu_v13_0_1_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_11_0_cdr_table.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_types.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v11_0.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v11_0_7_pptable.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v11_0_pptable.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v12_0.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v13_0.h(100%)
renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v13_0_pptable.h(100%)