drm/amdgpu: make amdgpu device attr_update() function more efficient

v1:
add a new enumeration type to identify device attribute node,
this method is relatively more efficient compared with 'strcmp' in
update_attr() function.

v2:
rename device_attr_type to device_attr_id.

Signed-off-by: Yang Wang <kevinyang.wang@amd.com>
Reviewed-by: Ma Jun <majun@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
index 85e935556d7d9a59e97dac68c71fb06efd52fb65..b410df28ccb2853fa383381bbe996300efc53fee 100644 (file)
--- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
@@ -2226,16 +2226,16 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_
                               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);
-       const char *attr_name = dev_attr->attr.name;
 
        if (!(attr->flags & mask)) {
                *states = ATTR_STATE_UNSUPPORTED;
                return 0;
        }
 
-#define DEVICE_ATTR_IS(_name)  (!strcmp(attr_name, #_name))
+#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))

diff --git a/drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h b/drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h
index eec816f0cbf925debbcf79f3f6a1afe2e4a56497..448ba3a145848ce0ce1a204b3813b9b87f7b3625 100644 (file)
--- a/drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h
+++ b/drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h
@@ -43,8 +43,48 @@ enum amdgpu_device_attr_states {
        ATTR_STATE_SUPPORTED,
 };
 
+enum amdgpu_device_attr_id {
+       device_attr_id__unknown = -1,
+       device_attr_id__power_dpm_state = 0,
+       device_attr_id__power_dpm_force_performance_level,
+       device_attr_id__pp_num_states,
+       device_attr_id__pp_cur_state,
+       device_attr_id__pp_force_state,
+       device_attr_id__pp_table,
+       device_attr_id__pp_dpm_sclk,
+       device_attr_id__pp_dpm_mclk,
+       device_attr_id__pp_dpm_socclk,
+       device_attr_id__pp_dpm_fclk,
+       device_attr_id__pp_dpm_vclk,
+       device_attr_id__pp_dpm_vclk1,
+       device_attr_id__pp_dpm_dclk,
+       device_attr_id__pp_dpm_dclk1,
+       device_attr_id__pp_dpm_dcefclk,
+       device_attr_id__pp_dpm_pcie,
+       device_attr_id__pp_sclk_od,
+       device_attr_id__pp_mclk_od,
+       device_attr_id__pp_power_profile_mode,
+       device_attr_id__pp_od_clk_voltage,
+       device_attr_id__gpu_busy_percent,
+       device_attr_id__mem_busy_percent,
+       device_attr_id__vcn_busy_percent,
+       device_attr_id__pcie_bw,
+       device_attr_id__pp_features,
+       device_attr_id__unique_id,
+       device_attr_id__thermal_throttling_logging,
+       device_attr_id__apu_thermal_cap,
+       device_attr_id__gpu_metrics,
+       device_attr_id__smartshift_apu_power,
+       device_attr_id__smartshift_dgpu_power,
+       device_attr_id__smartshift_bias,
+       device_attr_id__xgmi_plpd_policy,
+       device_attr_id__pm_metrics,
+       device_attr_id__count,
+};
+
 struct amdgpu_device_attr {
        struct device_attribute dev_attr;
+       enum amdgpu_device_attr_id attr_id;
        enum amdgpu_device_attr_flags flags;
        int (*attr_update)(struct amdgpu_device *adev, struct amdgpu_device_attr *attr,
                           uint32_t mask, enum amdgpu_device_attr_states *states);
@@ -61,6 +101,7 @@ struct amdgpu_device_attr_entry {
 
 #define __AMDGPU_DEVICE_ATTR(_name, _mode, _show, _store, _flags, ...) \
        { .dev_attr = __ATTR(_name, _mode, _show, _store),              \
+         .attr_id = device_attr_id__##_name,                           \
          .flags = _flags,                                              \
          ##__VA_ARGS__, }