drm/amdgpu/navi10: implement GFXCLK_CURVE overdrive

[Why]
Before this patch, there was no way to set the gfxclk voltage curve in
the overdrive settings for navi10 through pp_od_clk_voltage

[How]
Add the required implementation to navi10's ppt dpm table editing
implementation, similar to the vega20 implementation and interface.

Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Matt Coffin <mcoffin13@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
index 354f631033081502888221dc8475294fa5e5c737..3e26c03d5eed63253a3bc9a3a9c507ff191c0cc9 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
@@ -1728,6 +1728,8 @@ static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL
        struct smu_table_context *table_context = &smu->smu_table;
        OverDriveTable_t *od_table;
        struct smu_11_0_overdrive_table *od_settings;
+       enum SMU_11_0_ODSETTING_ID freq_setting, voltage_setting;
+       uint16_t *freq_ptr, *voltage_ptr;
        od_table = (OverDriveTable_t *)table_context->overdrive_table;
 
        if (!smu->od_enabled) {
@@ -1824,8 +1826,62 @@ static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL
                }
                break;
        case PP_OD_EDIT_VDDC_CURVE:
-               // TODO: implement
-               return -ENOSYS;
+               if (!navi10_od_feature_is_supported(od_settings, SMU_11_0_ODFEATURE_GFXCLK_CURVE)) {
+                       pr_warn("GFXCLK_CURVE not supported!\n");
+                       return -ENOTSUPP;
+               }
+               if (size < 3) {
+                       pr_info("invalid number of parameters: %d\n", size);
+                       return -EINVAL;
+               }
+               if (!od_table) {
+                       pr_info("Overdrive is not initialized\n");
+                       return -EINVAL;
+               }
+
+               switch (input[0]) {
+               case 0:
+                       freq_setting = SMU_11_0_ODSETTING_VDDGFXCURVEFREQ_P1;
+                       voltage_setting = SMU_11_0_ODSETTING_VDDGFXCURVEVOLTAGE_P1;
+                       freq_ptr = &od_table->GfxclkFreq1;
+                       voltage_ptr = &od_table->GfxclkVolt1;
+                       break;
+               case 1:
+                       freq_setting = SMU_11_0_ODSETTING_VDDGFXCURVEFREQ_P2;
+                       voltage_setting = SMU_11_0_ODSETTING_VDDGFXCURVEVOLTAGE_P2;
+                       freq_ptr = &od_table->GfxclkFreq2;
+                       voltage_ptr = &od_table->GfxclkVolt2;
+                       break;
+               case 2:
+                       freq_setting = SMU_11_0_ODSETTING_VDDGFXCURVEFREQ_P3;
+                       voltage_setting = SMU_11_0_ODSETTING_VDDGFXCURVEVOLTAGE_P3;
+                       freq_ptr = &od_table->GfxclkFreq3;
+                       voltage_ptr = &od_table->GfxclkVolt3;
+                       break;
+               default:
+                       pr_info("Invalid VDDC_CURVE index: %ld\n", input[0]);
+                       pr_info("Supported indices: [0, 1, 2]\n");
+                       return -EINVAL;
+               }
+               ret = navi10_od_setting_check_range(od_settings, freq_setting, input[1]);
+               if (ret)
+                       return ret;
+               // Allow setting zero to disable the OverDrive VDDC curve
+               if (input[2] != 0) {
+                       ret = navi10_od_setting_check_range(od_settings, voltage_setting, input[2]);
+                       if (ret)
+                               return ret;
+                       *freq_ptr = input[1];
+                       *voltage_ptr = ((uint16_t)input[2]) * NAVI10_VOLTAGE_SCALE;
+                       pr_debug("OD: set curve %ld: (%d, %d)\n", input[0], *freq_ptr, *voltage_ptr);
+               } else {
+                       // If setting 0, disable all voltage curve settings
+                       od_table->GfxclkVolt1 = 0;
+                       od_table->GfxclkVolt2 = 0;
+                       od_table->GfxclkVolt3 = 0;
+               }
+               navi10_dump_od_table(od_table);
+               break;
        default:
                return -ENOSYS;
        }

diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.h b/drivers/gpu/drm/amd/powerplay/navi10_ppt.h
index a37e37c5f1058ba52e814e7acac7835105c4cb87..fd6dda1a67a1b6069c3c98722afeb89b4b0fff4f 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.h
+++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.h
@@ -33,6 +33,8 @@
 #define NAVI14_UMD_PSTATE_PEAK_XTX_GFXCLK     (1717)
 #define NAVI14_UMD_PSTATE_PEAK_XL_GFXCLK      (1448)
 
+#define NAVI10_VOLTAGE_SCALE (4)
+
 extern void navi10_set_ppt_funcs(struct smu_context *smu);
 
 #endif