drm/amd/pm: do not expose implementation details to other blocks out of power
Subsystems (6)
PATCH v4 10/17 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 v4 11/17 drm/amd/pm: correct the usage for amdgpu_dpm_dispatch_task()
In reply to Evan QuanWe should avoid having multi-function APIs. It should be up to the caller to determine when or whether to call amdgpu_dpm_dispatch_task().
--- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 18 ++---------------- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 26 ++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 18 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2 -16
@@ -554,8 +554,6 @@ void amdgpu_dpm_set_power_state(struct amdgpu_device *adev, enum amd_pm_state_type state) { adev->pm.dpm.user_state = state; - -amdgpu_dpm_dispatch_task (adev,AMD_PP_TASK_ENABLE_USER_STATE , &state); }enum amd_dpm_forced_level amdgpu_dpm_get_performance_level (struct amdgpu_device *adev)
@@ -723,13 +721,7 @@ int amdgpu_dpm_set_sclk_od(struct amdgpu_device *adev, uint32_t value)if (!pp_funcs->set_sclk_od)return -EOPNOTSUPP ; - pp_funcs->set_sclk_od (adev->powerplay.pp_handle, value); - -amdgpu_dpm_dispatch_task (adev, -AMD_PP_TASK_READJUST_POWER_STATE , -NULL ); - -return 0 ; +return pp_funcs->set_sclk_od (adev->powerplay.pp_handle, value); }int amdgpu_dpm_get_mclk_od (struct amdgpu_device *adev)
@@ -749,13 +741,7 @@ int amdgpu_dpm_set_mclk_od(struct amdgpu_device *adev, uint32_t value)if (!pp_funcs->set_mclk_od)return -EOPNOTSUPP ; - pp_funcs->set_mclk_od (adev->powerplay.pp_handle, value); - -amdgpu_dpm_dispatch_task (adev, -AMD_PP_TASK_READJUST_POWER_STATE , -NULL ); - -return 0 ; +return pp_funcs->set_mclk_od (adev->powerplay.pp_handle, value); } int amdgpu_dpm_get_power_profile_mode(struct amdgpu_device *adev,
drivers/gpu/drm/amd/pm/amdgpu_pm.c +24 -2
@@ -187,6 +187,10 @@ static ssize_t amdgpu_set_power_dpm_state(struct device *dev,amdgpu_dpm_set_power_state (adev, state); +amdgpu_dpm_dispatch_task (adev, +AMD_PP_TASK_ENABLE_USER_STATE , + &state); +pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
@@ -1278,7 +1282,16 @@ static ssize_t amdgpu_set_pp_sclk_od(struct device *dev,return ret; } -amdgpu_dpm_set_sclk_od (adev, (uint32_t )value); + ret =amdgpu_dpm_set_sclk_od (adev, (uint32_t )value); +if (ret) { +pm_runtime_mark_last_busy (ddev->dev); +pm_runtime_put_autosuspend (ddev->dev); +return ret; + } + +amdgpu_dpm_dispatch_task (adev, +AMD_PP_TASK_READJUST_POWER_STATE , +NULL );pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
@@ -1340,7 +1353,16 @@ static ssize_t amdgpu_set_pp_mclk_od(struct device *dev,return ret; } -amdgpu_dpm_set_mclk_od (adev, (uint32_t )value); + ret =amdgpu_dpm_set_mclk_od (adev, (uint32_t )value); +if (ret) { +pm_runtime_mark_last_busy (ddev->dev); +pm_runtime_put_autosuspend (ddev->dev); +return ret; + } + +amdgpu_dpm_dispatch_task (adev, +AMD_PP_TASK_READJUST_POWER_STATE , +NULL );pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
Signature · 1 line
2.29.0
Re: [PATCH V4 11/17] drm/amd/pm: correct the usage for amdgpu_dpm_dispatch_task()
Quoted 69 lines · Evan Quan
We should avoid having multi-function APIs. It should be up to the caller to determine when or whether to call
amdgpu_dpm_dispatch_task().Signed-off-by Evan Quan <[email protected]>Change-Id I78ec4eb8ceb6e526a4734113d213d15a5fbaa8a4--- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 18 ++---------------- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 26 ++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 18 deletions(-)drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-16@@ -554,8 +554,6 @@ void amdgpu_dpm_set_power_state(struct amdgpu_device *adev, enum amd_pm_state_type state) { adev->pm.dpm.user_state = state; - -amdgpu_dpm_dispatch_task (adev,AMD_PP_TASK_ENABLE_USER_STATE , &state); }enum amd_dpm_forced_level amdgpu_dpm_get_performance_level (struct amdgpu_device *adev)@@ -723,13 +721,7 @@ int amdgpu_dpm_set_sclk_od(struct amdgpu_device *adev, uint32_t value)if (!pp_funcs->set_sclk_od)return -EOPNOTSUPP ; - pp_funcs->set_sclk_od (adev->powerplay.pp_handle, value); - -amdgpu_dpm_dispatch_task (adev, -AMD_PP_TASK_READJUST_POWER_STATE , -NULL ); - -return 0 ; +return pp_funcs->set_sclk_od (adev->powerplay.pp_handle, value); }int amdgpu_dpm_get_mclk_od (struct amdgpu_device *adev)@@ -749,13 +741,7 @@ int amdgpu_dpm_set_mclk_od(struct amdgpu_device *adev, uint32_t value)if (!pp_funcs->set_mclk_od)return -EOPNOTSUPP ; - pp_funcs->set_mclk_od (adev->powerplay.pp_handle, value); - -amdgpu_dpm_dispatch_task (adev, -AMD_PP_TASK_READJUST_POWER_STATE , -NULL ); - -return 0 ; +return pp_funcs->set_mclk_od (adev->powerplay.pp_handle, value); } int amdgpu_dpm_get_power_profile_mode(struct amdgpu_device *adev,drivers/gpu/drm/amd/pm/amdgpu_pm.c +4
-0@@ -187,6 +187,10 @@ static ssize_t amdgpu_set_power_dpm_state(struct device *dev,amdgpu_dpm_set_power_state (adev, state); +amdgpu_dpm_dispatch_task (adev, +AMD_PP_TASK_ENABLE_USER_STATE , + &state); +pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
drivers/gpu/drm/amd/pm/amdgpu_pm.c static ssize_t amdgpu_set_pp_sclk_od(struct device *dev, · line 1285
Quoted 5 lines
drivers/gpu/drm/amd/pm/amdgpu_pm.c +1
-1@@ -1278,7 +1282,16 @@ static ssize_t amdgpu_set_pp_sclk_od(struct device *dev,return ret; } -amdgpu_dpm_set_sclk_od (adev, (uint32_t )value); + ret =amdgpu_dpm_set_sclk_od (adev, (uint32_t )value);
amdgpu_set_pp_sclk_od has a verbatim API like amdgpu_dpm_set_sclk_od and one would expect that to handle everything required to set the clock.
If locking is the problem, then it should be handled differently. This kind of mixing is not the right way.
Thanks,
Lijo
Quoted 31 lines
drivers/gpu/drm/amd/pm/amdgpu_pm.c +19
-1+if (ret) { +pm_runtime_mark_last_busy (ddev->dev); +pm_runtime_put_autosuspend (ddev->dev); +return ret; + } + +amdgpu_dpm_dispatch_task (adev, +AMD_PP_TASK_READJUST_POWER_STATE , +NULL );pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);@@ -1340,7 +1353,16 @@ static ssize_t amdgpu_set_pp_mclk_od(struct device *dev,return ret; } -amdgpu_dpm_set_mclk_od (adev, (uint32_t )value); + ret =amdgpu_dpm_set_mclk_od (adev, (uint32_t )value); +if (ret) { +pm_runtime_mark_last_busy (ddev->dev); +pm_runtime_put_autosuspend (ddev->dev); +return ret; + } + +amdgpu_dpm_dispatch_task (adev, +AMD_PP_TASK_READJUST_POWER_STATE , +NULL );pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
RE: [PATCH V4 11/17] drm/amd/pm: correct the usage for amdgpu_dpm_dispatch_task()
[AMD Official Use Only]
Quoted 97 lines
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Thursday, December 9, 2021 8:37 PM
To: Quan, Evan <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Feng, Kenneth <[email protected]>
Subject: Re: [PATCH V4 11/17] drm/amd/pm: correct the usage foramdgpu_dpm_dispatch_task()Quoted 8 lines · Evan Quan
We should avoid having multi-function APIs. It should be up to the caller to determine when or whether to call
amdgpu_dpm_dispatch_task().Signed-off-by Evan Quan <[email protected]>Change-Id I78ec4eb8ceb6e526a4734113d213d15a5fbaa8a4--- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 18 ++---------------- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 26++++++++++++++++++++++++--
drivers/gpu/drm/amd/pm/amdgpu_dpm.c void amdgpu_dpm_set_power_state(struct
Quoted 8 lines
2 files changed, 26 insertions(+), 18 deletions(-)drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-0@@ -554,8 +554,6 @@ void amdgpu_dpm_set_power_state(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c void amdgpu_dpm_set_power_state(struct amdgpu_device *adev,
Quoted 5 lines
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-2enum amd_pm_state_type state) { adev->pm.dpm.user_state = state; - - amdgpu_dpm_dispatch_task(adev,
AMD_PP_TASK_ENABLE_USER_STATE, &state);drivers/gpu/drm/amd/pm/amdgpu_dpm.c void amdgpu_dpm_set_power_state(struct · line 559
Quoted 3 lines
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-0}enum amd_dpm_forced_level amdgpu_dpm_get_performance_level(struct
Quoted 1 line
amdgpu_device*adev) @@ -723,13 +721,7 @@ int
amdgpu_dpm_set_sclk_od(struct amdgpu_device *adev, uint32_t value)Quoted 4 lines
if (!pp_funcs->set_sclk_od)
return-EOPNOTSUPP;drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1- pp_funcs->set_sclk_od (adev->powerplay.pp_handle, value);drivers/gpu/drm/amd/pm/amdgpu_dpm.c int amdgpu_dpm_set_sclk_od(struct amdgpu_device *adev, uint32_t value)
Quoted 10 lines
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-6- -amdgpu_dpm_dispatch_task (adev, -AMD_PP_TASK_READJUST_POWER_STATE , -NULL ); - -return 0 ; +return pp_funcs->set_sclk_od (adev->powerplay.pp_handle, value); } int amdgpu_dpm_get_mclk_od(struct amdgpu_device *adev) @@ -749,13
Quoted 1 line
+741,7 @@ int amdgpu_dpm_set_mclk_od(struct
amdgpu_device*adev,
uint32_tvalue)Quoted 4 lines
if (!pp_funcs->set_mclk_od)
return-EOPNOTSUPP;drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1- pp_funcs->set_mclk_od (adev->powerplay.pp_handle, value);drivers/gpu/drm/amd/pm/amdgpu_dpm.c int amdgpu_dpm_set_mclk_od(struct amdgpu_device *adev, uint32_t value)
Quoted 10 lines
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-6- -amdgpu_dpm_dispatch_task (adev, -AMD_PP_TASK_READJUST_POWER_STATE , -NULL ); - -return 0 ; +return pp_funcs->set_mclk_od (adev->powerplay.pp_handle, value); } int amdgpu_dpm_get_power_profile_mode(struct amdgpu_device*adev,
drivers/gpu/drm/amd/pm/amdgpu_pm.c static ssize_t
Quoted 6 lines
drivers/gpu/drm/amd/pm/amdgpu_pm.c +0
-0@@ -187,6 +187,10 @@ static ssize_tamdgpu_set_power_dpm_state(struct
drivers/gpu/drm/amd/pm/amdgpu_pm.c static ssize_t amdgpu_set_pp_sclk_od(struct
Quoted 12 lines
drivers/gpu/drm/amd/pm/amdgpu_pm.c +4
-0device *dev,amdgpu_dpm_set_power_state (adev ,state ); +amdgpu_dpm_dispatch_task (adev, +AMD_PP_TASK_ENABLE_USER_STATE , + &state); +pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);@@ -1278,7 +1282,16 @@ static ssize_t amdgpu_set_pp_sclk_od(structdevice *dev,
Quoted 3 lines
drivers/gpu/drm/amd/pm/amdgpu_pm.c +0
-0return ret; }
Quoted 8 lines
drivers/gpu/drm/amd/pm/amdgpu_pm.c static ssize_t amdgpu_set_pp_sclk_od(struct device *dev, · line 1285
Quoted 2 lines
drivers/gpu/drm/amd/pm/amdgpu_pm.c +1
-1-amdgpu_dpm_set_sclk_od (adev, (uint32_t )value); + ret =amdgpu_dpm_set_sclk_od (adev, (uint32_t )value);
amdgpu_set_pp_sclk_odhas a verbatim API likeamdgpu_dpm_set_sclk_odand one would expect that to handle everything required to set the clock.If locking is the problem, then it should be handled differently. This kind of mixing is not the right way.
[Quan, Evan] With patch2 updated, it was found the tricky set_pp_sclk/mclk_od implementation prevent further optimization. So, let's just drop this patch.
BR
Evan
Quoted 36 lines
Thanks,
Lijodrivers/gpu/drm/amd/pm/amdgpu_pm.c static ssize_t amdgpu_set_pp_mclk_od(struct
Quoted 13 lines
drivers/gpu/drm/amd/pm/amdgpu_pm.c +9
-0+if (ret) { +pm_runtime_mark_last_busy (ddev->dev); +pm_runtime_put_autosuspend (ddev->dev); +return ret; + } + +amdgpu_dpm_dispatch_task (adev, +AMD_PP_TASK_READJUST_POWER_STATE , +NULL );pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);@@ -1340,7 +1353,16 @@ static ssize_t amdgpu_set_pp_mclk_od(structdevice *dev,
Quoted 18 lines
drivers/gpu/drm/amd/pm/amdgpu_pm.c +10
-1return ret; } -amdgpu_dpm_set_mclk_od (adev, (uint32_t )value); + ret =amdgpu_dpm_set_mclk_od (adev, (uint32_t )value); +if (ret) { +pm_runtime_mark_last_busy (ddev->dev); +pm_runtime_put_autosuspend (ddev->dev); +return ret; + } + +amdgpu_dpm_dispatch_task (adev, +AMD_PP_TASK_READJUST_POWER_STATE , +NULL );pm_runtime_mark_last_busy (ddev->dev);pm_runtime_put_autosuspend (ddev->dev);
PATCH v4 12/17 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 v4 13/17 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 | 52 ++++++++++++------- .../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, 96 insertions(+), 69 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"
@@ -950,11 +949,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
@@ -2884,7 +2884,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
@@ -1389,10 +1389,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 +32 -20
179 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 v4 14/17 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.
---
drivers/gpu/drm/amd/pm/Makefile | 10 +++---
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
.../amd/pm/{ => swsmu}/inc/aldebaran_ppsmc.h | 0
.../drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h | 0
.../amd/pm/{ => swsmu}/inc/arcturus_ppsmc.h | 0
.../inc/smu11_driver_if_arcturus.h | 0
.../inc/smu11_driver_if_cyan_skillfish.h | 0
.../{ => swsmu}/inc/smu11_driver_if_navi10.h | 0
.../inc/smu11_driver_if_sienna_cichlid.h | 0
.../{ => swsmu}/inc/smu11_driver_if_vangogh.h | 0
.../amd/pm/{ => swsmu}/inc/smu12_driver_if.h | 0
.../inc/smu13_driver_if_aldebaran.h | 0
.../inc/smu13_driver_if_yellow_carp.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_ppsmc.h | 0
.../pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h | 0
.../amd/pm/{ => swsmu}/inc/smu_v11_0_ppsmc.h | 0
.../pm/{ => swsmu}/inc/smu_v11_0_pptable.h | 0
.../amd/pm/{ => swsmu}/inc/smu_v11_5_pmfw.h | 0
.../amd/pm/{ => swsmu}/inc/smu_v11_5_ppsmc.h | 0
.../amd/pm/{ => swsmu}/inc/smu_v11_8_pmfw.h | 0
.../amd/pm/{ => swsmu}/inc/smu_v11_8_ppsmc.h | 0
.../drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h | 0
.../amd/pm/{ => swsmu}/inc/smu_v12_0_ppsmc.h | 0
.../drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h | 0
.../amd/pm/{ => swsmu}/inc/smu_v13_0_1_pmfw.h | 0
.../pm/{ => swsmu}/inc/smu_v13_0_1_ppsmc.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, 39 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/aldebaran_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/arcturus_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu11_driver_if_arcturus.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu11_driver_if_cyan_skillfish.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu11_driver_if_navi10.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu11_driver_if_sienna_cichlid.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu11_driver_if_vangogh.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu12_driver_if.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu13_driver_if_aldebaran.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu13_driver_if_yellow_carp.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_ppsmc.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_ppsmc.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_v11_5_pmfw.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_5_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_8_pmfw.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_8_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v12_0_ppsmc.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_1_pmfw.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0_1_ppsmc.h (100%)
rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0_pptable.h (100%)drivers/gpu/drm/amd/pm/Makefile +6 -4
@@ -21,20 +21,22 @@ # 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/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/aldebaran_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/aldebaran_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/arcturus_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/arcturus_ppsmc.h +0 -0
drivers/gpu/drm/amd/pm/swsmu/inc/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/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/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/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/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/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/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/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/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_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/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_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_ppsmc.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_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/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/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/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/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_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/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_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/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_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 V4 14/17] drm/amd/pm: relocate the power related headers
Quoted 170 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--- drivers/gpu/drm/amd/pm/Makefile | 10 +++--- 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 .../amd/pm/{ => swsmu}/inc/aldebaran_ppsmc.h | 0 .../drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h | 0 .../amd/pm/{ => swsmu}/inc/arcturus_ppsmc.h | 0 .../inc/smu11_driver_if_arcturus.h | 0 .../inc/smu11_driver_if_cyan_skillfish.h | 0 .../{ => swsmu}/inc/smu11_driver_if_navi10.h | 0 .../inc/smu11_driver_if_sienna_cichlid.h | 0 .../{ => swsmu}/inc/smu11_driver_if_vangogh.h | 0 .../amd/pm/{ => swsmu}/inc/smu12_driver_if.h | 0 .../inc/smu13_driver_if_aldebaran.h | 0 .../inc/smu13_driver_if_yellow_carp.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_ppsmc.h | 0 .../pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h | 0 .../amd/pm/{ => swsmu}/inc/smu_v11_0_ppsmc.h | 0 .../pm/{ => swsmu}/inc/smu_v11_0_pptable.h | 0 .../amd/pm/{ => swsmu}/inc/smu_v11_5_pmfw.h | 0 .../amd/pm/{ => swsmu}/inc/smu_v11_5_ppsmc.h | 0 .../amd/pm/{ => swsmu}/inc/smu_v11_8_pmfw.h | 0 .../amd/pm/{ => swsmu}/inc/smu_v11_8_ppsmc.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h | 0 .../amd/pm/{ => swsmu}/inc/smu_v12_0_ppsmc.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h | 0 .../amd/pm/{ => swsmu}/inc/smu_v13_0_1_pmfw.h | 0 .../pm/{ => swsmu}/inc/smu_v13_0_1_ppsmc.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, 39 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/aldebaran_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/amdgpu_smu.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/arcturus_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu11_driver_if_arcturus.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu11_driver_if_cyan_skillfish.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu11_driver_if_navi10.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu11_driver_if_sienna_cichlid.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu11_driver_if_vangogh.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu12_driver_if.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu13_driver_if_aldebaran.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu13_driver_if_yellow_carp.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_ppsmc.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_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v11_0_pptable.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v11_5_pmfw.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v11_5_ppsmc.h(100%)
Quoted 8 lines
rename
drivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v11_8_pmfw.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v11_8_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v12_0.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v12_0_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v13_0.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v13_0_1_pmfw.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v13_0_1_ppsmc.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v13_0_pptable.h(100%)
Since this is done anyway, suggest to move firmware specific headers (interface/messsages etc.) to separate folder.
Thanks,
Lijo
Quoted 440 lines
drivers/gpu/drm/amd/pm/Makefile +6
-4@@ -21,20 +21,22 @@ # 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/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/aldebaran_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/aldebaran_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/arcturus_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/arcturus_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/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/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/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/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/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/smu12_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/smu12_driver_if.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/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/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/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_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_7_ppsmc.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_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_ppsmc.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_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/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/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/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/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_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/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_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/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_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 V4 14/17] drm/amd/pm: relocate the power related headers
[AMD Official Use Only]
Quoted 254 lines
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Thursday, December 9, 2021 8:41 PM
To: Quan, Evan <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Feng, Kenneth <[email protected]>
Subject: Re: [PATCH V4 14/17] drm/amd/pm: relocate the power related headersQuoted 9 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--- drivers/gpu/drm/amd/pm/Makefile | 10 +++--- 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 .../amd/pm/{ => swsmu}/inc/aldebaran_ppsmc.h | 0 .../drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h | 0 .../amd/pm/{ => swsmu}/inc/arcturus_ppsmc.h | 0 .../inc/smu11_driver_if_arcturus.h | 0 .../inc/smu11_driver_if_cyan_skillfish.h | 0 .../{ => swsmu}/inc/smu11_driver_if_navi10.h | 0 .../inc/smu11_driver_if_sienna_cichlid.h | 0 .../{ => swsmu}/inc/smu11_driver_if_vangogh.h | 0 .../amd/pm/{ => swsmu}/inc/smu12_driver_if.h | 0 .../inc/smu13_driver_if_aldebaran.h | 0 .../inc/smu13_driver_if_yellow_carp.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_ppsmc.h | 0 .../pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h | 0 .../amd/pm/{ => swsmu}/inc/smu_v11_0_ppsmc.h | 0 .../pm/{ => swsmu}/inc/smu_v11_0_pptable.h | 0 .../amd/pm/{ => swsmu}/inc/smu_v11_5_pmfw.h | 0 .../amd/pm/{ => swsmu}/inc/smu_v11_5_ppsmc.h | 0 .../amd/pm/{ => swsmu}/inc/smu_v11_8_pmfw.h | 0 .../amd/pm/{ => swsmu}/inc/smu_v11_8_ppsmc.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h | 0 .../amd/pm/{ => swsmu}/inc/smu_v12_0_ppsmc.h | 0 .../drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h | 0 .../amd/pm/{ => swsmu}/inc/smu_v13_0_1_pmfw.h | 0 .../pm/{ => swsmu}/inc/smu_v13_0_1_ppsmc.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, 39 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/aldebaran_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/{=>swsmu}/inc/arcturus_ppsmc.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
swsmu}/inc/smu11_driver_if_arcturus.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
swsmu}/inc/smu11_driver_if_cyan_skillfish.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
swsmu}/inc/smu11_driver_if_navi10.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
swsmu}/inc/smu11_driver_if_sienna_cichlid.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
swsmu}/inc/smu11_driver_if_vangogh.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu12_driver_if.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
swsmu}/inc/smu13_driver_if_aldebaran.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
swsmu}/inc/smu13_driver_if_yellow_carp.h(100%)Quoted 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_ppsmc.h(100%)Quoted 1 line
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_ppsmc.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
swsmu}/inc/smu_v11_0_pptable.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v11_5_pmfw.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v11_5_ppsmc.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v11_8_pmfw.h(100%)
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v11_8_ppsmc.h(100%)
Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v12_0.h(100%) renamedrivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v12_0_ppsmc.h(100%)
Quoted 2 lines
rename
drivers/gpu/drm/amd/pm/{=>swsmu}/inc/smu_v13_0.h(100%) renamedrivers/gpu/drm/amd/pm/{=>
swsmu}/inc/smu_v13_0_1_pmfw.h(100%)
Quoted 8 lines
Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
swsmu}/inc/smu_v13_0_1_ppsmc.h(100%)Quoted 1 line
rename
drivers/gpu/drm/amd/pm/{=>
swsmu}/inc/smu_v13_0_pptable.hQuoted 1 line
(100%)
Since this is done anyway, suggest to move firmware specific headers (interface/messsages etc.) to separate folder.
[Quan, Evan] Yep, I can do that.
BR
Evan
Quoted 557 lines
Thanks,
LijoQuoted 41 lines
(quoted diff) +0
-0b/drivers/gpu/drm/amd/pm/Makefile index
d35ffde387f1..84c7203b5e46100644drivers/gpu/drm/amd/pm/Makefile +6
-4@@ -21,20 +21,22 @@ # 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/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.hQuoted 29 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/aldebaran_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/aldebaran_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/arcturus_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/arcturus_ppsmc.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu11_driver_if_arcturus.h renamed from drivers/gpu/drm/amd/pm/inc/smu11_driver_if_arcturus.h +0
-0Quoted 1 line
rename to
drivers/gpu/drm/amd/pm/swsmu/inc/smu11_driver_if_arcturus.hQuoted 12 lines
diff --git
a/drivers/gpu/drm/amd/pm/inc/smu11_driver_if_cyan_skillfish.hb/drivers/gpu/drm/amd/pm/swsmu/inc/smu11_driver_if_cyan_skillfish.hsimilarity index 100%
rename fromdrivers/gpu/drm/amd/pm/inc/smu11_driver_if_cyan_skillfish.hrename todrivers/gpu/drm/amd/pm/swsmu/inc/smu11_driver_if_cyan_skillfish.hdrivers/gpu/drm/amd/pm/swsmu/inc/smu11_driver_if_navi10.h renamed from drivers/gpu/drm/amd/pm/inc/smu11_driver_if_navi10.h +0
-0Quoted 1 line
rename to
drivers/gpu/drm/amd/pm/swsmu/inc/smu11_driver_if_navi10.hQuoted 12 lines
diff --git
a/drivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.hb/drivers/gpu/drm/amd/pm/swsmu/inc/smu11_driver_if_sienna_cichlid.hsimilarity index 100%
rename fromdrivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.hrename todrivers/gpu/drm/amd/pm/swsmu/inc/smu11_driver_if_sienna_cichlid.hdrivers/gpu/drm/amd/pm/swsmu/inc/smu11_driver_if_vangogh.h renamed from drivers/gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h +0
-0Quoted 1 line
rename to
drivers/gpu/drm/amd/pm/swsmu/inc/smu11_driver_if_vangogh.hQuoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/inc/smu12_driver_if.h renamed from drivers/gpu/drm/amd/pm/inc/smu12_driver_if.h +0
-0drivers/gpu/drm/amd/pm/swsmu/inc/smu13_driver_if_aldebaran.h renamed from drivers/gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h +0
-0rename to
drivers/gpu/drm/amd/pm/swsmu/inc/smu13_driver_if_aldebaran.hQuoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/inc/smu13_driver_if_yellow_carp.h renamed from drivers/gpu/drm/amd/pm/inc/smu13_driver_if_yellow_carp.h +0
-0rename from
drivers/gpu/drm/amd/pm/inc/smu13_driver_if_yellow_carp.hQuoted 114 lines
rename to
drivers/gpu/drm/amd/pm/swsmu/inc/smu13_driver_if_yellow_carp.hdrivers/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_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_7_ppsmc.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_ppsmc.h renamed from drivers/gpu/drm/amd/pm/inc/smu_v11_0_ppsmc.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_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/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/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/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/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_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/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_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/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_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 v4 15/17 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
@@ -1541,8 +1541,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;
@@ -1555,8 +1553,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 v4 16/17 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
@@ -266,7 +266,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,
@@ -297,7 +296,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
@@ -305,6 +305,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 ;
@@ -358,10 +362,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);
@@ -369,6 +370,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
@@ -1679,14 +1679,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);
@@ -1696,16 +1689,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); } }
@@ -2151,7 +2137,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
PATCH v4 17/17 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 | 719 +++++++++++++++------ 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, 536 insertions(+), 215 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +534 -185
@@ -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 ; -return smu_send_hbm_bad_pages_num (smu, size); +mutex_lock (&adev->pm.mutex); + ret =smu_send_hbm_bad_pages_num (smu, size); +mutex_unlock (&adev->pm.mutex); + +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); }enum amd_dpm_forced_level amdgpu_dpm_get_performance_level (struct amdgpu_device *adev)
@@ -576,10 +689,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; }
@@ -588,30 +703,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 ; +mutex_lock (&adev->pm.mutex); + +if (!pp_funcs->force_performance_level) + goto out; -if (pp_funcs->force_performance_level (adev->powerplay.pp_handle, - level)) -return -EINVAL ; +if (adev->pm.dpm.thermal_active) { + ret = -EINVAL ; + goto out; } - adev->pm.dpm.forced_level = level; +if (pp_funcs->force_performance_level (adev->powerplay.pp_handle, + level)) + ret = -EINVAL ; -return 0 ; +out: +if (!ret) + adev->pm.dpm.forced_level = level; + +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,
@@ -619,21 +750,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,
@@ -642,14 +786,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,
@@ -658,14 +807,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,
@@ -673,36 +827,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,
@@ -710,88 +879,131 @@ 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) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->set_sclk_od)return -EOPNOTSUPP ; -return pp_funcs->set_sclk_od (adev->powerplay.pp_handle, value); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_sclk_od (adev->powerplay.pp_handle, + value); +mutex_unlock (&adev->pm.mutex); + +return ret; }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) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->set_mclk_od)return -EOPNOTSUPP ; -return pp_funcs->set_mclk_od (adev->powerplay.pp_handle, value); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_mclk_od (adev->powerplay.pp_handle, + value); +mutex_unlock (&adev->pm.mutex); + +return ret; }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,
@@ -802,7 +1014,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 ; }
@@ -811,44 +1025,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,
@@ -859,7 +1097,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 ; }
@@ -870,33 +1111,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,
@@ -907,8 +1165,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 ; }
@@ -918,13 +1178,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)
@@ -945,19 +1210,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; }
@@ -973,12 +1246,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,
@@ -986,25 +1264,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,
@@ -1012,13 +1300,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,
@@ -1026,49 +1319,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)
@@ -1078,31 +1391,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,
@@ -1113,8 +1438,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,
@@ -1125,32 +1452,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,
@@ -1158,23 +1497,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
RE: [PATCH V4 17/17] drm/amd/pm: unified lock protections in amdgpu_dpm.c
[AMD Official Use Only]
Ping.. for the patch series.
Quoted 1,844 lines
-----Original Message-----
From: Quan, Evan <[email protected]>
Sent: Friday, December 3, 2021 11:06 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Lazar, Lijo <[email protected]>; Feng, Kenneth <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH V4 17/17] drm/amd/pm: unified lock protections inamdgpu_dpm.cAs 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.Signed-off-by Evan Quan <[email protected]>Change-Id Iad228cad0b3d8c41927def08965a52525f3f51d3--- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 719 +++++++++++++++----- - 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, 536 insertions(+), 215 deletions(-)drivers/gpu/drm/amd/pm/amdgpu_dpm.c +20
-2@@ -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_tblock_type, bool gate) @@ -62,52 +80,20 @@ int amdgpu_dpm_set_powergating_by_smu(structamdgpu_device*adev,uint32_tblockdrivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-5return 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
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1-* UVD and VCE cases only. Since for other cases, there
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-3-* 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.
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1-* Tainted: G OE 5.0.0-37-generic #40~18.04.1-Ubuntu
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1-* echo 0 >
/proc/sys/kernel/hung_task_timeout_secs" disables this message.drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-10-* 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]drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1-*
gfx_v8_0_enable_gfx_static_mg_power_gating+0x3c/0x70[amdgpu]drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1-* gfx_v8_0_set_powergating_state+0x66/0x260 [amdgpu]
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1-*
amdgpu_device_ip_set_powergating_state+0x62/0xb0[amdgpu]drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1-* pp_dpm_force_performance_level+0xe7/0x100 [amdgpu]
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1-*
amdgpu_set_dpm_forced_performance_level+0x129/0x330[amdgpu]drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-4-*/ -mutex_lock (&adev->pm.mutex); - ret = (pp_funcs->set_powergating_by_smu( - (adev)->powerplay.pp_handle, block_type,gate));
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-4-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));
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1- }break ;default :break ;@@ -116,6 +102,8 @@ int amdgpu_dpm_set_powergating_by_smu(struct
amdgpu_device*adev,uint32_tblockdrivers/gpu/drm/amd/pm/amdgpu_dpm.c +14
-0if (!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(structamdgpu_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); }drivers/gpu/drm/amd/pm/amdgpu_dpm.c +23
-8return 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) {
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +4
-2struct 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);drivers/gpu/drm/amd/pm/amdgpu_dpm.c +10
-5+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,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +8
-2if (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(structamdgpu_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); + }drivers/gpu/drm/amd/pm/amdgpu_dpm.c +4
-1return ret; }@@ -269,8 +297,11 @@ int amdgpu_dpm_set_df_cstate(structamdgpu_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;}
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-0@@ -278,11 +309,15 @@ int amdgpu_dpm_set_df_cstate(struct
amdgpu_device*adev, intamdgpu_dpm_allow_xgmi_power_down(struct amdgpu_device *adev, bool en){drivers/gpu/drm/amd/pm/amdgpu_dpm.c +11
-4struct 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;}
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +4
-1@@ -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;}
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +4
-1@@ -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;}
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +3
-1@@ -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); }}
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-0@@ -350,16 +396,19 @@ int amdgpu_dpm_read_sensor(struct
amdgpu_device*adev, enumamd_pp_sensorssensodrivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-4void *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);
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +10
-2-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)drivers/gpu/drm/amd/pm/amdgpu_dpm.c +31
-12@@ -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 ; -return smu_send_hbm_bad_pages_num (smu, size); +mutex_lock (&adev->pm.mutex); + ret =smu_send_hbm_bad_pages_num (smu, size); +mutex_unlock (&adev->pm.mutex); + +return ret;}
int amdgpu_dpm_get_dpm_freq_range(struct
amdgpu_device*adev, @@
-442,15 +512,22 @@ int amdgpu_dpm_get_dpm_freq_range(structamdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +5
-3uint32_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-Quoted 1 line
powerplay.pp_handle,
SMU_SCLK, min, max);drivers/gpu/drm/amd/pm/amdgpu_dpm.c +8
-3-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,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +4
-3uint32_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);
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +14
-4-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,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +6
-1uint64_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) {
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +6
-1struct 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) {drivers/gpu/drm/amd/pm/amdgpu_dpm.c +10
-2struct 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,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +8
-1@@ -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); }enum
amd_dpm_forced_levelamdgpu_dpm_get_performance_level(struct amdgpu_device *adev)@@ - 576,10 +689,12 @@ enumamd_dpm_forced_levelamdgpu_dpm_get_performance_level(structamdgpu_devicedrivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-0const 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-Quoted 1 line
powerplay.pp_handle);
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +26
-9else level = adev->pm.dpm.forced_level; +mutex_unlock (&adev->pm.mutex);return level; }@@ -588,30 +703,46 @@ int amdgpu_dpm_force_performance_level(structamdgpu_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 ; +mutex_lock (&adev->pm.mutex); + +if (!pp_funcs->force_performance_level) + goto out; -if (pp_funcs->force_performance_level (adev- >powerplay.pp_handle, - level)) -return -EINVAL ; + if (adev->pm.dpm.thermal_active) { + ret = -EINVAL ; + goto out; } - adev->pm.dpm.forced_level = level; +if (pp_funcs->force_performance_level (adev- >powerplay.pp_handle, + level)) + ret = -EINVAL ; - return 0; +out: +if (!ret) + adev->pm.dpm.forced_level = level; + +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, @@ -619,21
+750,34 @@ int amdgpu_dpm_dispatch_task(structamdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1enum 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);drivers/gpu/drm/amd/pm/amdgpu_dpm.c +7
-0+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){
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +7
-2const 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, @@ -642,14 +786,19 @@ int amdgpu_dpm_set_fine_grain_clk_vol(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1uint32_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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-3- type, - input, - size); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_fine_grain_clk_vol(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +6
-0+ type, + input, + size); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_odn_edit_dpm_table(struct amdgpu_device *adev, @@ -658,14 +807,19 @@ int amdgpu_dpm_odn_edit_dpm_table(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1uint32_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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +8
-3- 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, @@ -673,36 +827,51 @@ int amdgpu_dpm_print_clock_levels(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +9
-4char *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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +6
-1- 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) {
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1const 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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +6
-1- 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, @@ -710,88 +879,131 @@ int amdgpu_dpm_force_clock_level(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +14
-4uint32_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){
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +13
-2const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->set_sclk_od)return -EOPNOTSUPP ; -return pp_funcs->set_sclk_od (adev->powerplay.pp_handle, value); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_sclk_od (adev->powerplay.pp_handle, + value); +mutex_unlock (&adev->pm.mutex); + +return ret; }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_tvalue) {
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +8
-2const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->set_mclk_od)return -EOPNOTSUPP ; -return pp_funcs->set_mclk_od (adev->powerplay.pp_handle, value); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_mclk_od (adev->powerplay.pp_handle, + value); +mutex_unlock (&adev->pm.mutex); + +return ret; }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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-1- buf); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_power_profile_mode(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +5
-1+ 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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-2- input, - size); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_power_profile_mode(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +5
-0+ input, + size); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_get_gpu_metrics(struct amdgpu_device *adev, void**table) {
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1const 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);
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +8
-0+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,@@ -802,7 +1014,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);drivers/gpu/drm/amd/pm/amdgpu_dpm.c +22
-4return 0 ; }@@ -811,44 +1025,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);
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +10
-1+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,@@ -859,7 +1097,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);drivers/gpu/drm/amd/pm/amdgpu_dpm.c +23
-6return 0 ; }@@ -870,33 +1111,50 @@ int amdgpu_dpm_get_power_limit(structamdgpu_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, @@ -907,8 +1165,10 @@ int amdgpu_dpm_debugfs_print_current_performance_level(structamdgpu_device*adedrivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-0if (!pp_funcs->debugfs_print_current_performance_level)return -EOPNOTSUPP ; +mutex_lock (&adev->pm.mutex); pp_funcs->debugfs_print_current_performance_level(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +9
-3m); +mutex_unlock (&adev->pm.mutex);return 0 ; }@@ -918,13 +1178,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)drivers/gpu/drm/amd/pm/amdgpu_dpm.c +18
-5@@ -945,19 +1210,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; }@@ -973,12 +1246,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, @@ -
986,25 +1264,35 @@ int amdgpu_dpm_get_clock_by_type(structamdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +8
-3struct 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,
structamd_pp_simple_clock_info*clocks) {drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1const 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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-1- clocks); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_display_mode_validation_clocks(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +4
-0+ clocks); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_get_clock_by_type_with_latency(struct amdgpu_device*adev, @@ -1012,13 +1300,18 @@ int amdgpu_dpm_get_clock_by_type_with_latency(struct
amdgpu_device*adev,
structpp_clock_levels_with_latency*clocks) {drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1const 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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-2- type, - clocks); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_clock_by_type_with_latency(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +5
-0+ type, + clocks); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_get_clock_by_type_with_voltage(struct amdgpu_device*adev, @@ -1026,49 +1319,69 @@ int amdgpu_dpm_get_clock_by_type_with_voltage(struct
amdgpu_device*adev,
structpp_clock_levels_with_voltage*clocks) {drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1const 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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-2- type, - clocks); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_clock_by_type_with_voltage(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +5
-0+ type, + clocks); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_set_watermarks_for_clocks_ranges(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1void *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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-1- clock_ranges); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_watermarks_for_clocks_ranges(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +4
-0+ clock_ranges); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_display_clock_voltage_request(struct amdgpu_device*adev,
structpp_display_clock_request
*clock) {drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1const 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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-1- clock); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->display_clock_voltage_request(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +21
-5+ 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)@@ -1078,31 +1391,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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-1- clock); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_min_deep_sleep_dcefclk(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +4
-0+ clock); +mutex_unlock (&adev->pm.mutex); + +return ret; } void amdgpu_dpm_set_hard_min_dcefclk_by_freq(struct amdgpu_device*adev, @@ -1113,8 +1438,10 @@ void amdgpu_dpm_set_hard_min_dcefclk_by_freq(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-0if (!pp_funcs->set_hard_min_dcefclk_by_freq)return ; +mutex_lock (&adev->pm.mutex); pp_funcs->set_hard_min_dcefclk_by_freq(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-0clock); +mutex_unlock (&adev->pm.mutex); } void amdgpu_dpm_set_hard_min_fclk_by_freq(struct amdgpu_device*adev, @@ -1125,32 +1452,44 @@ void amdgpu_dpm_set_hard_min_fclk_by_freq(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-0if (!pp_funcs->set_hard_min_fclk_by_freq)return ; +mutex_lock (&adev->pm.mutex); pp_funcs->set_hard_min_fclk_by_freq(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-0clock); +mutex_unlock (&adev->pm.mutex); } int amdgpu_dpm_display_disable_memory_clock_switch(struct
amdgpu_device*adev,
booldisable_memory_clock_switch) {drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1const 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-Quoted 1 line
powerplay.pp_handle,
-
disable_memory_clock_switch);drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-0+mutex_lock (&adev->pm.mutex); + ret = pp_funcs->display_disable_memory_clock_switch(adev-Quoted 1 line
powerplay.pp_handle,
+
disable_memory_clock_switch);drivers/gpu/drm/amd/pm/amdgpu_dpm.c +3
-0+mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_get_max_sustainable_clocks_by_dc(struct
amdgpu_device*adev,
structpp_smu_nv_clock_table*max_clocks) {drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1const 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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-1- max_clocks); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_max_sustainable_clocks_by_dc(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +4
-0+ max_clocks); +mutex_unlock (&adev->pm.mutex); + +return ret; } enum pp_smu_status amdgpu_dpm_get_uclk_dpm_states(struct
amdgpu_device*adev, @@ -1158,23 +1497,33 @@ enumpp_smu_statusamdgpu_dpm_get_uclk_dpm_states(structamdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1unsigned 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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +8
-3- 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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +6
-1- 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 +0
-3@@ -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" );drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c +1
-10return 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 ;}
drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c +0
-2@@ -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 +0
-3@@ -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" );drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +1
-10return 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 ;}
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +0
-3@@ -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); } --2.29.0
RE: [PATCH V4 17/17] drm/amd/pm: unified lock protections in amdgpu_dpm.c
In reply to Evan Quan[AMD Official Use Only]
Hi Alex & Lijo,
Please help to review this patch series and share your comments if any. Need to get this landed to unblock further optimization.
BR
Evan
Quoted 1,844 lines
-----Original Message-----
From: Quan, Evan <[email protected]>
Sent: Friday, December 3, 2021 11:06 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Lazar, Lijo <[email protected]>; Feng, Kenneth <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH V4 17/17] drm/amd/pm: unified lock protections inamdgpu_dpm.cAs 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.Signed-off-by Evan Quan <[email protected]>Change-Id Iad228cad0b3d8c41927def08965a52525f3f51d3--- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 719 +++++++++++++++----- - 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, 536 insertions(+), 215 deletions(-)drivers/gpu/drm/amd/pm/amdgpu_dpm.c +20
-2@@ -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_tblock_type, bool gate) @@ -62,52 +80,20 @@ int amdgpu_dpm_set_powergating_by_smu(structamdgpu_device*adev,uint32_tblockdrivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-5return 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
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1-* UVD and VCE cases only. Since for other cases, there
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-3-* 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.
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1-* Tainted: G OE 5.0.0-37-generic #40~18.04.1-Ubuntu
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1-* echo 0 >
/proc/sys/kernel/hung_task_timeout_secs" disables this message.drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-10-* 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]drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1-*
gfx_v8_0_enable_gfx_static_mg_power_gating+0x3c/0x70[amdgpu]drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1-* gfx_v8_0_set_powergating_state+0x66/0x260 [amdgpu]
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1-*
amdgpu_device_ip_set_powergating_state+0x62/0xb0[amdgpu]drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1-* pp_dpm_force_performance_level+0xe7/0x100 [amdgpu]
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1-*
amdgpu_set_dpm_forced_performance_level+0x129/0x330[amdgpu]drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-4-*/ -mutex_lock (&adev->pm.mutex); - ret = (pp_funcs->set_powergating_by_smu( - (adev)->powerplay.pp_handle, block_type,gate));
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-4-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));
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-1- }break ;default :break ;@@ -116,6 +102,8 @@ int amdgpu_dpm_set_powergating_by_smu(struct
amdgpu_device*adev,uint32_tblockdrivers/gpu/drm/amd/pm/amdgpu_dpm.c +14
-0if (!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(structamdgpu_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); }drivers/gpu/drm/amd/pm/amdgpu_dpm.c +23
-8return 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) {
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +4
-2struct 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);drivers/gpu/drm/amd/pm/amdgpu_dpm.c +10
-5+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,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +8
-2if (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(structamdgpu_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); + }drivers/gpu/drm/amd/pm/amdgpu_dpm.c +4
-1return ret; }@@ -269,8 +297,11 @@ int amdgpu_dpm_set_df_cstate(structamdgpu_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;}
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-0@@ -278,11 +309,15 @@ int amdgpu_dpm_set_df_cstate(struct
amdgpu_device*adev, intamdgpu_dpm_allow_xgmi_power_down(struct amdgpu_device *adev, bool en){drivers/gpu/drm/amd/pm/amdgpu_dpm.c +11
-4struct 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;}
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +4
-1@@ -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;}
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +4
-1@@ -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;}
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +3
-1@@ -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); }}
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-0@@ -350,16 +396,19 @@ int amdgpu_dpm_read_sensor(struct
amdgpu_device*adev, enumamd_pp_sensorssensodrivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-4void *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);
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +10
-2-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)drivers/gpu/drm/amd/pm/amdgpu_dpm.c +31
-12@@ -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 ; -return smu_send_hbm_bad_pages_num (smu, size); +mutex_lock (&adev->pm.mutex); + ret =smu_send_hbm_bad_pages_num (smu, size); +mutex_unlock (&adev->pm.mutex); + +return ret;}
int amdgpu_dpm_get_dpm_freq_range(struct
amdgpu_device*adev, @@
-442,15 +512,22 @@ int amdgpu_dpm_get_dpm_freq_range(structamdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +5
-3uint32_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-Quoted 1 line
powerplay.pp_handle,
SMU_SCLK, min, max);drivers/gpu/drm/amd/pm/amdgpu_dpm.c +8
-3-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,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +4
-3uint32_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);
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +14
-4-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,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +6
-1uint64_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) {
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +6
-1struct 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) {drivers/gpu/drm/amd/pm/amdgpu_dpm.c +10
-2struct 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,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +8
-1@@ -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); }enum
amd_dpm_forced_levelamdgpu_dpm_get_performance_level(struct amdgpu_device *adev)@@ - 576,10 +689,12 @@ enumamd_dpm_forced_levelamdgpu_dpm_get_performance_level(structamdgpu_devicedrivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-0const 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-Quoted 1 line
powerplay.pp_handle);
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +26
-9else level = adev->pm.dpm.forced_level; +mutex_unlock (&adev->pm.mutex);return level; }@@ -588,30 +703,46 @@ int amdgpu_dpm_force_performance_level(structamdgpu_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 ; +mutex_lock (&adev->pm.mutex); + +if (!pp_funcs->force_performance_level) + goto out; -if (pp_funcs->force_performance_level (adev- >powerplay.pp_handle, - level)) -return -EINVAL ; + if (adev->pm.dpm.thermal_active) { + ret = -EINVAL ; + goto out; } - adev->pm.dpm.forced_level = level; +if (pp_funcs->force_performance_level (adev- >powerplay.pp_handle, + level)) + ret = -EINVAL ; - return 0; +out: +if (!ret) + adev->pm.dpm.forced_level = level; + +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, @@ -619,21
+750,34 @@ int amdgpu_dpm_dispatch_task(structamdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1enum 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);drivers/gpu/drm/amd/pm/amdgpu_dpm.c +7
-0+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){
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +7
-2const 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, @@ -642,14 +786,19 @@ int amdgpu_dpm_set_fine_grain_clk_vol(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1uint32_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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-3- type, - input, - size); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_fine_grain_clk_vol(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +6
-0+ type, + input, + size); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_odn_edit_dpm_table(struct amdgpu_device *adev, @@ -658,14 +807,19 @@ int amdgpu_dpm_odn_edit_dpm_table(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1uint32_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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +8
-3- 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, @@ -673,36 +827,51 @@ int amdgpu_dpm_print_clock_levels(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +9
-4char *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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +6
-1- 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) {
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1const 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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +6
-1- 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, @@ -710,88 +879,131 @@ int amdgpu_dpm_force_clock_level(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +14
-4uint32_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){
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +13
-2const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->set_sclk_od)return -EOPNOTSUPP ; -return pp_funcs->set_sclk_od (adev->powerplay.pp_handle, value); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_sclk_od (adev->powerplay.pp_handle, + value); +mutex_unlock (&adev->pm.mutex); + +return ret; }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_tvalue) {
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +8
-2const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int ret =0 ;if (!pp_funcs->set_mclk_od)return -EOPNOTSUPP ; -return pp_funcs->set_mclk_od (adev->powerplay.pp_handle, value); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_mclk_od (adev->powerplay.pp_handle, + value); +mutex_unlock (&adev->pm.mutex); + +return ret; }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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-1- buf); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_power_profile_mode(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +5
-1+ 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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-2- input, - size); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_power_profile_mode(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +5
-0+ input, + size); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_get_gpu_metrics(struct amdgpu_device *adev, void**table) {
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1const 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);
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +8
-0+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,@@ -802,7 +1014,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);drivers/gpu/drm/amd/pm/amdgpu_dpm.c +22
-4return 0 ; }@@ -811,44 +1025,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);
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +10
-1+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,@@ -859,7 +1097,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);drivers/gpu/drm/amd/pm/amdgpu_dpm.c +23
-6return 0 ; }@@ -870,33 +1111,50 @@ int amdgpu_dpm_get_power_limit(structamdgpu_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, @@ -907,8 +1165,10 @@ int amdgpu_dpm_debugfs_print_current_performance_level(structamdgpu_device*adedrivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-0if (!pp_funcs->debugfs_print_current_performance_level)return -EOPNOTSUPP ; +mutex_lock (&adev->pm.mutex); pp_funcs->debugfs_print_current_performance_level(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +9
-3m); +mutex_unlock (&adev->pm.mutex);return 0 ; }@@ -918,13 +1178,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)drivers/gpu/drm/amd/pm/amdgpu_dpm.c +18
-5@@ -945,19 +1210,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; }@@ -973,12 +1246,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, @@ -
986,25 +1264,35 @@ int amdgpu_dpm_get_clock_by_type(structamdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +8
-3struct 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,
structamd_pp_simple_clock_info*clocks) {drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1const 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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-1- clocks); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_display_mode_validation_clocks(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +4
-0+ clocks); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_get_clock_by_type_with_latency(struct amdgpu_device*adev, @@ -1012,13 +1300,18 @@ int amdgpu_dpm_get_clock_by_type_with_latency(struct
amdgpu_device*adev,
structpp_clock_levels_with_latency*clocks) {drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1const 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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-2- type, - clocks); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_clock_by_type_with_latency(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +5
-0+ type, + clocks); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_get_clock_by_type_with_voltage(struct amdgpu_device*adev, @@ -1026,49 +1319,69 @@ int amdgpu_dpm_get_clock_by_type_with_voltage(struct
amdgpu_device*adev,
structpp_clock_levels_with_voltage*clocks) {drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1const 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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-2- type, - clocks); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_clock_by_type_with_voltage(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +5
-0+ type, + clocks); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_set_watermarks_for_clocks_ranges(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1void *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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-1- clock_ranges); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_watermarks_for_clocks_ranges(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +4
-0+ clock_ranges); +mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_display_clock_voltage_request(struct amdgpu_device*adev,
structpp_display_clock_request
*clock) {drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1const 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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-1- clock); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->display_clock_voltage_request(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +21
-5+ 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)@@ -1078,31 +1391,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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-1- clock); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->set_min_deep_sleep_dcefclk(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +4
-0+ clock); +mutex_unlock (&adev->pm.mutex); + +return ret; } void amdgpu_dpm_set_hard_min_dcefclk_by_freq(struct amdgpu_device*adev, @@ -1113,8 +1438,10 @@ void amdgpu_dpm_set_hard_min_dcefclk_by_freq(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-0if (!pp_funcs->set_hard_min_dcefclk_by_freq)return ; +mutex_lock (&adev->pm.mutex); pp_funcs->set_hard_min_dcefclk_by_freq(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-0clock); +mutex_unlock (&adev->pm.mutex); } void amdgpu_dpm_set_hard_min_fclk_by_freq(struct amdgpu_device*adev, @@ -1125,32 +1452,44 @@ void amdgpu_dpm_set_hard_min_fclk_by_freq(struct
amdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-0if (!pp_funcs->set_hard_min_fclk_by_freq)return ; +mutex_lock (&adev->pm.mutex); pp_funcs->set_hard_min_fclk_by_freq(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-0clock); +mutex_unlock (&adev->pm.mutex); } int amdgpu_dpm_display_disable_memory_clock_switch(struct
amdgpu_device*adev,
booldisable_memory_clock_switch) {drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1const 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-Quoted 1 line
powerplay.pp_handle,
-
disable_memory_clock_switch);drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-0+mutex_lock (&adev->pm.mutex); + ret = pp_funcs->display_disable_memory_clock_switch(adev-Quoted 1 line
powerplay.pp_handle,
+
disable_memory_clock_switch);drivers/gpu/drm/amd/pm/amdgpu_dpm.c +3
-0+mutex_unlock (&adev->pm.mutex); + +return ret; } int amdgpu_dpm_get_max_sustainable_clocks_by_dc(struct
amdgpu_device*adev,
structpp_smu_nv_clock_table*max_clocks) {drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1const 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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +2
-1- max_clocks); +mutex_lock (&adev->pm.mutex); + ret = pp_funcs->get_max_sustainable_clocks_by_dc(adev-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +4
-0+ max_clocks); +mutex_unlock (&adev->pm.mutex); + +return ret; } enum pp_smu_status amdgpu_dpm_get_uclk_dpm_states(struct
amdgpu_device*adev, @@ -1158,23 +1497,33 @@ enumpp_smu_statusamdgpu_dpm_get_uclk_dpm_states(structamdgpu_device*adev,drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1
-1unsigned 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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +8
-3- 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-Quoted 1 line
powerplay.pp_handle,
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +6
-1- 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 +0
-3@@ -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" );drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c +1
-10return 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 ;}
drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c +0
-2@@ -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 +0
-3@@ -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" );drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +1
-10return 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 ;}
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +0
-3@@ -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); } --2.29.0
PATCH v4 17/17 drm/amd/pm: unified lock protections in amdgpu_dpm.c
In reply to Evan QuanHi, I have a Cape Verde GPU card in my pc and after git bisecting a situation where, at the time of the amdgpu module, the monitor would lose signal and the pc locked up so that it only responded to a magic sysreq boot (with no logging due to it happening before the root filesystem was writeable), the above commit was identified as the culprit.
The GPU card is a Gigabyte R7 250 with pci-id 1002:682b (rev 87).
With the 5.17.0 kernel and a kernel command line of:
amdgpu.audio=1 amdgpu.si_support=1
the following dmesg output was received:
[ 76.118991] [drm] amdgpu kernel modesetting enabled. [ 76.119100] amdgpu 0000:01:00.0: vgaarb: deactivate vga console [ 76.120004] Console: switching to colour dummy device 80x25 [ 76.120203] [drm] initializing kernel modesetting (VERDE 0x1002:0x682B 0x1458:0x22CA 0x87). [ 76.120211] amdgpu 0000:01:00.0: amdgpu: Trusted Memory Zone (TMZ) feature not supported [ 76.120235] [drm] register mmio base: 0xFE8C0000 [ 76.120238] [drm] register mmio size: 262144 [ 76.120245] [drm] add ip block number 0 <si_common> [ 76.120248] [drm] add ip block number 1 <gmc_v6_0> [ 76.120251] [drm] add ip block number 2 <si_ih> [ 76.120253] [drm] add ip block number 3 <gfx_v6_0> [ 76.120256] [drm] add ip block number 4 <si_dma> [ 76.120258] [drm] add ip block number 5 <si_dpm> [ 76.120261] [drm] add ip block number 6 <dce_v6_0> [ 76.120264] [drm] add ip block number 7 <uvd_v3_1> [ 76.163659] [drm] BIOS signature incorrect 5b 7 [ 76.163669] resource sanity check: requesting [mem 0x000c0000-0x000dffff], which spans more than PCI Bus 0000:00 [mem 0x000d0000-0x000dffff window] [ 76.163677] caller pci_map_rom+0x68/0x1b0 mapping multiple BARs [ 76.163691] amdgpu 0000:01:00.0: No more image in the PCI ROM [ 76.164996] amdgpu 0000:01:00.0: amdgpu: Fetched VBIOS from ROM BAR [ 76.165001] amdgpu: ATOM BIOS: xxx-xxx-xxx [ 76.165018] amdgpu 0000:01:00.0: amdgpu: PCIE atomic ops is not supported [ 76.165270] [drm] vm size is 64 GB, 2 levels, block size is 10-bit, fragment size is 9-bit [ 76.349679] amdgpu 0000:01:00.0: amdgpu: VRAM: 2048M 0x000000F400000000 - 0x000000F47FFFFFFF (2048M used) [ 76.349716] amdgpu 0000:01:00.0: amdgpu: GART: 1024M 0x000000FF00000000 - 0x000000FF3FFFFFFF [ 76.349753] [drm] Detected VRAM RAM=2048M, BAR=256M [ 76.349764] [drm] RAM width 128bits DDR3 [ 76.349940] [drm] amdgpu: 2048M of VRAM memory ready [ 76.349953] [drm] amdgpu: 3072M of GTT memory ready. [ 76.349992] [drm] GART: num cpu pages 262144, num gpu pages 262144 [ 76.350506] amdgpu 0000:01:00.0: amdgpu: PCIE GART of 1024M enabled (table at 0x000000F400900000). [ 76.495343] [drm] Internal thermal controller with fan control [ 76.495391] [drm] amdgpu: dpm initialized [ 76.495637] [drm] AMDGPU Display Connectors [ 76.495647] [drm] Connector 0: [ 76.495655] [drm] HDMI-A-1 [ 76.495662] [drm] HPD1 [ 76.495668] [drm] DDC: 0x194c 0x194c 0x194d 0x194d 0x194e 0x194e 0x194f 0x194f [ 76.495685] [drm] Encoders: [ 76.495691] [drm] DFP1: INTERNAL_UNIPHY [ 76.495699] [drm] Connector 1: [ 76.495706] [drm] DVI-D-1 [ 76.495712] [drm] HPD2 [ 76.495718] [drm] DDC: 0x1950 0x1950 0x1951 0x1951 0x1952 0x1952 0x1953 0x1953 [ 76.495733] [drm] Encoders: [ 76.495739] [drm] DFP2: INTERNAL_UNIPHY [ 76.495746] [drm] Connector 2: [ 76.495753] [drm] VGA-1 [ 76.495758] [drm] DDC: 0x1970 0x1970 0x1971 0x1971 0x1972 0x1972 0x1973 0x1973 [ 76.495773] [drm] Encoders: [ 76.495779] [drm] CRT1: INTERNAL_KLDSCP_DAC1 [ 76.599604] [drm] Found UVD firmware Version: 64.0 Family ID: 13 [ 76.603443] [drm] PCIE gen 2 link speeds already enabled [ 77.149564] [drm] UVD initialized successfully. [ 77.149578] amdgpu 0000:01:00.0: amdgpu: SE 1, SH per SE 2, CU per SH 5, active_cu_number 8 [ 77.456492] RTL8211B Gigabit Ethernet r8169-0-300:00: attached PHY driver (mii_bus:phy_addr=r8169-0-300:00, irq=MAC) [ 77.486245] [drm] Initialized amdgpu 3.44.0 20150101 for 0000:01:00.0 on minor 0 [ 77.521555] r8169 0000:03:00.0 eth0: Link is Down [ 77.547158] fbcon: amdgpudrmfb (fb0) is primary device [ 77.591226] Console: switching to colour frame buffer device 240x67 [ 77.600296] amdgpu 0000:01:00.0: [drm] fb0: amdgpudrmfb frame buffer device
I can supply extra details but found no logging from the sessions that experienced the lock-up.
Regards,
Arthur Marsh.
RE: [PATCH V4 17/17] drm/amd/pm: unified lock protections in amdgpu_dpm.c
[AMD Official Use Only]
Hi Arthur,
Please drop the lock protection enforced in amdgpu_dpm_set_powergating_by_smu(as below) and have a try.
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0 -4
@@ -80,8 +80,6 @@ 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 :
@@ -102,8 +100,6 @@ 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; }
BR
Evan
Quoted 108 lines
-----Original Message-----
From: Arthur Marsh <[email protected]>
Sent: Thursday, March 31, 2022 10:28 AM
To: Quan, Evan <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Feng, Kenneth <[email protected]>; [email protected]; Koenig, Christian <[email protected]>; Lazar, Lijo <[email protected]>
Subject: [PATCH V4 17/17] drm/amd/pm: unified lock protections inamdgpu_dpm.cHi, I have a Cape Verde GPU card in my pc and after git bisecting a situation where, at the time of the amdgpu module, the monitor would lose signal and the pc locked up so that it only responded to a magic sysreq boot (with no logging due to it happening before the root filesystem was writeable), the above commit was identified as the culprit.
The GPU card is a Gigabyte R7 250 with pci-id 1002:682b (rev 87).
With the 5.17.0 kernel and a kernel command line of:
amdgpu.audio=1 amdgpu.si_support=1
the following dmesg output was received:
[ 76.118991] [drm] amdgpu kernel modesetting enabled. [ 76.119100] amdgpu 0000:01:00.0: vgaarb: deactivate vga console [ 76.120004] Console: switching to colour dummy device 80x25 [ 76.120203] [drm] initializing kernel modesetting (VERDE 0x1002:0x682B 0x1458:0x22CA 0x87). [ 76.120211] amdgpu 0000:01:00.0: amdgpu: Trusted Memory Zone (TMZ) feature not supported [ 76.120235] [drm] register mmio base: 0xFE8C0000 [ 76.120238] [drm] register mmio size: 262144 [ 76.120245] [drm] add ip block number 0 <si_common> [ 76.120248] [drm] add ip block number 1 <gmc_v6_0> [ 76.120251] [drm] add ip block number 2 <si_ih> [ 76.120253] [drm] add ip block number 3 <gfx_v6_0> [ 76.120256] [drm] add ip block number 4 <si_dma> [ 76.120258] [drm] add ip block number 5 <si_dpm> [ 76.120261] [drm] add ip block number 6 <dce_v6_0> [ 76.120264] [drm] add ip block number 7 <uvd_v3_1> [ 76.163659] [drm] BIOS signature incorrect 5b 7 [ 76.163669] resource sanity check: requesting [mem 0x000c0000- 0x000dffff], which spans more than PCI Bus 0000:00 [mem 0x000d0000- 0x000dffff window] [ 76.163677] caller pci_map_rom+0x68/0x1b0 mapping multiple BARs [ 76.163691] amdgpu 0000:01:00.0: No more image in the PCI ROM [ 76.164996] amdgpu 0000:01:00.0: amdgpu: Fetched VBIOS from ROM BAR [ 76.165001] amdgpu: ATOM BIOS: xxx-xxx-xxx [ 76.165018] amdgpu 0000:01:00.0: amdgpu: PCIE atomic ops is not supported [ 76.165270] [drm] vm size is 64 GB, 2 levels, block size is 10-bit, fragment size is 9-bit [ 76.349679] amdgpu 0000:01:00.0: amdgpu: VRAM: 2048M 0x000000F400000000 - 0x000000F47FFFFFFF (2048M used) [ 76.349716] amdgpu 0000:01:00.0: amdgpu: GART: 1024M 0x000000FF00000000 - 0x000000FF3FFFFFFF [ 76.349753] [drm] Detected VRAM RAM=2048M, BAR=256M [ 76.349764] [drm] RAM width 128bits DDR3 [ 76.349940] [drm] amdgpu: 2048M of VRAM memory ready [ 76.349953] [drm] amdgpu: 3072M of GTT memory ready. [ 76.349992] [drm] GART: num cpu pages 262144, num gpu pages 262144 [ 76.350506] amdgpu 0000:01:00.0: amdgpu: PCIE GART of 1024M enabled (table at 0x000000F400900000). [ 76.495343] [drm] Internal thermal controller with fan control [ 76.495391] [drm] amdgpu: dpm initialized [ 76.495637] [drm] AMDGPU Display Connectors [ 76.495647] [drm] Connector 0: [ 76.495655] [drm] HDMI-A-1 [ 76.495662] [drm] HPD1 [ 76.495668] [drm] DDC: 0x194c 0x194c 0x194d 0x194d 0x194e 0x194e 0x194f 0x194f [ 76.495685] [drm] Encoders: [ 76.495691] [drm] DFP1: INTERNAL_UNIPHY [ 76.495699] [drm] Connector 1: [ 76.495706] [drm] DVI-D-1 [ 76.495712] [drm] HPD2 [ 76.495718] [drm] DDC: 0x1950 0x1950 0x1951 0x1951 0x1952 0x1952 0x1953 0x1953 [ 76.495733] [drm] Encoders: [ 76.495739] [drm] DFP2: INTERNAL_UNIPHY [ 76.495746] [drm] Connector 2: [ 76.495753] [drm] VGA-1 [ 76.495758] [drm] DDC: 0x1970 0x1970 0x1971 0x1971 0x1972 0x1972 0x1973 0x1973 [ 76.495773] [drm] Encoders: [ 76.495779] [drm] CRT1: INTERNAL_KLDSCP_DAC1 [ 76.599604] [drm] Found UVD firmware Version: 64.0 Family ID: 13 [ 76.603443] [drm] PCIE gen 2 link speeds already enabled [ 77.149564] [drm] UVD initialized successfully. [ 77.149578] amdgpu 0000:01:00.0: amdgpu: SE 1, SH per SE 2, CU per SH 5, active_cu_number 8 [ 77.456492] RTL8211B Gigabit Ethernet r8169-0-300:00: attached PHY driver (mii_bus:phy_addr=r8169-0-300:00, irq=MAC) [ 77.486245] [drm] Initialized amdgpu 3.44.0 20150101 for 0000:01:00.0 on minor 0 [ 77.521555] r8169 0000:03:00.0 eth0: Link is Down [ 77.547158] fbcon: amdgpudrmfb (fb0) is primary device [ 77.591226] Console: switching to colour frame buffer device 240x67 [ 77.600296] amdgpu 0000:01:00.0: [drm] fb0: amdgpudrmfb frame bufferdevice
I can supply extra details but found no logging from the sessions that experienced the lock-up.
Regards,
Arthur Marsh.
PATCH v4 17/17 drm/amd/pm: unified lock protections in amdgpu_dpm.c
Hi Evan, even with the patch below applied and built, I was still getting no signal to the monitor upon loading of the amdgpu module and no response from the pc except when giving the magic sysreq boot key sequence.
.config has:
CONFIG_DRM_AMDGPU=mCONFIG_DRM_AMDGPU_SI=y
# CONFIG_DRM_AMDGPU_CIK is not set
# CONFIG_DRM_AMDGPU_USERPTR is not set
kernel command line has:
amdgpu.audio=1 amdgpu.si_support=1 radeon.si_support=0 page_owner=on amdgpu.gpu_recovery=1
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0 -4
@@ -80,8 +80,6 @@ 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 :
@@ -102,8 +100,6 @@ 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; }
Regards,
Arthur Marsh.
RE: [PATCH V4 17/17] drm/amd/pm: unified lock protections in amdgpu_dpm.c
[AMD Official Use Only]
Hi Arthur,
Can you try to blacklist amdgpu module first and then do manual driver loading? Hope via that you can have a chance to observe the errors reported by driver.
BR
Evan
Quoted 57 lines
-----Original Message-----
From: Arthur Marsh <[email protected]>
Sent: Thursday, March 31, 2022 12:27 PM
To: Quan, Evan <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Feng, Kenneth <[email protected]>; Lazar, Lijo <[email protected]>; [email protected]; [email protected]
Subject: [PATCH V4 17/17] drm/amd/pm: unified lock protections inamdgpu_dpm.cHi Evan, even with the patch below applied and built, I was still getting no signal to the monitor upon loading of the amdgpu module and no response from the pc except when giving the magic sysreq boot key sequence.
.config has:
CONFIG_DRM_AMDGPU=mCONFIG_DRM_AMDGPU_SI=y
#CONFIG_DRM_AMDGPU_CIKis not set
#CONFIG_DRM_AMDGPU_USERPTRis not setkernel command line has:
amdgpu.audio=1 amdgpu.si_support=1 radeon.si_support=0 page_owner=on amdgpu.gpu_recovery=1
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-0@@ -80,8 +80,6 @@ int amdgpu_dpm_set_powergating_by_smu(struct
amdgpu_device*adev,uint32_tblockdrivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-2return 0 ; } -mutex_lock (&adev->pm.mutex); -switch (block_type) {case AMD_IP_BLOCK_TYPE_UVD :case AMD_IP_BLOCK_TYPE_VCE :@@ -102,8 +100,6 @@ int amdgpu_dpm_set_powergating_by_smu(struct
amdgpu_device*adev,uint32_tblockdrivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-2if (!ret)atomic_set (&adev->pm.pwr_state[block_type], pwr_state); -mutex_unlock (&adev->pm.mutex); -return ret; }Regards,
Arthur Marsh.
PATCH v4 17/17 drm/amd/pm: unified lock protections in amdgpu_dpm.c
Hi Evan, this is what was logged (filtering for drm and amdgpu) when I blacklisted amdgpu then manually did:
modprobe amdgpu si_support=1 gpu_recovery=1
Apr 1 18:31:14 am64 kernel: [ 0.000000] Command line: BOOT_IMAGE=/vmlinuz-5.17.0+ root=UUID=39706f53-7c27-4310-b22a-36c7b042d1a1 ro amdgpu.audio=1 amdgpu.si_support=1 radeon.si_support=0 page_owner=on amdgpu.gpu_recovery=1 udev.log-priority=info rd.udev.log-priority=info Apr 1 18:31:14 am64 kernel: [ 0.059624] Kernel command line: BOOT_IMAGE=/vmlinuz-5.17.0+ root=UUID=39706f53-7c27-4310-b22a-36c7b042d1a1 ro amdgpu.audio=1 amdgpu.si_support=1 radeon.si_support=0 page_owner=on amdgpu.gpu_recovery=1 udev.log-priority=info rd.udev.log-priority=info
Apr 1 18:33:43 am64 kernel: [ 245.724485] ACPI: bus type drm_connector registered Apr 1 18:33:44 am64 kernel: [ 245.945020] [drm] amdgpu kernel modesetting enabled. Apr 1 18:33:44 am64 kernel: [ 245.945140] amdgpu 0000:01:00.0: vgaarb: deactivate vga console Apr 1 18:33:44 am64 kernel: [ 245.946413] [drm] initializing kernel modesetting (VERDE 0x1002:0x682B 0x1458:0x22CA 0x87). Apr 1 18:33:44 am64 kernel: [ 245.946423] amdgpu 0000:01:00.0: amdgpu: Trusted Memory Zone (TMZ) feature not supported Apr 1 18:33:44 am64 kernel: [ 245.946448] [drm] register mmio base: 0xFE8C0000 Apr 1 18:33:44 am64 kernel: [ 245.946451] [drm] register mmio size: 262144 Apr 1 18:33:44 am64 kernel: [ 245.946642] [drm] add ip block number 0 <si_common> Apr 1 18:33:44 am64 kernel: [ 245.946657] [drm] add ip block number 1 <gmc_v6_0> Apr 1 18:33:44 am64 kernel: [ 245.946660] [drm] add ip block number 2 <si_ih> Apr 1 18:33:44 am64 kernel: [ 245.946663] [drm] add ip block number 3 <gfx_v6_0> Apr 1 18:33:44 am64 kernel: [ 245.946666] [drm] add ip block number 4 <si_dma> Apr 1 18:33:44 am64 kernel: [ 245.946668] [drm] add ip block number 5 <si_dpm> Apr 1 18:33:44 am64 kernel: [ 245.946671] [drm] add ip block number 6 <dce_v6_0> Apr 1 18:33:44 am64 kernel: [ 245.946674] [drm] add ip block number 7 <uvd_v3_1> Apr 1 18:33:44 am64 kernel: [ 245.990113] [drm] BIOS signature incorrect 20 7 Apr 1 18:33:44 am64 kernel: [ 245.990146] amdgpu 0000:01:00.0: No more image in the PCI ROM Apr 1 18:33:44 am64 kernel: [ 245.991510] amdgpu 0000:01:00.0: amdgpu: Fetched VBIOS from ROM BAR Apr 1 18:33:44 am64 kernel: [ 245.991516] amdgpu: ATOM BIOS: xxx-xxx-xxx Apr 1 18:33:44 am64 kernel: [ 245.991539] amdgpu 0000:01:00.0: amdgpu: PCIE atomic ops is not supported Apr 1 18:33:44 am64 kernel: [ 245.991841] [drm] vm size is 64 GB, 2 levels, block size is 10-bit, fragment size is 9-bit Apr 1 18:33:44 am64 kernel: [ 246.045705] amdgpu 0000:01:00.0: amdgpu: VRAM: 2048M 0x000000F400000000 - 0x000000F47FFFFFFF (2048M used) Apr 1 18:33:44 am64 kernel: [ 246.045719] amdgpu 0000:01:00.0: amdgpu: GART: 1024M 0x000000FF00000000 - 0x000000FF3FFFFFFF Apr 1 18:33:44 am64 kernel: [ 246.045736] [drm] Detected VRAM RAM=2048M, BAR=256M Apr 1 18:33:44 am64 kernel: [ 246.045739] [drm] RAM width 128bits DDR3 Apr 1 18:33:44 am64 kernel: [ 246.045825] [drm] amdgpu: 2048M of VRAM memory ready Apr 1 18:33:44 am64 kernel: [ 246.045829] [drm] amdgpu: 3072M of GTT memory ready. Apr 1 18:33:44 am64 kernel: [ 246.045854] [drm] GART: num cpu pages 262144, num gpu pages 262144 Apr 1 18:33:44 am64 kernel: [ 246.046180] amdgpu 0000:01:00.0: amdgpu: PCIE GART of 1024M enabled (table at 0x000000F400900000). Apr 1 18:33:44 am64 kernel: [ 246.084159] [drm] Internal thermal controller with fan control Apr 1 18:33:44 am64 kernel: [ 246.084180] [drm] amdgpu: dpm initialized Apr 1 18:33:44 am64 kernel: [ 246.084264] [drm] AMDGPU Display Connectors Apr 1 18:33:44 am64 kernel: [ 246.084268] [drm] Connector 0: Apr 1 18:33:44 am64 kernel: [ 246.084270] [drm] HDMI-A-1 Apr 1 18:33:44 am64 kernel: [ 246.084272] [drm] HPD1 Apr 1 18:33:44 am64 kernel: [ 246.084274] [drm] DDC: 0x194c 0x194c 0x194d 0x194d 0x194e 0x194e 0x194f 0x194f Apr 1 18:33:44 am64 kernel: [ 246.084279] [drm] Encoders: Apr 1 18:33:44 am64 kernel: [ 246.084281] [drm] DFP1: INTERNAL_UNIPHY Apr 1 18:33:44 am64 kernel: [ 246.084283] [drm] Connector 1: Apr 1 18:33:44 am64 kernel: [ 246.084285] [drm] DVI-D-1 Apr 1 18:33:44 am64 kernel: [ 246.084287] [drm] HPD2 Apr 1 18:33:44 am64 kernel: [ 246.084289] [drm] DDC: 0x1950 0x1950 0x1951 0x1951 0x1952 0x1952 0x1953 0x1953 Apr 1 18:33:44 am64 kernel: [ 246.084293] [drm] Encoders: Apr 1 18:33:44 am64 kernel: [ 246.084295] [drm] DFP2: INTERNAL_UNIPHY Apr 1 18:33:44 am64 kernel: [ 246.084297] [drm] Connector 2: Apr 1 18:33:44 am64 kernel: [ 246.084299] [drm] VGA-1 Apr 1 18:33:44 am64 kernel: [ 246.084301] [drm] DDC: 0x1970 0x1970 0x1971 0x1971 0x1972 0x1972 0x1973 0x1973 Apr 1 18:33:44 am64 kernel: [ 246.084305] [drm] Encoders: Apr 1 18:33:44 am64 kernel: [ 246.084307] [drm] CRT1: INTERNAL_KLDSCP_DAC1 Apr 1 18:33:44 am64 kernel: [ 246.135615] [drm] Found UVD firmware Version: 64.0 Family ID: 13 Apr 1 18:33:44 am64 kernel: [ 246.137371] [drm] PCIE gen 2 link speeds already enabled Apr 1 18:33:44 am64 kernel: [ 246.674277] [drm] UVD initialized successfully. Apr 1 18:33:44 am64 kernel: [ 246.674849] amdgpu 0000:01:00.0: amdgpu: SE 1, SH per SE 2, CU per SH 5, active_cu_number 8 Apr 1 18:33:45 am64 kernel: [ 247.008964] [drm] Initialized amdgpu 3.46.0 20150101 for 0000:01:00.0 on minor 0 Apr 1 18:33:45 am64 kernel: [ 247.068412] fbcon: amdgpudrmfb (fb0) is primary device
The monitor still went blank but the magic sysreq sync and boot worked, allowing capture of the above log but nothing after the line above.
Regards,
Arthur Marsh.
Christian König
maintainerRe: [PATCH V4 17/17] drm/amd/pm: unified lock protections in amdgpu_dpm.c
Hi Arthur,
apart from blacklisting amdgpu I generally advise to SSH from another computer into the affected system if you have a problem like this.
Additionally to what Evan said I suggest that you enable CONFIG_LOCKDEP_SUPPORT in your kernel configuration. This will yield warnings in your system log in case of deadlocks or accidentally forgetting to unlock something.
Regards,
Christian.
Am 01.04.22 um 10:49 schrieb Arthur Marsh:
Quoted 70 lines
Hi Evan, this is what was logged (filtering for drm and amdgpu) when I blacklisted amdgpu then manually did:
modprobe amdgpu si_support=1 gpu_recovery=1
Apr 1 18:31:14 am64 kernel: [ 0.000000] Command line: BOOT_IMAGE=/vmlinuz-5.17.0+ root=UUID=39706f53-7c27-4310-b22a-36c7b042d1a1 ro amdgpu.audio=1 amdgpu.si_support=1 radeon.si_support=0 page_owner=on amdgpu.gpu_recovery=1 udev.log-priority=info rd.udev.log-priority=info Apr 1 18:31:14 am64 kernel: [ 0.059624] Kernel command line: BOOT_IMAGE=/vmlinuz-5.17.0+ root=UUID=39706f53-7c27-4310-b22a-36c7b042d1a1 ro amdgpu.audio=1 amdgpu.si_support=1 radeon.si_support=0 page_owner=on amdgpu.gpu_recovery=1 udev.log-priority=info rd.udev.log-priority=infoApr 1 18:33:43 am64 kernel: [ 245.724485] ACPI: bus type drm_connector registered Apr 1 18:33:44 am64 kernel: [ 245.945020] [drm] amdgpu kernel modesetting enabled. Apr 1 18:33:44 am64 kernel: [ 245.945140] amdgpu 0000:01:00.0: vgaarb: deactivate vga console Apr 1 18:33:44 am64 kernel: [ 245.946413] [drm] initializing kernel modesetting (VERDE 0x1002:0x682B 0x1458:0x22CA 0x87). Apr 1 18:33:44 am64 kernel: [ 245.946423] amdgpu 0000:01:00.0: amdgpu: Trusted Memory Zone (TMZ) feature not supported Apr 1 18:33:44 am64 kernel: [ 245.946448] [drm] register mmio base: 0xFE8C0000 Apr 1 18:33:44 am64 kernel: [ 245.946451] [drm] register mmio size: 262144 Apr 1 18:33:44 am64 kernel: [ 245.946642] [drm] add ip block number 0 <si_common> Apr 1 18:33:44 am64 kernel: [ 245.946657] [drm] add ip block number 1 <gmc_v6_0> Apr 1 18:33:44 am64 kernel: [ 245.946660] [drm] add ip block number 2 <si_ih> Apr 1 18:33:44 am64 kernel: [ 245.946663] [drm] add ip block number 3 <gfx_v6_0> Apr 1 18:33:44 am64 kernel: [ 245.946666] [drm] add ip block number 4 <si_dma> Apr 1 18:33:44 am64 kernel: [ 245.946668] [drm] add ip block number 5 <si_dpm> Apr 1 18:33:44 am64 kernel: [ 245.946671] [drm] add ip block number 6 <dce_v6_0> Apr 1 18:33:44 am64 kernel: [ 245.946674] [drm] add ip block number 7 <uvd_v3_1> Apr 1 18:33:44 am64 kernel: [ 245.990113] [drm] BIOS signature incorrect 20 7 Apr 1 18:33:44 am64 kernel: [ 245.990146] amdgpu 0000:01:00.0: No more image in the PCI ROM Apr 1 18:33:44 am64 kernel: [ 245.991510] amdgpu 0000:01:00.0: amdgpu: Fetched VBIOS from ROM BAR Apr 1 18:33:44 am64 kernel: [ 245.991516] amdgpu: ATOM BIOS: xxx-xxx-xxx Apr 1 18:33:44 am64 kernel: [ 245.991539] amdgpu 0000:01:00.0: amdgpu: PCIE atomic ops is not supported Apr 1 18:33:44 am64 kernel: [ 245.991841] [drm] vm size is 64 GB, 2 levels, block size is 10-bit, fragment size is 9-bit Apr 1 18:33:44 am64 kernel: [ 246.045705] amdgpu 0000:01:00.0: amdgpu: VRAM: 2048M 0x000000F400000000 - 0x000000F47FFFFFFF (2048M used) Apr 1 18:33:44 am64 kernel: [ 246.045719] amdgpu 0000:01:00.0: amdgpu: GART: 1024M 0x000000FF00000000 - 0x000000FF3FFFFFFF Apr 1 18:33:44 am64 kernel: [ 246.045736] [drm] Detected VRAM RAM=2048M, BAR=256M Apr 1 18:33:44 am64 kernel: [ 246.045739] [drm] RAM width 128bits DDR3 Apr 1 18:33:44 am64 kernel: [ 246.045825] [drm] amdgpu: 2048M of VRAM memory ready Apr 1 18:33:44 am64 kernel: [ 246.045829] [drm] amdgpu: 3072M of GTT memory ready. Apr 1 18:33:44 am64 kernel: [ 246.045854] [drm] GART: num cpu pages 262144, num gpu pages 262144 Apr 1 18:33:44 am64 kernel: [ 246.046180] amdgpu 0000:01:00.0: amdgpu: PCIE GART of 1024M enabled (table at 0x000000F400900000). Apr 1 18:33:44 am64 kernel: [ 246.084159] [drm] Internal thermal controller with fan control Apr 1 18:33:44 am64 kernel: [ 246.084180] [drm] amdgpu: dpm initialized Apr 1 18:33:44 am64 kernel: [ 246.084264] [drm] AMDGPU Display Connectors Apr 1 18:33:44 am64 kernel: [ 246.084268] [drm] Connector 0: Apr 1 18:33:44 am64 kernel: [ 246.084270] [drm] HDMI-A-1 Apr 1 18:33:44 am64 kernel: [ 246.084272] [drm] HPD1 Apr 1 18:33:44 am64 kernel: [ 246.084274] [drm] DDC: 0x194c 0x194c 0x194d 0x194d 0x194e 0x194e 0x194f 0x194f Apr 1 18:33:44 am64 kernel: [ 246.084279] [drm] Encoders: Apr 1 18:33:44 am64 kernel: [ 246.084281] [drm] DFP1: INTERNAL_UNIPHY Apr 1 18:33:44 am64 kernel: [ 246.084283] [drm] Connector 1: Apr 1 18:33:44 am64 kernel: [ 246.084285] [drm] DVI-D-1 Apr 1 18:33:44 am64 kernel: [ 246.084287] [drm] HPD2 Apr 1 18:33:44 am64 kernel: [ 246.084289] [drm] DDC: 0x1950 0x1950 0x1951 0x1951 0x1952 0x1952 0x1953 0x1953 Apr 1 18:33:44 am64 kernel: [ 246.084293] [drm] Encoders: Apr 1 18:33:44 am64 kernel: [ 246.084295] [drm] DFP2: INTERNAL_UNIPHY Apr 1 18:33:44 am64 kernel: [ 246.084297] [drm] Connector 2: Apr 1 18:33:44 am64 kernel: [ 246.084299] [drm] VGA-1 Apr 1 18:33:44 am64 kernel: [ 246.084301] [drm] DDC: 0x1970 0x1970 0x1971 0x1971 0x1972 0x1972 0x1973 0x1973 Apr 1 18:33:44 am64 kernel: [ 246.084305] [drm] Encoders: Apr 1 18:33:44 am64 kernel: [ 246.084307] [drm] CRT1: INTERNAL_KLDSCP_DAC1 Apr 1 18:33:44 am64 kernel: [ 246.135615] [drm] Found UVD firmware Version: 64.0 Family ID: 13 Apr 1 18:33:44 am64 kernel: [ 246.137371] [drm] PCIE gen 2 link speeds already enabled Apr 1 18:33:44 am64 kernel: [ 246.674277] [drm] UVD initialized successfully. Apr 1 18:33:44 am64 kernel: [ 246.674849] amdgpu 0000:01:00.0: amdgpu: SE 1, SH per SE 2, CU per SH 5, active_cu_number 8 Apr 1 18:33:45 am64 kernel: [ 247.008964] [drm] Initialized amdgpu 3.46.0 20150101 for 0000:01:00.0 on minor 0 Apr 1 18:33:45 am64 kernel: [ 247.068412] fbcon: amdgpudrmfb (fb0) is primary deviceThe monitor still went blank but the magic sysreq sync and boot worked, allowing capture of the above log but nothing after the line above.
Regards,
Arthur Marsh.
RE: [PATCH V4 17/17] drm/amd/pm: unified lock protections in amdgpu_dpm.c
[AMD Official Use Only]
Yes, as Christian mentioned, enabling CONFIG_LOCKDEP_SUPPORT will help debugging such deadlock issue. Meanwhile, can you give the following change(drop the lock protections in amdgpu_dpm_compute_clocks) a try?
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0 -2
@@ -423,9 +423,7 @@ 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)
BR
Evan
Quoted 127 lines
-----Original Message-----
From: Koenig, Christian <[email protected]>
Sent: Friday, April 1, 2022 4:56 PM
To: Arthur Marsh <[email protected]>; Quan, Evan <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Feng, Kenneth <[email protected]>; Lazar, Lijo <[email protected]>; amd- [email protected]
Subject: Re: [PATCH V4 17/17] drm/amd/pm: unified lock protections inamdgpu_dpm.cHi Arthur,
apart from blacklisting amdgpu I generally advise to SSH from another computer into the affected system if you have a problem like this.
Additionally to what Evan said I suggest that you enable
CONFIG_LOCKDEP_SUPPORTin your kernel configuration. This will yield warnings in your system log in case of deadlocks or accidentally forgetting to unlock something.Regards,
Christian.Am 01.04.22 um 10:49 schrieb Arthur Marsh:
Quoted 6 lines
Hi Evan, this is what was logged (filtering for drm and amdgpu) when I blacklisted amdgpu then manually did:
modprobe amdgpu si_support=1 gpu_recovery=1
Apr 1 18:31:14 am64 kernel: [ 0.000000] Command line:BOOT_IMAGE=/vmlinuz-5.17.0+ root=UUID=39706f53-7c27-4310-b22a-
36c7b042d1a1ro amdgpu.audio=1 amdgpu.si_support=1 radeon.si_support=0 page_owner=on amdgpu.gpu_recovery=1 udev.log- priority=info rd.udev.log-priority=infoQuoted 1 line
Apr 1 18:31:14 am64 kernel: [ 0.059624] Kernel command line:BOOT_IMAGE=/vmlinuz-5.17.0+ root=UUID=39706f53-7c27-4310-b22a-
36c7b042d1a1ro amdgpu.audio=1 amdgpu.si_support=1 radeon.si_support=0 page_owner=on amdgpu.gpu_recovery=1 udev.log- priority=info rd.udev.log-priority=infoQuoted 3 lines
Apr 1 18:33:43 am64 kernel: [ 245.724485] ACPI: bus type
drm_connectorregistered Apr 1 18:33:44 am64 kernel: [ 245.945020] [drm]amdgpu kernel modesetting enabled.
Quoted 2 lines
Apr 1 18:33:44 am64 kernel: [ 245.945140] amdgpu 0000:01:00.0:vgaarb: deactivate vga console Apr 1 18:33:44 am64 kernel: [ 245.946413]
[drm] initializing kernel modesetting (VERDE 0x1002:0x682B 0x1458:0x22CA
0x87).Quoted 18 lines
Apr 1 18:33:44 am64 kernel: [ 245.946423] amdgpu 0000:01:00.0:amdgpu: Trusted Memory Zone (TMZ) feature not supported Apr 1 18:33:44 am64 kernel: [ 245.946448] [drm] register mmio base:
0xFE8C0000Apr 1 18:33:44 am64 kernel: [ 245.946451] [drm] register mmio size: 262144 Apr 1 18:33:44 am64 kernel: [ 245.946642] [drm] add ip block number 0 <si_common> Apr 1 18:33:44 am64 kernel: [ 245.946657] [drm] add ip block number 1 <gmc_v6_0> Apr 1 18:33:44 am64 kernel: [ 245.946660] [drm] add ip block number 2 <si_ih> Apr 1 18:33:44 am64 kernel: [ 245.946663] [drm] add ip block number 3 <gfx_v6_0> Apr 1 18:33:44 am64 kernel: [ 245.946666] [drm] add ip block number 4 <si_dma> Apr 1 18:33:44 am64 kernel: [ 245.946668] [drm] add ip block number 5 <si_dpm> Apr 1 18:33:44 am64 kernel: [ 245.946671] [drm] add ip block number 6 <dce_v6_0> Apr 1 18:33:44 am64 kernel: [ 245.946674] [drm] add ip block number 7 <uvd_v3_1> Apr 1 18:33:44 am64 kernel: [ 245.990113] [drm] BIOS signature incorrect 20 7 Apr 1 18:33:44 am64 kernel: [ 245.990146] amdgpu 0000:01:00.0:
No more image in the PCI ROM Apr 1 18:33:44 am64 kernel: [ 245.991510] amdgpu 0000:01:00.0: amdgpu: Fetched VBIOS from ROM BARQuoted 5 lines
Apr 1 18:33:44 am64 kernel: [ 245.991516] amdgpu: ATOM BIOS:xxx-xxx-xxx Apr 1 18:33:44 am64 kernel: [ 245.991539] amdgpu 0000:01:00.0: amdgpu: PCIE atomic ops is not supported Apr 1 18:33:44 am64 kernel: [ 245.991841] [drm] vm size is 64 GB, 2 levels, block size is 10-bit, fragment size is 9-bit Apr 1 18:33:44 am64 kernel:
[ 246.045705] amdgpu 0000:01:00.0: amdgpu: VRAM: 2048M 0x000000F400000000 - 0x000000F47FFFFFFF (2048M used) Apr 1 18:33:44 am64 kernel: [ 246.045719] amdgpu 0000:01:00.0: amdgpu: GART: 1024M 0x000000FF00000000 - 0x000000FF3FFFFFFF Apr 1 18:33:44 am64 kernel: [ 246.045736] [drm] Detected VRAM RAM=2048M, BAR=256M Apr 1 18:33:44 am64 kernel: [ 246.045739] [drm] RAM width 128bits DDR3 Apr 1 18:33:44 am64 kernel: [ 246.045825] [drm] amdgpu: 2048M of VRAM memory ready Apr 1 18:33:44 am64 kernel: [ 246.045829] [drm] amdgpu: 3072M of GTTmemory ready.
Quoted 2 lines
Apr 1 18:33:44 am64 kernel: [ 246.045854] [drm] GART: num cpu pages262144, num gpu pages 262144 Apr 1 18:33:44 am64 kernel: [ 246.046180]
amdgpu 0000:01:00.0: amdgpu: PCIE GART of 1024M enabled (table at
0x000000F400900000).Quoted 4 lines
Apr 1 18:33:44 am64 kernel: [ 246.084159] [drm] Internal thermal controller with fan control Apr 1 18:33:44 am64 kernel: [ 246.084180] [drm] amdgpu: dpm initialized Apr 1 18:33:44 am64 kernel: [ 246.084264] [drm] AMDGPU Display Connectors Apr 1 18:33:44 am64kernel: [ 246.084268] [drm] Connector 0:
Quoted 3 lines
Apr 1 18:33:44 am64 kernel: [ 246.084270] [drm] HDMI-A-1 Apr 1 18:33:44 am64 kernel: [ 246.084272] [drm] HPD1 Apr 1 18:33:44 am64 kernel: [ 246.084274] [drm] DDC: 0x194c 0x194c
0x194d0x194d0x194e0x194e0x194f0x194fQuoted 2 lines
Apr 1 18:33:44 am64 kernel: [ 246.084279] [drm] Encoders: Apr 1 18:33:44 am64 kernel: [ 246.084281] [drm] DFP1:
INTERNAL_UNIPHYQuoted 4 lines
Apr 1 18:33:44 am64 kernel: [ 246.084283] [drm] Connector 1: Apr 1 18:33:44 am64 kernel: [ 246.084285] [drm] DVI-D-1 Apr 1 18:33:44 am64 kernel: [ 246.084287] [drm] HPD2 Apr 1 18:33:44 am64 kernel: [ 246.084289] [drm] DDC: 0x1950 0x1950
0x19510x19510x19520x19520x19530x1953Quoted 2 lines
Apr 1 18:33:44 am64 kernel: [ 246.084293] [drm] Encoders: Apr 1 18:33:44 am64 kernel: [ 246.084295] [drm] DFP2:
INTERNAL_UNIPHYQuoted 3 lines
Apr 1 18:33:44 am64 kernel: [ 246.084297] [drm] Connector 2: Apr 1 18:33:44 am64 kernel: [ 246.084299] [drm] VGA-1 Apr 1 18:33:44 am64 kernel: [ 246.084301] [drm] DDC: 0x1970 0x1970
0x19710x19710x19720x19720x19730x1973Quoted 2 lines
Apr 1 18:33:44 am64 kernel: [ 246.084305] [drm] Encoders: Apr 1 18:33:44 am64 kernel: [ 246.084307] [drm] CRT1:
INTERNAL_KLDSCP_DAC1Quoted 3 lines
Apr 1 18:33:44 am64 kernel: [ 246.135615] [drm] Found UVD firmwareVersion: 64.0 Family ID: 13 Apr 1 18:33:44 am64 kernel: [ 246.137371] [drm] PCIE gen 2 link speeds already enabled Apr 1 18:33:44
am64 kernel: [ 246.674277] [drm] UVD initialized successfully.
Quoted 12 lines
Apr 1 18:33:44 am64 kernel: [ 246.674849] amdgpu 0000:01:00.0:amdgpu: SE 1, SH per SE 2, CU per SH 5,
active_cu_number8 Apr 1 18:33:45 am64 kernel: [ 247.008964] [drm] Initialized amdgpu 3.46.0 20150101 for 0000:01:00.0 on minor 0 Apr 1 18:33:45 am64 kernel: [ 247.068412] fbcon: amdgpudrmfb (fb0) is primary deviceThe monitor still went blank but the magic sysreq sync and boot worked, allowing capture of the above log but nothing after the line above.
Regards,
Arthur Marsh.
PATCH v4 17/17 drm/amd/pm: unified lock protections in amdgpu_dpm.c
Hi, short answer is that with both patches applied, I am successfully running the amdgpu kernel module on radeonsi (plasma desktop on X.org).
I confirmed that CONFIG_LOCKDEP_SUPPORT=y is enabled in the kernel.
With the first patch applied and remotely connecting to the machine and loading amdgpu via:
modprobe amdgpu si_support=1 gpu_recovery=1
the last lines of dmesg were:
[ 264.095969] [drm] Found UVD firmware Version: 64.0 Family ID: 13 [ 264.097779] [drm] PCIE gen 2 link speeds already enabled [ 264.648137] [drm] UVD initialized successfully. [ 264.648696] amdgpu 0000:01:00.0: amdgpu: SE 1, SH per SE 2, CU per SH 5, active_cu_number 8 [ 264.984814] [drm] Initialized amdgpu 3.46.0 20150101 for 0000:01:00.0 on minor 0 [ 265.040280] fbcon: amdgpudrmfb (fb0) is primary device
After applying the second patch and building and restarting with the new kernel, I could load amdgpu successfuly and start
the plasma desktop under X.org, with the last amdgpu load lines being:
[ 227.736281] fbcon: amdgpudrmfb (fb0) is primary device [ 227.760719] Console: switching to colour frame buffer device 240x67 [ 227.765024] amdgpu 0000:01:00.0: [drm] fb0: amdgpudrmfb frame buffer device
I tried building a kernel with just the second patch and that experienced a lockup after apparently loading amdgpu alright.
First and second patches combined:
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0 -6
@@ -80,8 +80,6 @@ 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 :
@@ -102,8 +100,6 @@ 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; }
@@ -423,9 +419,7 @@ 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)
Thanks for the assistance!
Arthur.
RE: [PATCH V4 17/17] drm/amd/pm: unified lock protections in amdgpu_dpm.c
[AMD Official Use Only]
Thanks for the confirming. I probably know the root cause. Let me prepare an official patch for you.
BR
Evan
Quoted 86 lines
-----Original Message-----
From: Arthur Marsh <[email protected]>
Sent: Friday, April 1, 2022 8:19 PM
To: Quan, Evan <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Feng, Kenneth <[email protected]>; Lazar, Lijo <[email protected]>; [email protected]; [email protected]
Subject: [PATCH V4 17/17] drm/amd/pm: unified lock protections inamdgpu_dpm.cHi, short answer is that with both patches applied, I am successfully running the amdgpu kernel module on radeonsi (plasma desktop on X.org).
I confirmed that
CONFIG_LOCKDEP_SUPPORT=yis enabled in the kernel.With the first patch applied and remotely connecting to the machine and loading amdgpu via:
modprobe amdgpu si_support=1 gpu_recovery=1
the last lines of dmesg were:
[ 264.095969] [drm] Found UVD firmware Version: 64.0 Family ID: 13 [ 264.097779] [drm] PCIE gen 2 link speeds already enabled [ 264.648137] [drm] UVD initialized successfully. [ 264.648696] amdgpu 0000:01:00.0: amdgpu: SE 1, SH per SE 2, CU per SH 5, active_cu_number 8 [ 264.984814] [drm] Initialized amdgpu 3.46.0 20150101 for 0000:01:00.0 on minor 0 [ 265.040280] fbcon: amdgpudrmfb (fb0) is primary deviceAfter applying the second patch and building and restarting with the new kernel, I could load amdgpu successfuly and start
the plasma desktop under X.org, with the last amdgpu load lines being:[ 227.736281] fbcon: amdgpudrmfb (fb0) is primary device [ 227.760719] Console: switching to colour frame buffer device 240x67 [ 227.765024] amdgpu 0000:01:00.0: [drm] fb0: amdgpudrmfb frame bufferdevice
I tried building a kernel with just the second patch and that experienced a lockup after apparently loading amdgpu alright.
First and second patches combined:
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-0@@ -80,8 +80,6 @@ int amdgpu_dpm_set_powergating_by_smu(struct
amdgpu_device*adev,uint32_tblockdrivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-2return 0 ; } -mutex_lock (&adev->pm.mutex); -switch (block_type) {case AMD_IP_BLOCK_TYPE_UVD :case AMD_IP_BLOCK_TYPE_VCE :@@ -102,8 +100,6 @@ int amdgpu_dpm_set_powergating_by_smu(struct
amdgpu_device*adev,uint32_tblockdrivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-4if (!ret)atomic_set (&adev->pm.pwr_state[block_type], pwr_state); -mutex_unlock (&adev->pm.mutex); -return ret; }@@ -423,9 +419,7 @@ 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)Thanks for the assistance!
Arthur.
RE: [PATCH V4 17/17] drm/amd/pm: unified lock protections in amdgpu_dpm.c
[AMD Official Use Only]
Hi Arthur,
Please give the attached patch a try and let me know the result.
Thanks,
Evan
Quoted 93 lines
-----Original Message-----
From: Quan, Evan
Sent: Saturday, April 2, 2022 9:32 AM
To: 'Arthur Marsh' <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Feng, Kenneth <[email protected]>; Lazar, Lijo <[email protected]>; [email protected]
Subject: RE: [PATCH V4 17/17] drm/amd/pm: unified lock protections inamdgpu_dpm.c[AMD Official Use Only]
Thanks for the confirming. I probably know the root cause. Let me prepare an official patch for you.
BR
EvanQuoted 5 lines
-----Original Message-----
From: Arthur Marsh <[email protected]>
Sent: Friday, April 1, 2022 8:19 PM
To: Quan, Evan <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Koenig,Christian
Quoted 70 lines
<[email protected]>; Feng, Kenneth <[email protected]>; Lazar, Lijo <[email protected]>; [email protected]; [email protected]
Subject: [PATCH V4 17/17] drm/amd/pm: unified lock protections inamdgpu_dpm.cHi, short answer is that with both patches applied, I am successfully running the amdgpu kernel module on radeonsi (plasma desktop on X.org).
I confirmed that
CONFIG_LOCKDEP_SUPPORT=yis enabled in the kernel.With the first patch applied and remotely connecting to the machine and loading amdgpu via:
modprobe amdgpu si_support=1 gpu_recovery=1
the last lines of dmesg were:
[ 264.095969] [drm] Found UVD firmware Version: 64.0 Family ID: 13 [ 264.097779] [drm] PCIE gen 2 link speeds already enabled [ 264.648137] [drm] UVD initialized successfully. [ 264.648696] amdgpu 0000:01:00.0: amdgpu: SE 1, SH per SE 2, CU perSH 5,
active_cu_number8 [ 264.984814] [drm] Initialized amdgpu 3.46.0 20150101 for 0000:01:00.0 on minor 0 [ 265.040280] fbcon:
amdgpudrmfb (fb0) is primary deviceAfter applying the second patch and building and restarting with the new kernel, I could load amdgpu successfuly and start the plasma desktop under X.org, with the last amdgpu load lines being:
[ 227.736281] fbcon: amdgpudrmfb (fb0) is primary device [227.760719] Console: switching to colour frame buffer device 240x67 [ 227.765024] amdgpu 0000:01:00.0: [drm] fb0: amdgpudrmfb frame buffer device
I tried building a kernel with just the second patch and that experienced a lockup after apparently loading amdgpu alright.
First and second patches combined:
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-0@@ -80,8 +80,6 @@ int amdgpu_dpm_set_powergating_by_smu(struct
amdgpu_device*adev,uint32_tblockdrivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-2return 0 ; } -mutex_lock (&adev->pm.mutex); -switch (block_type) {case AMD_IP_BLOCK_TYPE_UVD :case AMD_IP_BLOCK_TYPE_VCE :@@ -102,8 +100,6 @@ int amdgpu_dpm_set_powergating_by_smu(struct
amdgpu_device*adev,uint32_tblockdrivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-2if (!ret)atomic_set (&adev->pm.pwr_state[block_type], pwr_state); -mutex_unlock (&adev->pm.mutex); -return ret; }@@ -423,9 +419,7 @@ void amdgpu_dpm_compute_clocks(struct amdgpu_device *adev)if (!pp_funcs->pm_compute_clocks)return ;
Quoted 11 lines
Quoted 6 lines
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-2-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, boolenable)
Quoted 4 lines
Thanks for the assistance!
Arthur.
From 2a74c59bee7ba4adb2314193769c6fb2b0ecb8ba Mon Sep 17 00:00:00 2001
From: Evan Quan <[email protected]>
Date: Fri, 8 Apr 2022 19:51:34 +0800
Subject: [PATCH] drm/amd/pm: fix the deadlock issue observed on SI
By placing those unrelated code outside of adev->pm.mutex protections or restructuring the call flow, we can eliminate the deadlock issue. This comes with no real logics change.
--- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 39 +++++++++++++++++++ .../gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 10 ----- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 35 ----------------- .../gpu/drm/amd/pm/powerplay/amd_powerplay.c | 10 ----- 4 files changed, 39 insertions(+), 55 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +39 -0
@@ -427,6 +427,7 @@ int amdgpu_dpm_read_sensor(struct amdgpu_device *adev, enum amd_pp_sensors sensovoid amdgpu_dpm_compute_clocks (struct amdgpu_device *adev) {const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +int i;if (!adev->pm.dpm_enabled)return ;
@@ -434,6 +435,15 @@ void amdgpu_dpm_compute_clocks(struct amdgpu_device *adev)if (!pp_funcs->pm_compute_clocks)return ; +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); + } +mutex_lock (&adev->pm.mutex); pp_funcs->pm_compute_clocks (adev->powerplay.pp_handle);mutex_unlock (&adev->pm.mutex);
@@ -443,6 +453,20 @@ void amdgpu_dpm_enable_uvd(struct amdgpu_device *adev, bool enable) {int ret =0 ; +if (adev->family ==AMDGPU_FAMILY_SI ) { +mutex_lock (&adev->pm.mutex); +if (enable) { + adev->pm.dpm.uvd_active = true; + adev->pm.dpm.state =POWER_STATE_TYPE_INTERNAL_UVD ; + }else { + adev->pm.dpm.uvd_active = false; + } +mutex_unlock (&adev->pm.mutex); + +amdgpu_dpm_compute_clocks (adev); +return ; + } + ret =amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_UVD , !enable);if (ret) DRM_ERROR("Dpm %s uvd failed, ret = %d. \n",
@@ -453,6 +477,21 @@ void amdgpu_dpm_enable_vce(struct amdgpu_device *adev, bool enable) {int ret =0 ; +if (adev->family ==AMDGPU_FAMILY_SI ) { +mutex_lock (&adev->pm.mutex); +if (enable) { + adev->pm.dpm.vce_active = true; +/* XXX select vce level based on ring/task */ + adev->pm.dpm.vce_level =AMD_VCE_LEVEL_AC_ALL ; + }else { + adev->pm.dpm.vce_active = false; + } +mutex_unlock (&adev->pm.mutex); + +amdgpu_dpm_compute_clocks (adev); +return ; + } + ret =amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_VCE , !enable);if (ret) DRM_ERROR("Dpm %s vce failed, ret = %d. \n",
drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c +0 -10
@@ -1028,16 +1028,6 @@ static int amdgpu_dpm_change_power_state_locked(struct amdgpu_device *adev)void amdgpu_legacy_dpm_compute_clocks (void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -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); - }amdgpu_dpm_get_active_displays (adev);
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +0 -35
@@ -3892,40 +3892,6 @@ static int si_set_boot_state(struct amdgpu_device *adev) }#endif -static int si_set_powergating_by_smu (void *handle, -uint32_t block_type, -bool gate) -{ -struct amdgpu_device *adev = (struct amdgpu_device *)handle; - -switch (block_type) { -case AMD_IP_BLOCK_TYPE_UVD : -if (!gate) { - adev->pm.dpm.uvd_active = true; - adev->pm.dpm.state =POWER_STATE_TYPE_INTERNAL_UVD ; - }else { - adev->pm.dpm.uvd_active = false; - } - -amdgpu_legacy_dpm_compute_clocks (handle); -break ; -case AMD_IP_BLOCK_TYPE_VCE : -if (!gate) { - adev->pm.dpm.vce_active = true; -/* XXX select vce level based on ring/task */ - adev->pm.dpm.vce_level =AMD_VCE_LEVEL_AC_ALL ; - }else { - adev->pm.dpm.vce_active = false; - } - -amdgpu_legacy_dpm_compute_clocks (handle); -break ; -default : -break ; - } -return 0 ; -} -static int si_set_sw_state (struct amdgpu_device *adev) { return (amdgpu_si_send_msg_to_smc(adev, PPSMC_MSG_SwitchToSwState) == PPSMC_Result_OK) ?
@@ -8125,7 +8091,6 @@ static const struct amd_pm_funcs si_dpm_funcs = { .print_power_state = &si_dpm_print_power_state, .debugfs_print_current_performance_level = &si_dpm_debugfs_print_current_performance_level, .force_performance_level = &si_dpm_force_performance_level, - .set_powergating_by_smu = &si_set_powergating_by_smu, .vblank_too_short = &si_dpm_vblank_too_short, .set_fan_control_mode = &si_dpm_set_fan_control_mode, .get_fan_control_mode = &si_dpm_get_fan_control_mode,
drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c +0 -10
@@ -1503,16 +1503,6 @@ 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);
Signature · 1 line
2.29.0
RE: [PATCH V4 17/17] drm/amd/pm: unified lock protections in amdgpu_dpm.c
Thanks Evan, your patch applied to Linus' origin/master source worked for me running amdgpu module with a Radeon SI (Cape Verde) GPU card.
Regards,
Arthur Marsh.
Quoted 112 lines · Evan
[AMD Official Use Only]
Hi Arthur,
Please give the attached patch a try and let me know the result.
Thanks,
EvanQuoted 104 lines
-----Original Message-----
From: Quan, Evan
Sent: Saturday, April 2, 2022 9:32 AM
To: 'Arthur Marsh' <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Feng, Kenneth <[email protected]>; Lazar, Lijo <[email protected]>; [email protected]
Subject: RE: [PATCH V4 17/17] drm/amd/pm: unified lock protections inamdgpu_dpm.c[AMD Official Use Only]
Thanks for the confirming. I probably know the root cause. Let me prepare an official patch for you.
BR
EvanQuoted 5 lines
-----Original Message-----
From: Arthur Marsh <[email protected]>
Sent: Friday, April 1, 2022 8:19 PM
To: Quan, Evan <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Koenig,Christian
Quoted 75 lines
<[email protected]>; Feng, Kenneth <[email protected]>; Lazar, Lijo <[email protected]>; [email protected]; [email protected]
Subject: [PATCH V4 17/17] drm/amd/pm: unified lock protections inamdgpu_dpm.cHi, short answer is that with both patches applied, I am successfully running the amdgpu kernel module on radeonsi (plasma desktop on X.org).
I confirmed that
CONFIG_LOCKDEP_SUPPORT=yis enabled in the kernel.With the first patch applied and remotely connecting to the machine and loading amdgpu via:
modprobe amdgpu si_support=1 gpu_recovery=1
the last lines of dmesg were:
[ 264.095969] [drm] Found UVD firmware Version: 64.0 Family ID: 13 [ 264.097779] [drm] PCIE gen 2 link speeds already enabled [ 264.648137] [drm] UVD initialized successfully. [ 264.648696] amdgpu 0000:01:00.0: amdgpu: SE 1, SH per SE 2, CU perSH 5,
active_cu_number8 [ 264.984814] [drm] Initialized amdgpu 3.46.0 20150101 for 0000:01:00.0 on minor 0 [ 265.040280] fbcon:
amdgpudrmfb (fb0) is primary deviceAfter applying the second patch and building and restarting with the new kernel, I could load amdgpu successfuly and start the plasma desktop under X.org, with the last amdgpu load lines being:
[ 227.736281] fbcon: amdgpudrmfb (fb0) is primary device [227.760719] Console: switching to colour frame buffer device 240x67 [ 227.765024] amdgpu 0000:01:00.0: [drm] fb0: amdgpudrmfb frame buffer device
I tried building a kernel with just the second patch and that experienced a lockup after apparently loading amdgpu alright.
First and second patches combined:
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-0@@ -80,8 +80,6 @@ int amdgpu_dpm_set_powergating_by_smu(struct
amdgpu_device*adev,uint32_tblockdrivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-2return 0 ; } -mutex_lock (&adev->pm.mutex); -switch (block_type) {case AMD_IP_BLOCK_TYPE_UVD :case AMD_IP_BLOCK_TYPE_VCE :@@ -102,8 +100,6 @@ int amdgpu_dpm_set_powergating_by_smu(struct
amdgpu_device*adev,uint32_tblockdrivers/gpu/drm/amd/pm/amdgpu_dpm.c +0
-4if (!ret)atomic_set (&adev->pm.pwr_state[block_type], pwr_state); -mutex_unlock (&adev->pm.mutex); -return ret; }@@ -423,9 +419,7 @@ 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); }Quoted 1 line
void amdgpu_dpm_enable_uvd(struct
amdgpu_device*adev, boolenable)
Quoted 4 lines
Thanks for the assistance!
Arthur.
Signature · 1 line
Sent from my Android device with K-9 Mail. Please excuse my brevity.
Regression: No signal when loading amdgpu, and system lockup (was: [PATCH V4 17/17] drm/amd/pm: unified lock protections in amdgpu_dpm.c)
In reply to Arthur Marsh#regzbot introduced: 3712e7a494596b26861f4dc9b81676d1d0272eaf #regzbot title: No signal when loading amdgpu, and system lockup #regzbot monitor: https://gitlab.freedesktop.org/drm/amd/-/issues/1957
Dear Arthur,
Thank you for your message. Too bad you didn’t update the subject, and didn’t include [email protected] and notify regzbot [1] about it. (It’s understandable, as you might be unfamiliar with the processes, but I would have expected at least Even to do.) So I also spent quite some time on bisecting, but reached the same conclusion.
Am 31.03.22 um 04:28 schrieb Arthur Marsh:
Quoted 76 lines
Hi, I have a Cape Verde GPU card in my pc and after git bisecting a situation where, at the time of the amdgpu module, the monitor would lose signal and the pc locked up so that it only responded to a magic sysreq boot (with no logging due to it happening before the root filesystem was writeable), the above commit was identified as the culprit.
The GPU card is a Gigabyte R7 250 with pci-id 1002:682b (rev 87).
With the 5.17.0 kernel and a kernel command line of:
amdgpu.audio=1 amdgpu.si_support=1
the following dmesg output was received:
[ 76.118991] [drm] amdgpu kernel modesetting enabled. [ 76.119100] amdgpu 0000:01:00.0: vgaarb: deactivate vga console [ 76.120004] Console: switching to colour dummy device 80x25 [ 76.120203] [drm] initializing kernel modesetting (VERDE 0x1002:0x682B 0x1458:0x22CA 0x87). [ 76.120211] amdgpu 0000:01:00.0: amdgpu: Trusted Memory Zone (TMZ) feature not supported [ 76.120235] [drm] register mmio base: 0xFE8C0000 [ 76.120238] [drm] register mmio size: 262144 [ 76.120245] [drm] add ip block number 0 <si_common> [ 76.120248] [drm] add ip block number 1 <gmc_v6_0> [ 76.120251] [drm] add ip block number 2 <si_ih> [ 76.120253] [drm] add ip block number 3 <gfx_v6_0> [ 76.120256] [drm] add ip block number 4 <si_dma> [ 76.120258] [drm] add ip block number 5 <si_dpm> [ 76.120261] [drm] add ip block number 6 <dce_v6_0> [ 76.120264] [drm] add ip block number 7 <uvd_v3_1> [ 76.163659] [drm] BIOS signature incorrect 5b 7 [ 76.163669] resource sanity check: requesting [mem 0x000c0000-0x000dffff], which spans more than PCI Bus 0000:00 [mem 0x000d0000-0x000dffff window] [ 76.163677] caller pci_map_rom+0x68/0x1b0 mapping multiple BARs [ 76.163691] amdgpu 0000:01:00.0: No more image in the PCI ROM [ 76.164996] amdgpu 0000:01:00.0: amdgpu: Fetched VBIOS from ROM BAR [ 76.165001] amdgpu: ATOM BIOS: xxx-xxx-xxx [ 76.165018] amdgpu 0000:01:00.0: amdgpu: PCIE atomic ops is not supported [ 76.165270] [drm] vm size is 64 GB, 2 levels, block size is 10-bit, fragment size is 9-bit [ 76.349679] amdgpu 0000:01:00.0: amdgpu: VRAM: 2048M 0x000000F400000000 - 0x000000F47FFFFFFF (2048M used) [ 76.349716] amdgpu 0000:01:00.0: amdgpu: GART: 1024M 0x000000FF00000000 - 0x000000FF3FFFFFFF [ 76.349753] [drm] Detected VRAM RAM=2048M, BAR=256M [ 76.349764] [drm] RAM width 128bits DDR3 [ 76.349940] [drm] amdgpu: 2048M of VRAM memory ready [ 76.349953] [drm] amdgpu: 3072M of GTT memory ready. [ 76.349992] [drm] GART: num cpu pages 262144, num gpu pages 262144 [ 76.350506] amdgpu 0000:01:00.0: amdgpu: PCIE GART of 1024M enabled (table at 0x000000F400900000). [ 76.495343] [drm] Internal thermal controller with fan control [ 76.495391] [drm] amdgpu: dpm initialized [ 76.495637] [drm] AMDGPU Display Connectors [ 76.495647] [drm] Connector 0: [ 76.495655] [drm] HDMI-A-1 [ 76.495662] [drm] HPD1 [ 76.495668] [drm] DDC: 0x194c 0x194c 0x194d 0x194d 0x194e 0x194e 0x194f 0x194f [ 76.495685] [drm] Encoders: [ 76.495691] [drm] DFP1: INTERNAL_UNIPHY [ 76.495699] [drm] Connector 1: [ 76.495706] [drm] DVI-D-1 [ 76.495712] [drm] HPD2 [ 76.495718] [drm] DDC: 0x1950 0x1950 0x1951 0x1951 0x1952 0x1952 0x1953 0x1953 [ 76.495733] [drm] Encoders: [ 76.495739] [drm] DFP2: INTERNAL_UNIPHY [ 76.495746] [drm] Connector 2: [ 76.495753] [drm] VGA-1 [ 76.495758] [drm] DDC: 0x1970 0x1970 0x1971 0x1971 0x1972 0x1972 0x1973 0x1973 [ 76.495773] [drm] Encoders: [ 76.495779] [drm] CRT1: INTERNAL_KLDSCP_DAC1 [ 76.599604] [drm] Found UVD firmware Version: 64.0 Family ID: 13 [ 76.603443] [drm] PCIE gen 2 link speeds already enabled [ 77.149564] [drm] UVD initialized successfully. [ 77.149578] amdgpu 0000:01:00.0: amdgpu: SE 1, SH per SE 2, CU per SH 5, active_cu_number 8 [ 77.456492] RTL8211B Gigabit Ethernet r8169-0-300:00: attached PHY driver (mii_bus:phy_addr=r8169-0-300:00, irq=MAC) [ 77.486245] [drm] Initialized amdgpu 3.44.0 20150101 for 0000:01:00.0 on minor 0 [ 77.521555] r8169 0000:03:00.0 eth0: Link is Down [ 77.547158] fbcon: amdgpudrmfb (fb0) is primary device [ 77.591226] Console: switching to colour frame buffer device 240x67 [ 77.600296] amdgpu 0000:01:00.0: [drm] fb0: amdgpudrmfb frame buffer device
Quoted 1 line
I can supply extra details but found no logging from the sessions that experienced the lock-up.
I had created issue *Worker [210] processing SEQNUM=2120 is taking a long time* on March 28th, 2022 [1]. Most annoying thing was, that the system locked up, and SSH didn’t work and Dell’s firmware (and all other x86 vendor firmware not based on coreboot) is so slow. Also, it was only reproducible with a powered-on monitor attached.
Kind regards,
Paul
[1]: https://linux-regtracking.leemhuis.info/regzbot/
[2]: https://gitlab.freedesktop.org/drm/amd/-/issues/1957