drm/amd/pm: centralize all pp_dpm_xxx attribute nodes update cb
Subsystems (3)
PATCH 1/1 drm/amd/pm: centralize all pp_dpm_xxx attribute nodes update cb
centralize all pp_dpm_xxx attr nodes intopp_dpm_clk_default_attr_update() function.
Signed-off-by Yang Wang <[email protected]>
--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 207 ++++++++++++++++------------- 1 file changed, 115 insertions(+), 92 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +115 -92
@@ -38,6 +38,8 @@#define MAX_NUM_OF_FEATURES_PER_SUBSET 8#define MAX_NUM_OF_SUBSETS 8 +#define DEVICE_ATTR_IS (_name) (attr_id == device_attr_id__##_name) +struct od_attribute {struct kobj_attribute attribute;struct list_head entry;
@@ -2115,6 +2117,99 @@ static int pp_dpm_dcefclk_attr_update(struct amdgpu_device *adev, struct amdgpu_return 0 ; } +static int pp_dpm_clk_default_attr_update (struct amdgpu_device *adev,struct amdgpu_device_attr *attr, +uint32_t mask,enum amdgpu_device_attr_states *states) +{ +struct device_attribute *dev_attr = &attr->dev_attr; +enum amdgpu_device_attr_id attr_id = attr->attr_id; +uint32_t mp1_ver =amdgpu_ip_version (adev,MP1_HWIP ,0 ); +uint32_t gc_ver =amdgpu_ip_version (adev,GC_HWIP ,0 ); + + *states =ATTR_STATE_SUPPORTED ; + +if (!(attr->flags & mask)) { + *states =ATTR_STATE_UNSUPPORTED ; +return 0 ; + } + +if (DEVICE_ATTR_IS (pp_dpm_socclk)) { +if (gc_ver <IP_VERSION (9 ,0 ,0 )) + *states =ATTR_STATE_UNSUPPORTED ; + }else if (DEVICE_ATTR_IS (pp_dpm_fclk)) { +if (mp1_ver <IP_VERSION (10 ,0 ,0 )) + *states =ATTR_STATE_UNSUPPORTED ; + }else if (DEVICE_ATTR_IS (pp_dpm_vclk)) { +if (!(gc_ver ==IP_VERSION (10 ,3 ,1 ) || + gc_ver ==IP_VERSION (10 ,3 ,3 ) || + gc_ver ==IP_VERSION (10 ,3 ,6 ) || + gc_ver ==IP_VERSION (10 ,3 ,7 ) || + gc_ver ==IP_VERSION (10 ,3 ,0 ) || + gc_ver ==IP_VERSION (10 ,1 ,2 ) || + gc_ver ==IP_VERSION (11 ,0 ,0 ) || + gc_ver ==IP_VERSION (11 ,0 ,1 ) || + gc_ver ==IP_VERSION (11 ,0 ,4 ) || + gc_ver ==IP_VERSION (11 ,5 ,0 ) || + gc_ver ==IP_VERSION (11 ,0 ,2 ) || + gc_ver ==IP_VERSION (11 ,0 ,3 ) || + gc_ver ==IP_VERSION (9 ,4 ,3 ))) + *states =ATTR_STATE_UNSUPPORTED ; + }else if (DEVICE_ATTR_IS (pp_dpm_vclk1)) { +if (!((gc_ver ==IP_VERSION (10 ,3 ,1 ) || + gc_ver ==IP_VERSION (10 ,3 ,0 ) || + gc_ver ==IP_VERSION (11 ,0 ,2 ) || + gc_ver ==IP_VERSION (11 ,0 ,3 )) && adev->vcn.num_vcn_inst >=2 )) + *states =ATTR_STATE_UNSUPPORTED ; + }else if (DEVICE_ATTR_IS (pp_dpm_dclk)) { +if (!(gc_ver ==IP_VERSION (10 ,3 ,1 ) || + gc_ver ==IP_VERSION (10 ,3 ,3 ) || + gc_ver ==IP_VERSION (10 ,3 ,6 ) || + gc_ver ==IP_VERSION (10 ,3 ,7 ) || + gc_ver ==IP_VERSION (10 ,3 ,0 ) || + gc_ver ==IP_VERSION (10 ,1 ,2 ) || + gc_ver ==IP_VERSION (11 ,0 ,0 ) || + gc_ver ==IP_VERSION (11 ,0 ,1 ) || + gc_ver ==IP_VERSION (11 ,0 ,4 ) || + gc_ver ==IP_VERSION (11 ,5 ,0 ) || + gc_ver ==IP_VERSION (11 ,0 ,2 ) || + gc_ver ==IP_VERSION (11 ,0 ,3 ) || + gc_ver ==IP_VERSION (9 ,4 ,3 ))) + *states =ATTR_STATE_UNSUPPORTED ; + }else if (DEVICE_ATTR_IS (pp_dpm_dclk1)) { +if (!((gc_ver ==IP_VERSION (10 ,3 ,1 ) || + gc_ver ==IP_VERSION (10 ,3 ,0 ) || + gc_ver ==IP_VERSION (11 ,0 ,2 ) || + gc_ver ==IP_VERSION (11 ,0 ,3 )) && adev->vcn.num_vcn_inst >=2 )) + *states =ATTR_STATE_UNSUPPORTED ; + }else if (DEVICE_ATTR_IS (pp_dpm_pcie)) { +if (gc_ver ==IP_VERSION (9 ,4 ,2 ) || + gc_ver ==IP_VERSION (9 ,4 ,3 )) + *states =ATTR_STATE_UNSUPPORTED ; + } + +switch (gc_ver) { +case IP_VERSION (9 ,4 ,1 ): +case IP_VERSION (9 ,4 ,2 ): +/* the Mi series card does not support standalone mclk/socclk/fclk level setting */ +if (DEVICE_ATTR_IS (pp_dpm_mclk) || +DEVICE_ATTR_IS (pp_dpm_socclk) || +DEVICE_ATTR_IS (pp_dpm_fclk)) { + dev_attr->attr.mode &= ~S_IWUGO ; + dev_attr->store =NULL ; + } +break ; +default : +break ; + } + +/* setting should not be allowed from VF if not in one VF mode */ +if (amdgpu_sriov_vf (adev) &&amdgpu_sriov_is_pp_one_vf (adev)) { + dev_attr->attr.mode &= ~S_IWUGO ; + dev_attr->store =NULL ; + } + +return 0 ; +} +/* Following items will be read out to indicate current plpd policy: * - -1: none * - 0: disallow
@@ -2186,17 +2281,26 @@ static struct amdgpu_device_attr amdgpu_device_attrs[] = {AMDGPU_DEVICE_ATTR_RO (pp_cur_state,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ),AMDGPU_DEVICE_ATTR_RW (pp_force_state,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ),AMDGPU_DEVICE_ATTR_RW (pp_table,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), -AMDGPU_DEVICE_ATTR_RW (pp_dpm_sclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), -AMDGPU_DEVICE_ATTR_RW (pp_dpm_mclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), -AMDGPU_DEVICE_ATTR_RW (pp_dpm_socclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), -AMDGPU_DEVICE_ATTR_RW (pp_dpm_fclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), -AMDGPU_DEVICE_ATTR_RW (pp_dpm_vclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), -AMDGPU_DEVICE_ATTR_RW (pp_dpm_vclk1,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), -AMDGPU_DEVICE_ATTR_RW (pp_dpm_dclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), -AMDGPU_DEVICE_ATTR_RW (pp_dpm_dclk1,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), +AMDGPU_DEVICE_ATTR_RW (pp_dpm_sclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , + .attr_update = pp_dpm_clk_default_attr_update), +AMDGPU_DEVICE_ATTR_RW (pp_dpm_mclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , + .attr_update = pp_dpm_clk_default_attr_update), +AMDGPU_DEVICE_ATTR_RW (pp_dpm_socclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , + .attr_update = pp_dpm_clk_default_attr_update), +AMDGPU_DEVICE_ATTR_RW (pp_dpm_fclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , + .attr_update = pp_dpm_clk_default_attr_update), +AMDGPU_DEVICE_ATTR_RW (pp_dpm_vclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , + .attr_update = pp_dpm_clk_default_attr_update), +AMDGPU_DEVICE_ATTR_RW (pp_dpm_vclk1,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , + .attr_update = pp_dpm_clk_default_attr_update), +AMDGPU_DEVICE_ATTR_RW (pp_dpm_dclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , + .attr_update = pp_dpm_clk_default_attr_update), +AMDGPU_DEVICE_ATTR_RW (pp_dpm_dclk1,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , + .attr_update = pp_dpm_clk_default_attr_update),AMDGPU_DEVICE_ATTR_RW (pp_dpm_dcefclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , .attr_update = pp_dpm_dcefclk_attr_update), -AMDGPU_DEVICE_ATTR_RW (pp_dpm_pcie,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), +AMDGPU_DEVICE_ATTR_RW (pp_dpm_pcie,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , + .attr_update = pp_dpm_clk_default_attr_update),AMDGPU_DEVICE_ATTR_RW (pp_sclk_od,ATTR_FLAG_BASIC ),AMDGPU_DEVICE_ATTR_RW (pp_mclk_od,ATTR_FLAG_BASIC ), AMDGPU_DEVICE_ATTR_RW(pp_power_profile_mode, ATTR_FLAG_BASIC|ATTR_FLAG_ONEVF),
@@ -2204,7 +2308,7 @@ static struct amdgpu_device_attr amdgpu_device_attrs[] = { .attr_update = pp_od_clk_voltage_attr_update),AMDGPU_DEVICE_ATTR_RO (gpu_busy_percent,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ),AMDGPU_DEVICE_ATTR_RO (mem_busy_percent,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), -AMDGPU_DEVICE_ATTR_RO (vcn_busy_percent,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), +AMDGPU_DEVICE_ATTR_RO (vcn_busy_percent,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ),AMDGPU_DEVICE_ATTR_RO (pcie_bw,ATTR_FLAG_BASIC ),AMDGPU_DEVICE_ATTR_RW (pp_features,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), AMDGPU_DEVICE_ATTR_RO(unique_id, ATTR_FLAG_BASIC|ATTR_FLAG_ONEVF),
@@ -2227,7 +2331,6 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_ {struct device_attribute *dev_attr = &attr->dev_attr;enum amdgpu_device_attr_id attr_id = attr->attr_id; -uint32_t mp1_ver =amdgpu_ip_version (adev,MP1_HWIP ,0 );uint32_t gc_ver =amdgpu_ip_version (adev,GC_HWIP ,0 );if (!(attr->flags & mask)) {
@@ -2235,15 +2338,7 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_return 0 ; } -#define DEVICE_ATTR_IS (_name) (attr_id == device_attr_id__##_name) - -if (DEVICE_ATTR_IS (pp_dpm_socclk)) { -if (gc_ver <IP_VERSION (9 ,0 ,0 )) - *states =ATTR_STATE_UNSUPPORTED ; - }else if (DEVICE_ATTR_IS (pp_dpm_fclk)) { -if (mp1_ver <IP_VERSION (10 ,0 ,0 )) - *states =ATTR_STATE_UNSUPPORTED ; - }else if (DEVICE_ATTR_IS (mem_busy_percent)) { +if (DEVICE_ATTR_IS (mem_busy_percent)) {if ((adev->flags &AMD_IS_APU && gc_ver !=IP_VERSION (9 ,4 ,3 )) || gc_ver ==IP_VERSION (9 ,0 ,1 ))
@@ -2287,48 +2382,6 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_ }else if (DEVICE_ATTR_IS (gpu_metrics)) {if (gc_ver <IP_VERSION (9 ,1 ,0 )) *states =ATTR_STATE_UNSUPPORTED ; - }else if (DEVICE_ATTR_IS (pp_dpm_vclk)) { -if (!(gc_ver ==IP_VERSION (10 ,3 ,1 ) || - gc_ver ==IP_VERSION (10 ,3 ,3 ) || - gc_ver ==IP_VERSION (10 ,3 ,6 ) || - gc_ver ==IP_VERSION (10 ,3 ,7 ) || - gc_ver ==IP_VERSION (10 ,3 ,0 ) || - gc_ver ==IP_VERSION (10 ,1 ,2 ) || - gc_ver ==IP_VERSION (11 ,0 ,0 ) || - gc_ver ==IP_VERSION (11 ,0 ,1 ) || - gc_ver ==IP_VERSION (11 ,0 ,4 ) || - gc_ver ==IP_VERSION (11 ,5 ,0 ) || - gc_ver ==IP_VERSION (11 ,0 ,2 ) || - gc_ver ==IP_VERSION (11 ,0 ,3 ) || - gc_ver ==IP_VERSION (9 ,4 ,3 ))) - *states =ATTR_STATE_UNSUPPORTED ; - }else if (DEVICE_ATTR_IS (pp_dpm_vclk1)) { -if (!((gc_ver ==IP_VERSION (10 ,3 ,1 ) || - gc_ver ==IP_VERSION (10 ,3 ,0 ) || - gc_ver ==IP_VERSION (11 ,0 ,2 ) || - gc_ver ==IP_VERSION (11 ,0 ,3 )) && adev->vcn.num_vcn_inst >=2 )) - *states =ATTR_STATE_UNSUPPORTED ; - }else if (DEVICE_ATTR_IS (pp_dpm_dclk)) { -if (!(gc_ver ==IP_VERSION (10 ,3 ,1 ) || - gc_ver ==IP_VERSION (10 ,3 ,3 ) || - gc_ver ==IP_VERSION (10 ,3 ,6 ) || - gc_ver ==IP_VERSION (10 ,3 ,7 ) || - gc_ver ==IP_VERSION (10 ,3 ,0 ) || - gc_ver ==IP_VERSION (10 ,1 ,2 ) || - gc_ver ==IP_VERSION (11 ,0 ,0 ) || - gc_ver ==IP_VERSION (11 ,0 ,1 ) || - gc_ver ==IP_VERSION (11 ,0 ,4 ) || - gc_ver ==IP_VERSION (11 ,5 ,0 ) || - gc_ver ==IP_VERSION (11 ,0 ,2 ) || - gc_ver ==IP_VERSION (11 ,0 ,3 ) || - gc_ver ==IP_VERSION (9 ,4 ,3 ))) - *states =ATTR_STATE_UNSUPPORTED ; - }else if (DEVICE_ATTR_IS (pp_dpm_dclk1)) { -if (!((gc_ver ==IP_VERSION (10 ,3 ,1 ) || - gc_ver ==IP_VERSION (10 ,3 ,0 ) || - gc_ver ==IP_VERSION (11 ,0 ,2 ) || - gc_ver ==IP_VERSION (11 ,0 ,3 )) && adev->vcn.num_vcn_inst >=2 )) - *states =ATTR_STATE_UNSUPPORTED ; }else if (DEVICE_ATTR_IS (pp_power_profile_mode)) {if (amdgpu_dpm_get_power_profile_mode (adev,NULL ) == -EOPNOTSUPP ) *states =ATTR_STATE_UNSUPPORTED ;
@@ -2350,23 +2403,9 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_if (amdgpu_dpm_get_apu_thermal_limit (adev, &limit) == -EOPNOTSUPP ) *states =ATTR_STATE_UNSUPPORTED ; - }else if (DEVICE_ATTR_IS (pp_dpm_pcie)) { -if (gc_ver ==IP_VERSION (9 ,4 ,2 ) || - gc_ver ==IP_VERSION (9 ,4 ,3 )) - *states =ATTR_STATE_UNSUPPORTED ; }switch (gc_ver) { -case IP_VERSION (9 ,4 ,1 ): -case IP_VERSION (9 ,4 ,2 ): -/* the Mi series card does not support standalone mclk/socclk/fclk level setting */ -if (DEVICE_ATTR_IS (pp_dpm_mclk) || -DEVICE_ATTR_IS (pp_dpm_socclk) || -DEVICE_ATTR_IS (pp_dpm_fclk)) { - dev_attr->attr.mode &= ~S_IWUGO ; - dev_attr->store =NULL ; - } -break ;case IP_VERSION (10 ,3 ,0 ):if (DEVICE_ATTR_IS (power_dpm_force_performance_level) &&amdgpu_sriov_vf (adev)) {
@@ -2378,22 +2417,6 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_break ; } -/* setting should not be allowed from VF if not in one VF mode */ -if (amdgpu_sriov_vf (adev) && (!amdgpu_sriov_is_pp_one_vf (adev) || -DEVICE_ATTR_IS (pp_dpm_sclk) || -DEVICE_ATTR_IS (pp_dpm_mclk) || -DEVICE_ATTR_IS (pp_dpm_socclk) || -DEVICE_ATTR_IS (pp_dpm_fclk) || -DEVICE_ATTR_IS (pp_dpm_vclk) || -DEVICE_ATTR_IS (pp_dpm_vclk1) || -DEVICE_ATTR_IS (pp_dpm_dclk) || -DEVICE_ATTR_IS (pp_dpm_dclk1))) { - dev_attr->attr.mode &= ~S_IWUGO ; - dev_attr->store =NULL ; - } - -#undef DEVICE_ATTR_IS -return 0 ; }
Signature · 1 line
2.34.1
[AMD Official Use Only - General]
Reviewed-by Kenneth Feng <[email protected]>
-----Original Message-----
From: Wang, Yang(Kevin) <[email protected]>
Sent: Monday, April 1, 2024 8:39 AM
To: [email protected]
Cc: Feng, Kenneth <[email protected]>; Lazar, Lijo <[email protected]>; Wang, Yang(Kevin) <[email protected]>
Subject: [PATCH] drm/amd/pm: centralize all pp_dpm_xxx attribute nodes update cb
centralize all pp_dpm_xxx attr nodes intopp_dpm_clk_default_attr_update() function.
Signed-off-by Yang Wang <[email protected]>
--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 207 ++++++++++++++++------------- 1 file changed, 115 insertions(+), 92 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +114 -92
@@ -38,6 +38,8 @@#define MAX_NUM_OF_FEATURES_PER_SUBSET 8#define MAX_NUM_OF_SUBSETS 8 +#define DEVICE_ATTR_IS (_name) (attr_id == device_attr_id__##_name) +struct od_attribute {struct kobj_attribute attribute;struct list_head entry;
@@ -2115,6 +2117,99 @@ static int pp_dpm_dcefclk_attr_update(struct amdgpu_device *adev, struct amdgpu_return 0 ; } +static int pp_dpm_clk_default_attr_update (struct amdgpu_device *adev,struct amdgpu_device_attr *attr, +uint32_t mask,enum amdgpu_device_attr_states *states) { +struct device_attribute *dev_attr = &attr->dev_attr; +enum amdgpu_device_attr_id attr_id = attr->attr_id; +uint32_t mp1_ver =amdgpu_ip_version (adev,MP1_HWIP ,0 ); +uint32_t gc_ver =amdgpu_ip_version (adev,GC_HWIP ,0 ); + + *states =ATTR_STATE_SUPPORTED ; + +if (!(attr->flags & mask)) { + *states =ATTR_STATE_UNSUPPORTED ; +return 0 ; + } + +if (DEVICE_ATTR_IS (pp_dpm_socclk)) { +if (gc_ver <IP_VERSION (9 ,0 ,0 )) + *states =ATTR_STATE_UNSUPPORTED ; + }else if (DEVICE_ATTR_IS (pp_dpm_fclk)) { +if (mp1_ver <IP_VERSION (10 ,0 ,0 )) + *states =ATTR_STATE_UNSUPPORTED ; + }else if (DEVICE_ATTR_IS (pp_dpm_vclk)) { +if (!(gc_ver ==IP_VERSION (10 ,3 ,1 ) || + gc_ver ==IP_VERSION (10 ,3 ,3 ) || + gc_ver ==IP_VERSION (10 ,3 ,6 ) || + gc_ver ==IP_VERSION (10 ,3 ,7 ) || + gc_ver ==IP_VERSION (10 ,3 ,0 ) || + gc_ver ==IP_VERSION (10 ,1 ,2 ) || + gc_ver ==IP_VERSION (11 ,0 ,0 ) || + gc_ver ==IP_VERSION (11 ,0 ,1 ) || + gc_ver ==IP_VERSION (11 ,0 ,4 ) || + gc_ver ==IP_VERSION (11 ,5 ,0 ) || + gc_ver ==IP_VERSION (11 ,0 ,2 ) || + gc_ver ==IP_VERSION (11 ,0 ,3 ) || + gc_ver ==IP_VERSION (9 ,4 ,3 ))) + *states =ATTR_STATE_UNSUPPORTED ; + }else if (DEVICE_ATTR_IS (pp_dpm_vclk1)) { +if (!((gc_ver ==IP_VERSION (10 ,3 ,1 ) || + gc_ver ==IP_VERSION (10 ,3 ,0 ) || + gc_ver ==IP_VERSION (11 ,0 ,2 ) || + gc_ver ==IP_VERSION (11 ,0 ,3 )) && adev->vcn.num_vcn_inst >=2 )) + *states =ATTR_STATE_UNSUPPORTED ; + }else if (DEVICE_ATTR_IS (pp_dpm_dclk)) { +if (!(gc_ver ==IP_VERSION (10 ,3 ,1 ) || + gc_ver ==IP_VERSION (10 ,3 ,3 ) || + gc_ver ==IP_VERSION (10 ,3 ,6 ) || + gc_ver ==IP_VERSION (10 ,3 ,7 ) || + gc_ver ==IP_VERSION (10 ,3 ,0 ) || + gc_ver ==IP_VERSION (10 ,1 ,2 ) || + gc_ver ==IP_VERSION (11 ,0 ,0 ) || + gc_ver ==IP_VERSION (11 ,0 ,1 ) || + gc_ver ==IP_VERSION (11 ,0 ,4 ) || + gc_ver ==IP_VERSION (11 ,5 ,0 ) || + gc_ver ==IP_VERSION (11 ,0 ,2 ) || + gc_ver ==IP_VERSION (11 ,0 ,3 ) || + gc_ver ==IP_VERSION (9 ,4 ,3 ))) + *states =ATTR_STATE_UNSUPPORTED ; + }else if (DEVICE_ATTR_IS (pp_dpm_dclk1)) { +if (!((gc_ver ==IP_VERSION (10 ,3 ,1 ) || + gc_ver ==IP_VERSION (10 ,3 ,0 ) || + gc_ver ==IP_VERSION (11 ,0 ,2 ) || + gc_ver ==IP_VERSION (11 ,0 ,3 )) && adev->vcn.num_vcn_inst >=2 )) + *states =ATTR_STATE_UNSUPPORTED ; + }else if (DEVICE_ATTR_IS (pp_dpm_pcie)) { +if (gc_ver ==IP_VERSION (9 ,4 ,2 ) || + gc_ver ==IP_VERSION (9 ,4 ,3 )) + *states =ATTR_STATE_UNSUPPORTED ; + } + +switch (gc_ver) { +case IP_VERSION (9 ,4 ,1 ): +case IP_VERSION (9 ,4 ,2 ): +/* the Mi series card does not support standalone mclk/socclk/fclk level setting */ +if (DEVICE_ATTR_IS (pp_dpm_mclk) || +DEVICE_ATTR_IS (pp_dpm_socclk) || +DEVICE_ATTR_IS (pp_dpm_fclk)) { + dev_attr->attr.mode &= ~S_IWUGO ; + dev_attr->store =NULL ; + } +break ; +default : +break ; + } + +/* setting should not be allowed from VF if not in one VF mode */ +if (amdgpu_sriov_vf (adev) &&amdgpu_sriov_is_pp_one_vf (adev)) { + dev_attr->attr.mode &= ~S_IWUGO ; + dev_attr->store =NULL ; + } + +return 0 ; +} +/* Following items will be read out to indicate current plpd policy: * - -1: none * - 0: disallow
@@ -2186,17 +2281,26 @@ static struct amdgpu_device_attr amdgpu_device_attrs[] = {AMDGPU_DEVICE_ATTR_RO (pp_cur_state,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ),AMDGPU_DEVICE_ATTR_RW (pp_force_state,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ),AMDGPU_DEVICE_ATTR_RW (pp_table,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), -AMDGPU_DEVICE_ATTR_RW (pp_dpm_sclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), -AMDGPU_DEVICE_ATTR_RW (pp_dpm_mclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), -AMDGPU_DEVICE_ATTR_RW (pp_dpm_socclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), -AMDGPU_DEVICE_ATTR_RW (pp_dpm_fclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), -AMDGPU_DEVICE_ATTR_RW (pp_dpm_vclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), -AMDGPU_DEVICE_ATTR_RW (pp_dpm_vclk1,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), -AMDGPU_DEVICE_ATTR_RW (pp_dpm_dclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), -AMDGPU_DEVICE_ATTR_RW (pp_dpm_dclk1,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), +AMDGPU_DEVICE_ATTR_RW (pp_dpm_sclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , + .attr_update = pp_dpm_clk_default_attr_update), +AMDGPU_DEVICE_ATTR_RW (pp_dpm_mclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , + .attr_update = pp_dpm_clk_default_attr_update), +AMDGPU_DEVICE_ATTR_RW (pp_dpm_socclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , + .attr_update = pp_dpm_clk_default_attr_update), +AMDGPU_DEVICE_ATTR_RW (pp_dpm_fclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , + .attr_update = pp_dpm_clk_default_attr_update), +AMDGPU_DEVICE_ATTR_RW (pp_dpm_vclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , + .attr_update = pp_dpm_clk_default_attr_update), +AMDGPU_DEVICE_ATTR_RW (pp_dpm_vclk1,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , + .attr_update = pp_dpm_clk_default_attr_update), +AMDGPU_DEVICE_ATTR_RW (pp_dpm_dclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , + .attr_update = pp_dpm_clk_default_attr_update), +AMDGPU_DEVICE_ATTR_RW (pp_dpm_dclk1,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , + .attr_update = pp_dpm_clk_default_attr_update),AMDGPU_DEVICE_ATTR_RW (pp_dpm_dcefclk,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , .attr_update = pp_dpm_dcefclk_attr_update), -AMDGPU_DEVICE_ATTR_RW (pp_dpm_pcie,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), +AMDGPU_DEVICE_ATTR_RW (pp_dpm_pcie,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF , + .attr_update = pp_dpm_clk_default_attr_update),AMDGPU_DEVICE_ATTR_RW (pp_sclk_od,ATTR_FLAG_BASIC ),AMDGPU_DEVICE_ATTR_RW (pp_mclk_od,ATTR_FLAG_BASIC ), AMDGPU_DEVICE_ATTR_RW(pp_power_profile_mode, ATTR_FLAG_BASIC|ATTR_FLAG_ONEVF),
@@ -2204,7 +2308,7 @@ static struct amdgpu_device_attr amdgpu_device_attrs[] = { .attr_update = pp_od_clk_voltage_attr_update),AMDGPU_DEVICE_ATTR_RO (gpu_busy_percent,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ),AMDGPU_DEVICE_ATTR_RO (mem_busy_percent,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), -AMDGPU_DEVICE_ATTR_RO (vcn_busy_percent,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), +AMDGPU_DEVICE_ATTR_RO (vcn_busy_percent,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ),AMDGPU_DEVICE_ATTR_RO (pcie_bw,ATTR_FLAG_BASIC ),AMDGPU_DEVICE_ATTR_RW (pp_features,ATTR_FLAG_BASIC |ATTR_FLAG_ONEVF ), AMDGPU_DEVICE_ATTR_RO(unique_id, ATTR_FLAG_BASIC|ATTR_FLAG_ONEVF),
@@ -2227,7 +2331,6 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_ {struct device_attribute *dev_attr = &attr->dev_attr;enum amdgpu_device_attr_id attr_id = attr->attr_id; -uint32_t mp1_ver =amdgpu_ip_version (adev,MP1_HWIP ,0 );uint32_t gc_ver =amdgpu_ip_version (adev,GC_HWIP ,0 );if (!(attr->flags & mask)) {
@@ -2235,15 +2338,7 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_return 0 ; } -#define DEVICE_ATTR_IS (_name) (attr_id == device_attr_id__##_name) - -if (DEVICE_ATTR_IS (pp_dpm_socclk)) { -if (gc_ver <IP_VERSION (9 ,0 ,0 )) - *states =ATTR_STATE_UNSUPPORTED ; - }else if (DEVICE_ATTR_IS (pp_dpm_fclk)) { -if (mp1_ver <IP_VERSION (10 ,0 ,0 )) - *states =ATTR_STATE_UNSUPPORTED ; - }else if (DEVICE_ATTR_IS (mem_busy_percent)) { +if (DEVICE_ATTR_IS (mem_busy_percent)) {if ((adev->flags &AMD_IS_APU && gc_ver !=IP_VERSION (9 ,4 ,3 )) || gc_ver ==IP_VERSION (9 ,0 ,1 ))
@@ -2287,48 +2382,6 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_ }else if (DEVICE_ATTR_IS (gpu_metrics)) {if (gc_ver <IP_VERSION (9 ,1 ,0 )) *states =ATTR_STATE_UNSUPPORTED ; - }else if (DEVICE_ATTR_IS (pp_dpm_vclk)) { -if (!(gc_ver ==IP_VERSION (10 ,3 ,1 ) || - gc_ver ==IP_VERSION (10 ,3 ,3 ) || - gc_ver ==IP_VERSION (10 ,3 ,6 ) || - gc_ver ==IP_VERSION (10 ,3 ,7 ) || - gc_ver ==IP_VERSION (10 ,3 ,0 ) || - gc_ver ==IP_VERSION (10 ,1 ,2 ) || - gc_ver ==IP_VERSION (11 ,0 ,0 ) || - gc_ver ==IP_VERSION (11 ,0 ,1 ) || - gc_ver ==IP_VERSION (11 ,0 ,4 ) || - gc_ver ==IP_VERSION (11 ,5 ,0 ) || - gc_ver ==IP_VERSION (11 ,0 ,2 ) || - gc_ver ==IP_VERSION (11 ,0 ,3 ) || - gc_ver ==IP_VERSION (9 ,4 ,3 ))) - *states =ATTR_STATE_UNSUPPORTED ; - }else if (DEVICE_ATTR_IS (pp_dpm_vclk1)) { -if (!((gc_ver ==IP_VERSION (10 ,3 ,1 ) || - gc_ver ==IP_VERSION (10 ,3 ,0 ) || - gc_ver ==IP_VERSION (11 ,0 ,2 ) || - gc_ver ==IP_VERSION (11 ,0 ,3 )) && adev->vcn.num_vcn_inst >=2 )) - *states =ATTR_STATE_UNSUPPORTED ; - }else if (DEVICE_ATTR_IS (pp_dpm_dclk)) { -if (!(gc_ver ==IP_VERSION (10 ,3 ,1 ) || - gc_ver ==IP_VERSION (10 ,3 ,3 ) || - gc_ver ==IP_VERSION (10 ,3 ,6 ) || - gc_ver ==IP_VERSION (10 ,3 ,7 ) || - gc_ver ==IP_VERSION (10 ,3 ,0 ) || - gc_ver ==IP_VERSION (10 ,1 ,2 ) || - gc_ver ==IP_VERSION (11 ,0 ,0 ) || - gc_ver ==IP_VERSION (11 ,0 ,1 ) || - gc_ver ==IP_VERSION (11 ,0 ,4 ) || - gc_ver ==IP_VERSION (11 ,5 ,0 ) || - gc_ver ==IP_VERSION (11 ,0 ,2 ) || - gc_ver ==IP_VERSION (11 ,0 ,3 ) || - gc_ver ==IP_VERSION (9 ,4 ,3 ))) - *states =ATTR_STATE_UNSUPPORTED ; - }else if (DEVICE_ATTR_IS (pp_dpm_dclk1)) { -if (!((gc_ver ==IP_VERSION (10 ,3 ,1 ) || - gc_ver ==IP_VERSION (10 ,3 ,0 ) || - gc_ver ==IP_VERSION (11 ,0 ,2 ) || - gc_ver ==IP_VERSION (11 ,0 ,3 )) && adev->vcn.num_vcn_inst >=2 )) - *states =ATTR_STATE_UNSUPPORTED ; }else if (DEVICE_ATTR_IS (pp_power_profile_mode)) {if (amdgpu_dpm_get_power_profile_mode (adev,NULL ) == -EOPNOTSUPP ) *states =ATTR_STATE_UNSUPPORTED ;
@@ -2350,23 +2403,9 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_if (amdgpu_dpm_get_apu_thermal_limit (adev, &limit) == -EOPNOTSUPP ) *states =ATTR_STATE_UNSUPPORTED ; - }else if (DEVICE_ATTR_IS (pp_dpm_pcie)) { -if (gc_ver ==IP_VERSION (9 ,4 ,2 ) || - gc_ver ==IP_VERSION (9 ,4 ,3 )) - *states =ATTR_STATE_UNSUPPORTED ; }switch (gc_ver) { -case IP_VERSION (9 ,4 ,1 ): -case IP_VERSION (9 ,4 ,2 ): -/* the Mi series card does not support standalone mclk/socclk/fclk level setting */ -if (DEVICE_ATTR_IS (pp_dpm_mclk) || -DEVICE_ATTR_IS (pp_dpm_socclk) || -DEVICE_ATTR_IS (pp_dpm_fclk)) { - dev_attr->attr.mode &= ~S_IWUGO ; - dev_attr->store =NULL ; - } -break ;case IP_VERSION (10 ,3 ,0 ):if (DEVICE_ATTR_IS (power_dpm_force_performance_level) &&amdgpu_sriov_vf (adev)) {
@@ -2378,22 +2417,6 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_break ; } -/* setting should not be allowed from VF if not in one VF mode */ -if (amdgpu_sriov_vf (adev) && (!amdgpu_sriov_is_pp_one_vf (adev) || -DEVICE_ATTR_IS (pp_dpm_sclk) || -DEVICE_ATTR_IS (pp_dpm_mclk) || -DEVICE_ATTR_IS (pp_dpm_socclk) || -DEVICE_ATTR_IS (pp_dpm_fclk) || -DEVICE_ATTR_IS (pp_dpm_vclk) || -DEVICE_ATTR_IS (pp_dpm_vclk1) || -DEVICE_ATTR_IS (pp_dpm_dclk) || -DEVICE_ATTR_IS (pp_dpm_dclk1))) { - dev_attr->attr.mode &= ~S_IWUGO ; - dev_attr->store =NULL ; - } - -#undef DEVICE_ATTR_IS -return 0 ; }
--
2.34.1