drm/amd/pm: Add default feature number definition

The number of default features could be different from the actual width
of the bitmap. Use a different definition for it. Also increase the max
width of bitmap to 128.

Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Asad Kamal <asad.kamal@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index 797da21e2e5f679ea2598e8856dd7bb46d0f1518..9f52b7b24198251a812a82079bdf3a282b290dd7 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -1355,7 +1355,7 @@ static int smu_sw_init(struct amdgpu_ip_block *ip_block)
        int i, ret;
 
        smu->pool_size = adev->pm.smu_prv_buffer_size;
-       smu_feature_init(smu, SMU_FEATURE_MAX);
+       smu_feature_init(smu, SMU_FEATURE_NUM_DEFAULT);
 
        INIT_WORK(&smu->throttling_logging_work, smu_throttling_logging_work_fn);
        INIT_WORK(&smu->interrupt_work, smu_interrupt_work_fn);

diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
index 4019ef8595040330d5c92789562841817c7f2cb3..512493a8452b323b9f239f8dcc1d222df266d6a4 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
@@ -471,7 +471,8 @@ struct smu_power_context {
        struct smu_power_gate power_gate;
 };
 
-#define SMU_FEATURE_MAX        (64)
+#define SMU_FEATURE_NUM_DEFAULT (64)
+#define SMU_FEATURE_MAX (128)
 
 struct smu_feature_bits {
        DECLARE_BITMAP(bits, SMU_FEATURE_MAX);

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
index 1d0f9f8ddf9b5190412b4bdc3f010ee07c93b723..56efcfa327dfdd7d11aaac1e95d04ec17ec04d46 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
@@ -751,7 +751,7 @@ int smu_v11_0_set_allowed_mask(struct smu_context *smu)
        uint32_t feature_mask[2];
 
        if (smu_feature_list_is_empty(smu, SMU_FEATURE_LIST_ALLOWED) ||
-           feature->feature_num < 64) {
+           feature->feature_num < SMU_FEATURE_NUM_DEFAULT) {
                ret = -EINVAL;
                goto failed;
        }

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
index 3b0aa6a2e78edf4ac5f5f9bf5769359d27d4eb85..63a65ea802fd5983fb8aa4fc1303de2f1d23cbda 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
@@ -762,7 +762,7 @@ int smu_v13_0_set_allowed_mask(struct smu_context *smu)
        uint32_t feature_mask[2];
 
        if (smu_feature_list_is_empty(smu, SMU_FEATURE_LIST_ALLOWED) ||
-           feature->feature_num < 64)
+           feature->feature_num < SMU_FEATURE_NUM_DEFAULT)
                return -EINVAL;
 
        smu_feature_list_to_arr32(smu, SMU_FEATURE_LIST_ALLOWED, feature_mask);

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
index cabbd234c6e2c19914e587b9bdd8d26e2333357c..7dc6687c3693b52efc78d08b3596d882783b26a7 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
@@ -747,7 +747,7 @@ int smu_v14_0_set_allowed_mask(struct smu_context *smu)
        uint32_t feature_mask[2];
 
        if (smu_feature_list_is_empty(smu, SMU_FEATURE_LIST_ALLOWED) ||
-           feature->feature_num < 64)
+           feature->feature_num < SMU_FEATURE_NUM_DEFAULT)
                return -EINVAL;
 
        smu_feature_list_to_arr32(smu, SMU_FEATURE_LIST_ALLOWED, feature_mask);

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c
index d77eaac556d9b94c74495c844a1cab203452b91d..a2854d528bab5b045c20c3359170ecea676ed1ea 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c
@@ -716,7 +716,7 @@ int smu_v15_0_set_allowed_mask(struct smu_context *smu)
        uint32_t feature_mask[2];
 
        if (smu_feature_list_is_empty(smu, SMU_FEATURE_LIST_ALLOWED) ||
-           feature->feature_num < 64)
+           feature->feature_num < SMU_FEATURE_NUM_DEFAULT)
                return -EINVAL;
 
        smu_feature_list_to_arr32(smu, SMU_FEATURE_LIST_ALLOWED, feature_mask);

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c b/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
index a9e0b52bc739d795572b45570a65720e62e3d467..6fd50c2fd20e0b61218d240b221c3e808b85eb5d 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
@@ -794,7 +794,8 @@ int smu_cmn_get_enabled_mask(struct smu_context *smu,
        }
 
        if (!ret)
-               smu_feature_bits_from_arr32(feature_mask, features, 64);
+               smu_feature_bits_from_arr32(feature_mask, features,
+                                           SMU_FEATURE_NUM_DEFAULT);
 
        return ret;
 }
@@ -909,7 +910,8 @@ size_t smu_cmn_get_pp_feature_mask(struct smu_context *smu,
        size += sysfs_emit_at(buf, size, "%-2s. %-20s  %-3s : %-s\n",
                        "No", "Feature", "Bit", "State");
 
-       for (feature_index = 0; feature_index < SMU_FEATURE_MAX; feature_index++) {
+       for (feature_index = 0; feature_index < smu->smu_feature.feature_num;
+            feature_index++) {
                if (sort_feature[feature_index] < 0)
                        continue;