drm/amd/pm: restore user customized OD settings properly for NV1x
Subsystems (3)
PATCH 1/2 drm/amd/pm: restore user customized OD settings properly for NV1x
The customized OD settings can be divided into two parts: those committed ones and non-committed ones.
- For those changes which had been fed to SMU before S3/S4/Runpm suspend kicked, they are committed changes. They should be properly restored and fed to SMU on S3/S4/Runpm resume.
- For those non-committed changes, they are restored only without feeding to SMU.
--- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 8 +++ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 9 ++++ .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 52 ++++++++++++++----- .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 12 +++++ 4 files changed, 69 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +8 -0
@@ -231,6 +231,7 @@ struct smu_user_dpm_profile {uint32_t power_limit;uint32_t fan_speed_percent;uint32_t flags; +uint32_t committed_od;/* user clock state information */ uint32_t clk_mask[SMU_CLK_COUNT ];
@@ -352,6 +353,7 @@ struct smu_table_contextvoid *overdrive_table;void *boot_overdrive_table; +void *committed_overdrive_table;uint32_t gpu_metrics_table_size;void *gpu_metrics_table;
@@ -623,6 +625,12 @@ struct pptable_funcs {enum PP_OD_DPM_TABLE_COMMAND type, long *input, uint32_t size); +/** +* @restore_committed_od_settings: Restore the customized and committed +* OD settings on S3/S4/Runpm resume. +*/ +int (*restore_committed_od_settings)(struct smu_context *smu); +/** * @get_clock_by_type_with_latency: Get the speed and latency of a clock * domain.
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +9 -0
@@ -416,6 +416,15 @@ static void smu_restore_dpm_user_profile(struct smu_context *smu) } } +/* Restore customized and committed OD settings */ +if (smu->user_dpm_profile.committed_od) { +if (smu->ppt_funcs->restore_committed_od_settings) { + ret = smu->ppt_funcs->restore_committed_od_settings (smu); +if (ret) +dev_err (smu->adev->dev,"Failed to upload customized OD settings\n" ); + } + } +/* Disable restore flag */ smu->user_dpm_profile.flags &= ~SMU_DPM_USER_PROFILE_RESTORE ; }
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +40 -12
97 lines not on this page · raw message
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +12 -0
@@ -422,10 +422,20 @@ int smu_v11_0_init_smc_tables(struct smu_context *smu) ret = -ENOMEM ; goto err3_out; } + + smu_table->committed_overdrive_table = +kzalloc (tables[SMU_TABLE_OVERDRIVE ].size,GFP_KERNEL ); +if (!smu_table->committed_overdrive_table) { + ret = -ENOMEM ; + goto err4_out; + } + }return 0 ; +err4_out: +kfree (smu_table->boot_overdrive_table); err3_out:kfree (smu_table->overdrive_table); err2_out:
@@ -442,12 +452,14 @@ int smu_v11_0_fini_smc_tables(struct smu_context *smu)struct smu_dpm_context *smu_dpm = &smu->smu_dpm;kfree (smu_table->gpu_metrics_table); +kfree (smu_table->committed_overdrive_table);kfree (smu_table->boot_overdrive_table);kfree (smu_table->overdrive_table);kfree (smu_table->max_sustainable_clocks);kfree (smu_table->driver_pptable);kfree (smu_table->clocks_table); smu_table->gpu_metrics_table =NULL ; + smu_table->committed_overdrive_table =NULL ; smu_table->boot_overdrive_table =NULL ; smu_table->overdrive_table =NULL ; smu_table->max_sustainable_clocks =NULL ;
Signature · 6 lines
2.29.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amd/pm: restore user customized OD settings properly for Sienna Cichlid
Properly restore those committed and non-committed user customized OD settings.
--- drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 2 ++ drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 15 +-------------- .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 16 +++++++++++++--- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 13 +++++++++++++ 4 files changed, 29 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +2 -0
@@ -302,5 +302,7 @@ void smu_v11_0_interrupt_work(struct smu_context *smu);int smu_v11_0_set_light_sbr (struct smu_context *smu,bool enable); +int smu_v11_0_restore_committed_od_settings (struct smu_context *smu); +#endif #endif
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1 -14
@@ -2513,19 +2513,6 @@ static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABLreturn ret; } -static int navi10_restore_committed_od_settings (struct smu_context *smu) -{ -struct smu_table_context *table_context = &smu->smu_table; -void *od_table = table_context->committed_overdrive_table; -int ret =0 ; - - ret =smu_cmn_update_table (smu,SMU_TABLE_OVERDRIVE ,0 , (void *)od_table, true); -if (ret) -dev_err (smu->adev->dev,"Failed to import overdrive table!\n" ); - -return ret; -} -static int navi10_run_btc (struct smu_context *smu) {int ret =0 ;
@@ -3289,7 +3276,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .set_soft_freq_limited_range = smu_v11_0_set_soft_freq_limited_range, .set_default_od_settings = navi10_set_default_od_settings, .od_edit_dpm_table = navi10_od_edit_dpm_table, - .restore_committed_od_settings = navi10_restore_committed_od_settings, + .restore_committed_od_settings = smu_v11_0_restore_committed_od_settings, .run_btc = navi10_run_btc, .set_power_source = smu_v11_0_set_power_source, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask,
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +13 -3
@@ -1957,15 +1957,16 @@ static int sienna_cichlid_set_default_od_settings(struct smu_context *smu)int ret =0 ; ret =smu_cmn_update_table (smu,SMU_TABLE_OVERDRIVE , -0 , (void *)od_table, false); +0 , (void *)boot_od_table, false);if (ret) {dev_err (smu->adev->dev,"Failed to get overdrive table!\n" );return ret; } -memcpy (boot_od_table, od_table,sizeof (OverDriveTable_t)); +sienna_cichlid_dump_od_table (smu, boot_od_table); -sienna_cichlid_dump_od_table (smu, od_table); +if (!smu->adev->in_suspend) +memcpy (od_table, boot_od_table,sizeof (OverDriveTable_t));return 0 ; }
@@ -2136,6 +2137,14 @@ static int sienna_cichlid_od_edit_dpm_table(struct smu_context *smu,dev_err (smu->adev->dev,"Failed to import overdrive table!\n" );return ret; } +if (memcmp (table_context->overdrive_table, table_context->boot_overdrive_table, +sizeof (OverDriveTable_t))) { + smu->user_dpm_profile.committed_od = true; +memcpy (table_context->committed_overdrive_table, table_context->overdrive_table, +sizeof (OverDriveTable_t)); + }else { + smu->user_dpm_profile.committed_od = false; + }break ;case PP_OD_EDIT_VDDGFX_OFFSET :
@@ -3902,6 +3911,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = { .set_soft_freq_limited_range = smu_v11_0_set_soft_freq_limited_range, .set_default_od_settings = sienna_cichlid_set_default_od_settings, .od_edit_dpm_table = sienna_cichlid_od_edit_dpm_table, + .restore_committed_od_settings = smu_v11_0_restore_committed_od_settings, .run_btc = sienna_cichlid_run_btc, .set_power_source = smu_v11_0_set_power_source, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask,
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +13 -0
@@ -2113,3 +2113,16 @@ int smu_v11_0_deep_sleep_control(struct smu_context *smu,return ret; } + +int smu_v11_0_restore_committed_od_settings (struct smu_context *smu) +{ +struct smu_table_context *table_context = &smu->smu_table; +void *od_table = table_context->committed_overdrive_table; +int ret =0 ; + + ret =smu_cmn_update_table (smu,SMU_TABLE_OVERDRIVE ,0 , (void *)od_table, true); +if (ret) +dev_err (smu->adev->dev,"Failed to import overdrive table!\n" ); + +return ret; +}
Signature · 6 lines
2.29.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 30 lines · Evan Quan
The customized OD settings can be divided into two parts: those committed ones and non-committed ones.
- For those changes which had been fed to SMU before S3/S4/Runpm suspend kicked, they are committed changes. They should be properly restored and fed to SMU on S3/S4/Runpm resume.
- For those non-committed changes, they are restored only without feeding to SMU.Change-Id Iea7cf7908dfcd919a4d0205e10bff91b1149a440Signed-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 8 +++ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 9 ++++ .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 52 ++++++++++++++----- .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 12 +++++ 4 files changed, 69 insertions(+), 12 deletions(-)drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1
-0@@ -231,6 +231,7 @@ struct smu_user_dpm_profile {uint32_t power_limit;uint32_t fan_speed_percent;uint32_t flags; +uint32_t committed_od;/* user clock state information */ uint32_t clk_mask[SMU_CLK_COUNT ];
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct smu_table_context · line 356
Quoted 4 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1
-0@@ -352,6 +353,7 @@ struct smu_table_contextvoid *overdrive_table;void *boot_overdrive_table; +void *committed_overdrive_table;
May be rename it to user_overdrive_table - OD table with user settings?
Quoted 22 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +6
-0uint32_t gpu_metrics_table_size;void *gpu_metrics_table;@@ -623,6 +625,12 @@ struct pptable_funcs {enum PP_OD_DPM_TABLE_COMMAND type, long *input, uint32_t size); +/** +* @restore_committed_od_settings: Restore the customized and committed +* OD settings on S3/S4/Runpm resume. +*/ +int (*restore_committed_od_settings)(struct smu_context *smu); +/** * @get_clock_by_type_with_latency: Get the speed and latency of a clock * domain. drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0@@ -416,6 +416,15 @@ static void smu_restore_dpm_user_profile(struct smu_context *smu) } }
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void smu_restore_dpm_user_profile(struct smu_context *smu) · line 427
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +9
-0+/* Restore customized and committed OD settings */ +if (smu->user_dpm_profile.committed_od) { +if (smu->ppt_funcs->restore_committed_od_settings) { + ret = smu->ppt_funcs->restore_committed_od_settings (smu); +if (ret) +dev_err (smu->adev->dev,"Failed to upload customized OD settings\n" ); + } + } +
Just thinking if there is a need to handle it ASIC specific. The flags and table pointer are maintained in common structure. So can't we do the restore of user OD settings directly in this common flow instead of having each ASIC to implement the callback?
Quoted 66 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0/* Disable restore flag */ smu->user_dpm_profile.flags &= ~SMU_DPM_USER_PROFILE_RESTORE ; }drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +18
-12@@ -2296,39 +2296,45 @@ static int navi10_set_default_od_settings(struct smu_context *smu) (OverDriveTable_t *)smu->smu_table.boot_overdrive_table;int ret =0 ; - ret =smu_cmn_update_table (smu,SMU_TABLE_OVERDRIVE ,0 , (void *)od_table, false); + ret =smu_cmn_update_table (smu,SMU_TABLE_OVERDRIVE ,0 , (void *)boot_od_table, false);if (ret) {dev_err (smu->adev->dev,"Failed to get overdrive table!\n" );return ret; } -if (!od_table->GfxclkVolt1) { +if (!boot_od_table->GfxclkVolt1) { ret =navi10_overdrive_get_gfx_clk_base_voltage (smu, - &od_table->GfxclkVolt1, - od_table->GfxclkFreq1); + &boot_od_table->GfxclkVolt1, + boot_od_table->GfxclkFreq1);if (ret)return ret; } -if (!od_table->GfxclkVolt2) { +if (!boot_od_table->GfxclkVolt2) { ret =navi10_overdrive_get_gfx_clk_base_voltage (smu, - &od_table->GfxclkVolt2, - od_table->GfxclkFreq2); + &boot_od_table->GfxclkVolt2, + boot_od_table->GfxclkFreq2);if (ret)return ret; } -if (!od_table->GfxclkVolt3) { +if (!boot_od_table->GfxclkVolt3) { ret =navi10_overdrive_get_gfx_clk_base_voltage (smu, - &od_table->GfxclkVolt3, - od_table->GfxclkFreq3); + &boot_od_table->GfxclkVolt3, + boot_od_table->GfxclkFreq3);if (ret)return ret; } -memcpy (boot_od_table, od_table,sizeof (OverDriveTable_t)); +navi10_dump_od_table (smu, boot_od_table); -navi10_dump_od_table (smu, od_table); +/* +* For S3/S4/Runpm, no need to install boot od table to overdrive_table as +* - either they already share the same OD settings on bootup +* - or they have user customized OD settings +*/ +if (!smu->adev->in_suspend) +memcpy (od_table, boot_od_table,sizeof (OverDriveTable_t));return 0 ; }
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL · line 2445
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-0@@ -2435,6 +2441,14 @@ static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABLdev_err (smu->adev->dev,"Failed to import overdrive table!\n" );return ret; } +if (memcmp (table_context->overdrive_table, table_context->boot_overdrive_table, +sizeof (OverDriveTable_t))) {
Shouldn't this be - compare against the edited settings and last committed settings, overdrive_table vs committed_overdrive_table?
Basically, user_od_table can be initialized with boot_od settings and the flag gives the indication that user_od table is being used or not. Before updating, check if the edited table (overdrive_table) and the current user_od table are different, then commit the new table.
Quoted 15 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +8
-0+ smu->user_dpm_profile.committed_od = true; +memcpy (table_context->committed_overdrive_table, table_context->overdrive_table, +sizeof (OverDriveTable_t)); + }else { + smu->user_dpm_profile.committed_od = false; + }break ;case PP_OD_EDIT_VDDC_CURVE :if (!navi10_od_feature_is_supported (od_settings,SMU_11_0_ODCAP_GFXCLK_CURVE )) {@@ -2499,6 +2513,19 @@ static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABLreturn ret; } +static int navi10_restore_committed_od_settings (struct smu_context *smu) +{
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL · line 2527
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +10
-0+struct smu_table_context *table_context = &smu->smu_table; +void *od_table = table_context->committed_overdrive_table; +int ret =0 ; + + ret =smu_cmn_update_table (smu,SMU_TABLE_OVERDRIVE ,0 , (void *)od_table, true); +if (ret) +dev_err (smu->adev->dev,"Failed to import overdrive table!\n" ); + +return ret; +}
As mentioned before, not sure if this is needed as callback. Even if, this can be something common for smuv11, there is nothing ASIC specific in this logic, right?
Thanks,
Lijo
Quoted 42 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0static int navi10_run_btc (struct smu_context *smu) {int ret =0 ;@@ -3262,6 +3289,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .set_soft_freq_limited_range = smu_v11_0_set_soft_freq_limited_range, .set_default_od_settings = navi10_set_default_od_settings, .od_edit_dpm_table = navi10_od_edit_dpm_table, + .restore_committed_od_settings = navi10_restore_committed_od_settings, .run_btc = navi10_run_btc, .set_power_source = smu_v11_0_set_power_source, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask,drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +11
-0@@ -422,10 +422,20 @@ int smu_v11_0_init_smc_tables(struct smu_context *smu) ret = -ENOMEM ; goto err3_out; } + + smu_table->committed_overdrive_table = +kzalloc (tables[SMU_TABLE_OVERDRIVE ].size,GFP_KERNEL ); +if (!smu_table->committed_overdrive_table) { + ret = -ENOMEM ; + goto err4_out; + } + }return 0 ; +err4_out: +kfree (smu_table->boot_overdrive_table); err3_out:kfree (smu_table->overdrive_table); err2_out:@@ -442,12 +452,14 @@ int smu_v11_0_fini_smc_tables(struct smu_context *smu)struct smu_dpm_context *smu_dpm = &smu->smu_dpm;kfree (smu_table->gpu_metrics_table); +kfree (smu_table->committed_overdrive_table);
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_fini_smc_tables(struct smu_context *smu) · line 465
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +1
-0kfree (smu_table->boot_overdrive_table);kfree (smu_table->overdrive_table);kfree (smu_table->max_sustainable_clocks);kfree (smu_table->driver_pptable);kfree (smu_table->clocks_table); smu_table->gpu_metrics_table =NULL ; + smu_table->committed_overdrive_table =NULL ; smu_table->boot_overdrive_table =NULL ; smu_table->overdrive_table =NULL ; smu_table->max_sustainable_clocks =NULL ;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only]
Quoted 45 lines
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Thursday, July 22, 2021 4:10 PM
To: Quan, Evan <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: Re: [PATCH 1/2] drm/amd/pm: restore user customized OD settings properly for NV1xQuoted 6 lines · Evan Quan
The customized OD settings can be divided into two parts: those committed ones and non-committed ones.
- For those changes which had been fed to SMU before S3/S4/Runpm suspend kicked, they are committed changes. They should be properly restored and fed to SMU on S3/S4/Runpm resume.
- For those non-committed changes, they are restored only withoutfeeding
Quoted 8 lines
to SMU.
Change-Id Iea7cf7908dfcd919a4d0205e10bff91b1149a440Signed-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 8 +++ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 9 ++++ .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 52++++++++++++++-----
Quoted 18 lines
.../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 12 +++++ 4 files changed, 69 insertions(+), 12 deletions(-)drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1
-0@@ -231,6 +231,7 @@ struct smu_user_dpm_profile {uint32_t power_limit;uint32_t fan_speed_percent;uint32_t flags; +uint32_t committed_od;/* user clock state information */ uint32_t clk_mask[SMU_CLK_COUNT ];@@ -352,6 +353,7 @@ struct smu_table_context
Quoted 5 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct smu_table_context · line 356
Quoted 3 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1
-0void *overdrive_table;void *boot_overdrive_table; +void *committed_overdrive_table;May be rename it to
user_overdrive_table- OD table with user settings?
[Quan, Evan] Actually "overdrive_table " is the user_overdrive_table. It contains all the modification including those not committed( the commit is performed by echo "c" > /sys/class/drm/card1/device/pp_od_clk_voltage). The new member added refers to those user customized but committed only settings. That's why it was named as " committed_overdrive_table". Any good suggestion for the naming?
Quoted 37 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs { · line 625
Quoted 5 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0
-0uint32_t gpu_metrics_table_size;void *gpu_metrics_table;@@ -623,6 +625,12 @@ struct pptable_funcs {enum PP_OD_DPM_TABLE_COMMAND type,
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs {
Quoted 4 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +2
-0long *input, uint32_t size); +/** +* @restore_committed_od_settings: Restore the customized and committed
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs {
Quoted 6 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +4
-0+* OD settings on S3/S4/Runpm resume. +*/ +int (*restore_committed_od_settings)(struct smu_context *smu); +/** * @get_clock_by_type_with_latency: Get the speed and latency of a clock
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void smu_restore_dpm_user_profile(struct
Quoted 7 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0
-0* domain. drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0@@ -416,6 +416,15 @@ static void smu_restore_dpm_user_profile(struct
smu_context*smu)drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void smu_restore_dpm_user_profile(struct smu_context *smu)
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +6
-0} } +/* Restore customized and committed OD settings */ +if (smu->user_dpm_profile.committed_od) { +if (smu->ppt_funcs->restore_committed_od_settings) { + ret = smu->ppt_funcs-restore_committed_od_settings (smu); +if (ret) + dev_err(smu->adev->dev, "Failed to uploadcustomized OD settings\n");
Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void smu_restore_dpm_user_profile(struct smu_context *smu) · line 427
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +3
-0+ } + } +Just thinking if there is a need to handle it ASIC specific. The flags and table pointer are maintained in common structure. So can't we do the restore of user OD settings directly in this common flow instead of having each ASIC to implement the callback?
[Quan, Evan] The OD settings restoring is ASIC specific as it performed on OD table and that(OD table) is ASIC specific.
Quoted 99 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void smu_restore_dpm_user_profile(struct · line 430
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0/* Disable restore flag */ smu->user_dpm_profile.flags &=~SMU_DPM_USER_PROFILE_RESTORE;
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int
Quoted 7 lines
}drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0@@ -2296,39 +2296,45 @@ static int
navi10_set_default_od_settings(struct smu_context *smu)drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-1(OverDriveTable_t *)smu->smu_table.boot_overdrive_table;int ret =0 ; - ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,(void *)od_table, false);
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2299
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+ ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,(void
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+*)boot_od_table, false);if (ret) {dev_err (smu->adev->dev,"Failed to get overdrive table!\n" );return ret;drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-3} -if (!od_table->GfxclkVolt1) { +if (!boot_od_table->GfxclkVolt1) { ret =navi10_overdrive_get_gfx_clk_base_voltage (smu, - &od_table- GfxclkVolt1, - od_table- GfxclkFreq1); +&boot_od_table->GfxclkVolt1,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2311
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+boot_od_table->GfxclkFreq1);drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 12 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-3if (ret)return ret; } -if (!od_table->GfxclkVolt2) { +if (!boot_od_table->GfxclkVolt2) { ret =navi10_overdrive_get_gfx_clk_base_voltage (smu, - &od_table- GfxclkVolt2, - od_table- GfxclkFreq2); +&boot_od_table->GfxclkVolt2,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2321
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+boot_od_table->GfxclkFreq2);drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 12 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-3if (ret)return ret; } -if (!od_table->GfxclkVolt3) { +if (!boot_od_table->GfxclkVolt3) { ret =navi10_overdrive_get_gfx_clk_base_voltage (smu, - &od_table- GfxclkVolt3, - od_table- GfxclkFreq3); +&boot_od_table->GfxclkVolt3,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2331
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+boot_od_table->GfxclkFreq3);drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +3
-2if (ret)return ret; } -memcpy (boot_od_table, od_table,sizeof (OverDriveTable_t)); +navi10_dump_od_table (smu, boot_od_table); -navi10_dump_od_table (smu, od_table); +/* +* For S3/S4/Runpm, no need to install boot od table to
overdrive_tableasdrivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +5
-0+* - either they already share the same OD settings on bootup +* - or they have user customized OD settings +*/ +if (!smu->adev->in_suspend) + memcpy(od_table, boot_od_table,
sizeof(OverDriveTable_t));drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct
Quoted 4 lines
return 0; }drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0@@ -2435,6 +2441,14 @@ static int navi10_od_edit_dpm_table(struct
smu_context*smu, enumPP_OD_DPM_TABLdrivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct · line 2441
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0dev_err(smu->adev->dev, "Failed to importoverdrive table!\n");
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL · line 2445
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-0return ret; } +if (memcmp (table_context->overdrive_table, table_context- boot_overdrive_table, +sizeof (OverDriveTable_t))) {Shouldn't this be - compare against the edited settings and last committed settings,
overdrive_tablevscommitted_overdrive_table?
Quoted 4 lines
Basically,
user_od_tablecan be initialized withboot_odsettings and the flag gives the indication thatuser_odtable is being used or not. Before updating, check if the edited table (overdrive_table) and the currentuser_odtable are different, then commit the new table.
[Quan, Evan] Yes, I also considered that. But that cannot handle the case below:
1 user made some customizations -> 2 the customizations were committed -> 3 user restored to default(boot) OD settings(by "echo 'r'") and committed Although there were some changes between 2 and 3, there is actually no real customized changes compared to default(boot) OD settings.
Quoted 28 lines
Quoted 9 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +6
-0+ smu->user_dpm_profile.committed_od = true; +memcpy (table_context- committed_overdrive_table, table_context->overdrive_table, +sizeof (OverDriveTable_t)); + }else { + smu->user_dpm_profile.committed_od = false; + }break ;Quoted 3 lines
case
PP_OD_EDIT_VDDC_CURVE:
if (!navi10_od_feature_is_supported(od_settings,SMU_11_0_ODCAP_GFXCLK_CURVE)) { @@ -2499,6 +2513,19 @@ static intnavi10_od_edit_dpm_table(struct
smu_context*smu, enumPP_OD_DPM_TABLdrivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL
Quoted 10 lines
return ret; }drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +7
-0+static int navi10_restore_committed_od_settings (struct smu_context +*smu) { +struct smu_table_context *table_context = &smu->smu_table; +void *od_table = table_context->committed_overdrive_table; +int ret =0 ; + + ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,(void *)od_table, true);
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-0+if (ret) + dev_err(smu->adev->dev, "Failed to import overdrivetable!\n");
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL · line 2527
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +3
-0+ +return ret; +}As mentioned before, not sure if this is needed as callback. Even if, this can be something common for smuv11, there is nothing ASIC specific in this logic, right?
[Quan, Evan] Yes, in patch2 of the series, it was made as a SMUV11 common API.
BR
Evan
Quoted 50 lines
Thanks,
Lijodrivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static const struct pptable_funcs
Quoted 4 lines
static int navi10_run_btc(struct smu_context *smu) { int ret = 0;drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0@@ -3262,6 +3289,7 @@ static const struct pptable_funcs
navi10_ppt_funcs= {drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static const struct pptable_funcs · line 3289
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0.set_soft_freq_limited_range =
smu_v11_0_set_soft_freq_limited_range,drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_init_smc_tables(struct
Quoted 13 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-0.set_default_od_settings = navi10_set_default_od_settings, .od_edit_dpm_table = navi10_od_edit_dpm_table, + .restore_committed_od_settings = +navi10_restore_committed_od_settings, .run_btc = navi10_run_btc, .set_power_source = smu_v11_0_set_power_source, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, diff --git
a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.cb/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
index0a5d46ac9ccd..28fc3f17c1b1100644drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +0
-0@@ -422,10 +422,20 @@ int smu_v11_0_init_smc_tables(struct
smu_context*smu)drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_init_smc_tables(struct smu_context *smu)
Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +3
-0ret = -ENOMEM ; goto err3_out; } + + smu_table->committed_overdrive_table = + kzalloc(tables[SMU_TABLE_OVERDRIVE].size,
GFP_KERNEL);drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_fini_smc_tables(struct
Quoted 15 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +7
-0+if (!smu_table->committed_overdrive_table) { + ret = -ENOMEM ; + goto err4_out; + } + }return 0 ; +err4_out: +kfree (smu_table->boot_overdrive_table); err3_out:kfree (smu_table->overdrive_table); err2_out:@@ -442,12 +452,14 @@ int smu_v11_0_fini_smc_tables(struct
smu_context*smu)Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +0
-0struct smu_dpm_context *smu_dpm = &smu->smu_dpm;
Quoted 13 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_fini_smc_tables(struct smu_context *smu) · line 465
Quoted 13 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +2
-0kfree (smu_table->gpu_metrics_table); +kfree (smu_table->committed_overdrive_table);kfree (smu_table->boot_overdrive_table);kfree (smu_table->overdrive_table);kfree (smu_table->max_sustainable_clocks);kfree (smu_table->driver_pptable);kfree (smu_table->clocks_table); smu_table->gpu_metrics_table =NULL ; + smu_table->committed_overdrive_table =NULL ; smu_table->boot_overdrive_table =NULL ; smu_table->overdrive_table =NULL ; smu_table->max_sustainable_clocks =NULL ;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 49 lines · Evan
[AMD Official Use Only]
Quoted 45 lines
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Thursday, July 22, 2021 4:10 PM
To: Quan, Evan <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: Re: [PATCH 1/2] drm/amd/pm: restore user customized OD settings properly for NV1xQuoted 6 lines · Evan Quan
The customized OD settings can be divided into two parts: those committed ones and non-committed ones.
- For those changes which had been fed to SMU before S3/S4/Runpm suspend kicked, they are committed changes. They should be properly restored and fed to SMU on S3/S4/Runpm resume.
- For those non-committed changes, they are restored only withoutfeeding
Quoted 8 lines
to SMU.
Change-Id Iea7cf7908dfcd919a4d0205e10bff91b1149a440Signed-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 8 +++ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 9 ++++ .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 52++++++++++++++-----
Quoted 18 lines
.../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 12 +++++ 4 files changed, 69 insertions(+), 12 deletions(-)drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1
-0@@ -231,6 +231,7 @@ struct smu_user_dpm_profile {uint32_t power_limit;uint32_t fan_speed_percent;uint32_t flags; +uint32_t committed_od;/* user clock state information */ uint32_t clk_mask[SMU_CLK_COUNT ];@@ -352,6 +353,7 @@ struct smu_table_context
Quoted 7 lines
Quoted 5 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct smu_table_context · line 356
Quoted 3 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1
-0void *overdrive_table;void *boot_overdrive_table; +void *committed_overdrive_table;May be rename it to
user_overdrive_table- OD table with user settings?[Quan, Evan] Actually "
overdrive_table" is theuser_overdrive_table. It contains all the modification including those notcommitted( the commit is performed by echo "c" > /sys/class/drm/card1/device/pp_od_clk_voltage). The new member added refers to those user customized but committed only settings. That's why it was named as "committed_overdrive_table". Any good suggestion for the naming?
As far as I understand, the problem is overdrive_table can have intemediary settings as the edit/commit is a two-step process. At any point we can have user_od_table keep the latest user mode settings. That is true when user restores to default settings also; that time we can just copy the boot settings back to user_od table and keep the flag as false indicating that there is no custom settings.
Quoted 45 lines
Quoted 37 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs { · line 625
Quoted 5 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0
-0uint32_t gpu_metrics_table_size;void *gpu_metrics_table;@@ -623,6 +625,12 @@ struct pptable_funcs {enum PP_OD_DPM_TABLE_COMMAND type,
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs {
Quoted 4 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +2
-0long *input, uint32_t size); +/** +* @restore_committed_od_settings: Restore the customized and committed
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs {
Quoted 6 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +4
-0+* OD settings on S3/S4/Runpm resume. +*/ +int (*restore_committed_od_settings)(struct smu_context *smu); +/** * @get_clock_by_type_with_latency: Get the speed and latency of a clock
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void smu_restore_dpm_user_profile(struct
Quoted 7 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0
-0* domain. drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0@@ -416,6 +416,15 @@ static void smu_restore_dpm_user_profile(struct
smu_context*smu)drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void smu_restore_dpm_user_profile(struct smu_context *smu)
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +6
-0} } +/* Restore customized and committed OD settings */ +if (smu->user_dpm_profile.committed_od) { +if (smu->ppt_funcs->restore_committed_od_settings) { + ret = smu->ppt_funcs-restore_committed_od_settings (smu); +if (ret) + dev_err(smu->adev->dev, "Failed to uploadcustomized OD settings\n");
Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void smu_restore_dpm_user_profile(struct smu_context *smu) · line 427
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +3
-0+ } + } +Just thinking if there is a need to handle it ASIC specific. The flags and table pointer are maintained in common structure. So can't we do the restore of user OD settings directly in this common flow instead of having each ASIC to implement the callback?
Quoted 1 line
[Quan, Evan] The OD settings restoring is ASIC specific as it performed on OD table and that(OD table) is ASIC specific.
I was thinking in terms of final logic that is being done. The below structures are available in common table context and we have a common logic to update the table. If there is no custom OD settings available, we could handle it with the flag.
+ struct smu_table_context *table_context = &smu->smu_table;
+ void *od_table = table_context->committed_overdrive_table;
+ int ret = 0;
+
+ ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,
(void *)od_table, true);
Quoted 99 lines
Quoted 99 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void smu_restore_dpm_user_profile(struct · line 430
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0/* Disable restore flag */ smu->user_dpm_profile.flags &=~SMU_DPM_USER_PROFILE_RESTORE;
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int
Quoted 7 lines
}drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0@@ -2296,39 +2296,45 @@ static int
navi10_set_default_od_settings(struct smu_context *smu)drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-1(OverDriveTable_t *)smu->smu_table.boot_overdrive_table;int ret =0 ; - ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,(void *)od_table, false);
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2299
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+ ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,(void
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+*)boot_od_table, false);if (ret) {dev_err (smu->adev->dev,"Failed to get overdrive table!\n" );return ret;drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-3} -if (!od_table->GfxclkVolt1) { +if (!boot_od_table->GfxclkVolt1) { ret =navi10_overdrive_get_gfx_clk_base_voltage (smu, - &od_table- GfxclkVolt1, - od_table- GfxclkFreq1); +&boot_od_table->GfxclkVolt1,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2311
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+boot_od_table->GfxclkFreq1);drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 12 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-3if (ret)return ret; } -if (!od_table->GfxclkVolt2) { +if (!boot_od_table->GfxclkVolt2) { ret =navi10_overdrive_get_gfx_clk_base_voltage (smu, - &od_table- GfxclkVolt2, - od_table- GfxclkFreq2); +&boot_od_table->GfxclkVolt2,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2321
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+boot_od_table->GfxclkFreq2);drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 12 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-3if (ret)return ret; } -if (!od_table->GfxclkVolt3) { +if (!boot_od_table->GfxclkVolt3) { ret =navi10_overdrive_get_gfx_clk_base_voltage (smu, - &od_table- GfxclkVolt3, - od_table- GfxclkFreq3); +&boot_od_table->GfxclkVolt3,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2331
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+boot_od_table->GfxclkFreq3);drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +3
-2if (ret)return ret; } -memcpy (boot_od_table, od_table,sizeof (OverDriveTable_t)); +navi10_dump_od_table (smu, boot_od_table); -navi10_dump_od_table (smu, od_table); +/* +* For S3/S4/Runpm, no need to install boot od table to
overdrive_tableasdrivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +5
-0+* - either they already share the same OD settings on bootup +* - or they have user customized OD settings +*/ +if (!smu->adev->in_suspend) + memcpy(od_table, boot_od_table,
sizeof(OverDriveTable_t));drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct
Quoted 4 lines
return 0; }drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0@@ -2435,6 +2441,14 @@ static int navi10_od_edit_dpm_table(struct
smu_context*smu, enumPP_OD_DPM_TABLdrivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct · line 2441
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0dev_err(smu->adev->dev, "Failed to importoverdrive table!\n");
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL · line 2445
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-0return ret; } +if (memcmp (table_context->overdrive_table, table_context- boot_overdrive_table, +sizeof (OverDriveTable_t))) {Shouldn't this be - compare against the edited settings and last committed settings,
overdrive_tablevscommitted_overdrive_table?
Quoted 7 lines
Quoted 4 lines
Basically,
user_od_tablecan be initialized withboot_odsettings and the flag gives the indication thatuser_odtable is being used or not. Before updating, check if the edited table (overdrive_table) and the currentuser_odtable are different, then commit the new table.[Quan, Evan] Yes, I also considered that. But that cannot handle the case below:
1 user made some customizations -> 2 the customizations were committed -> 3 user restored to default(boot) ODsettings(by "echo 'r'")and committed Although there were some changes between 2 and 3, there is actually no real customized changes compared to default(boot) OD settings.
On restore to default, just copy the boot_table settings to user_od and keep the flag as false. We are using user_od as the latest user preferred settings and overdrive_table is only used for intermediate updates.
The flag decides whether to restore or not, but at any point we can refer the user_od table to look upon the latest preferred user settings (default or custom).
Thanks,
Lijo
Quoted 89 lines
Quoted 28 lines
Quoted 9 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +6
-0+ smu->user_dpm_profile.committed_od = true; +memcpy (table_context- committed_overdrive_table, table_context->overdrive_table, +sizeof (OverDriveTable_t)); + }else { + smu->user_dpm_profile.committed_od = false; + }break ;Quoted 3 lines
case
PP_OD_EDIT_VDDC_CURVE:
if (!navi10_od_feature_is_supported(od_settings,SMU_11_0_ODCAP_GFXCLK_CURVE)) { @@ -2499,6 +2513,19 @@ static intnavi10_od_edit_dpm_table(struct
smu_context*smu, enumPP_OD_DPM_TABLdrivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL
Quoted 10 lines
return ret; }drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +7
-0+static int navi10_restore_committed_od_settings (struct smu_context +*smu) { +struct smu_table_context *table_context = &smu->smu_table; +void *od_table = table_context->committed_overdrive_table; +int ret =0 ; + + ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,(void *)od_table, true);
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-0+if (ret) + dev_err(smu->adev->dev, "Failed to import overdrivetable!\n");
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL · line 2527
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +3
-0+ +return ret; +}As mentioned before, not sure if this is needed as callback. Even if, this can be something common for smuv11, there is nothing ASIC specific in this logic, right?
[Quan, Evan] Yes, in patch2 of the series, it was made as a SMUV11 common API.
BR
EvanQuoted 50 lines
Thanks,
Lijodrivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static const struct pptable_funcs
Quoted 4 lines
static int navi10_run_btc(struct smu_context *smu) { int ret = 0;drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0@@ -3262,6 +3289,7 @@ static const struct pptable_funcs
navi10_ppt_funcs= {drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static const struct pptable_funcs · line 3289
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0.set_soft_freq_limited_range =
smu_v11_0_set_soft_freq_limited_range,drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_init_smc_tables(struct
Quoted 13 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-0.set_default_od_settings = navi10_set_default_od_settings, .od_edit_dpm_table = navi10_od_edit_dpm_table, + .restore_committed_od_settings = +navi10_restore_committed_od_settings, .run_btc = navi10_run_btc, .set_power_source = smu_v11_0_set_power_source, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, diff --git
a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.cb/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
index0a5d46ac9ccd..28fc3f17c1b1100644drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +0
-0@@ -422,10 +422,20 @@ int smu_v11_0_init_smc_tables(struct
smu_context*smu)drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_init_smc_tables(struct smu_context *smu)
Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +3
-0ret = -ENOMEM ; goto err3_out; } + + smu_table->committed_overdrive_table = + kzalloc(tables[SMU_TABLE_OVERDRIVE].size,
GFP_KERNEL);drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_fini_smc_tables(struct
Quoted 15 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +7
-0+if (!smu_table->committed_overdrive_table) { + ret = -ENOMEM ; + goto err4_out; + } + }return 0 ; +err4_out: +kfree (smu_table->boot_overdrive_table); err3_out:kfree (smu_table->overdrive_table); err2_out:@@ -442,12 +452,14 @@ int smu_v11_0_fini_smc_tables(struct
smu_context*smu)Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +0
-0struct smu_dpm_context *smu_dpm = &smu->smu_dpm;
Quoted 13 lines
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +1
-0kfree (smu_table->gpu_metrics_table); +kfree (smu_table->committed_overdrive_table);kfree (smu_table->boot_overdrive_table);kfree (smu_table->overdrive_table);kfree (smu_table->max_sustainable_clocks);Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_fini_smc_tables(struct smu_context *smu) · line 465
Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +1
-0kfree (smu_table->driver_pptable);kfree (smu_table->clocks_table); smu_table->gpu_metrics_table =NULL ; + smu_table->committed_overdrive_table =NULL ; smu_table->boot_overdrive_table =NULL ; smu_table->overdrive_table =NULL ; smu_table->max_sustainable_clocks =NULL ;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only]
Quoted 74 lines
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Thursday, July 22, 2021 5:03 PM
To: Quan, Evan <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: Re: [PATCH 1/2] drm/amd/pm: restore user customized OD settings properly for NV1xQuoted 19 lines · Evan
[AMD Official Use Only]
Quoted 15 lines
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Thursday, July 22, 2021 4:10 PM
To: Quan, Evan <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: Re: [PATCH 1/2] drm/amd/pm: restore user customized OD settings properly for NV1xQuoted 4 lines · Evan Quan
The customized OD settings can be divided into two parts: those committed ones and non-committed ones.
- For those changes which had been fed to SMU before S3/S4/Runpm suspend kicked, they are committed changes. They should beproperly
Quoted 31 lines
Quoted 31 lines
Quoted 3 lines
restored and fed to SMU on S3/S4/Runpm resume.
- For those non-committed changes, they are restored only
withoutfeeding
Quoted 8 lines
to SMU.
Change-Id Iea7cf7908dfcd919a4d0205e10bff91b1149a440Signed-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 8 +++ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 9 ++++ .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 52++++++++++++++-----
Quoted 18 lines
.../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 12 +++++ 4 files changed, 69 insertions(+), 12 deletions(-)drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1
-0@@ -231,6 +231,7 @@ struct smu_user_dpm_profile {uint32_t power_limit;uint32_t fan_speed_percent;uint32_t flags; +uint32_t committed_od;/* user clock state information */ uint32_t clk_mask[SMU_CLK_COUNT]; @@ -352,6 +353,7 @@ struct
smu_table_contextQuoted 6 lines
Quoted 5 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct smu_table_context · line 356
Quoted 3 lines
void *overdrive_table; void *boot_overdrive_table;drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1
-0+void *committed_overdrive_table;May be rename it to
user_overdrive_table- OD table with user settings?[Quan, Evan] Actually "
overdrive_table" is theuser_overdrive_table. Itcontains all the modification including those not
committed( the commit is performed by echo "c" > /sys/class/drm/card1/device/pp_od_clk_voltage).Quoted 1 line
The new member added refers to those user customized but committed
only settings. That's why it was named as "
committed_overdrive_table". Any good suggestion for the naming?
Quoted 6 lines
As far as I understand, the problem is
overdrive_tablecan have intemediary settings as the edit/commit is a two-step process. At any point we can haveuser_od_tablekeep the latest user mode settings. That is true when user restores to default settings also; that time we can just copy the boot settings back touser_odtable and keep the flag as false indicating that there is no custom settings.
[Quan, Evan] For now, on Navi1x the "restores to default settings" is also a two-step process. That will make "copy the boot settings back to user_od table and keep the flag as false" tricky. However, it seems that does not fit original design. As per original design, the "restores to default settings" should be a one-step process. Let me correct them with new patch series and proceed further discussion then.
BR
Evan
Quoted 274 lines
Quoted 19 lines
Quoted 19 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs { · line 625
Quoted 6 lines
uint32_t gpu_metrics_table_size; void *gpu_metrics_table;drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0
-0@@ -623,6 +625,12 @@ struct pptable_funcs {enum PP_OD_DPM_TABLE_COMMAND type,
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs {
Quoted 4 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +2
-0long *input, uint32_t size); +/** +* @restore_committed_od_settings: Restore the customized and committed
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs {
Quoted 6 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +4
-0+* OD settings on S3/S4/Runpm resume. +*/ +int (*restore_committed_od_settings)(struct smu_context *smu); +/** * @get_clock_by_type_with_latency: Get the speed and latency of a clock
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void
Quoted 7 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0
-0* domain. drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0@@ -416,6 +416,15 @@ static voidsmu_restore_dpm_user_profile(struct
Quoted 20 lines
Quoted 12 lines
smu_context*smu)drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void smu_restore_dpm_user_profile(struct smu_context *smu)
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +6
-0} } +/* Restore customized and committed OD settings */ +if (smu->user_dpm_profile.committed_od) { +if (smu->ppt_funcs->restore_committed_od_settings) { + ret = smu->ppt_funcs-restore_committed_od_settings (smu); +if (ret) + dev_err(smu->adev->dev, "Failed to uploadcustomized OD settings\n");
Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void smu_restore_dpm_user_profile(struct smu_context *smu) · line 427
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +3
-0+ } + } +Just thinking if there is a need to handle it ASIC specific. The flags and table pointer are maintained in common structure. So can't we do the restore of user OD settings directly in this common flow instead of having each ASIC to implement the callback?
Quoted 1 line
[Quan, Evan] The OD settings restoring is ASIC specific as it performed on
OD table and that(OD table) is ASIC specific.
I was thinking in terms of final logic that is being done. The below structures are available in common table context and we have a common logic to update the table. If there is no custom OD settings available, we could handle it with the flag.
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +5
-0+struct smu_table_context *table_context = &smu->smu_table; +void *od_table = table_context->committed_overdrive_table; +int ret =0 ; + + ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,(void *)od_table, true);
Quoted 99 lines
Quoted 99 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void · line 430
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0/* Disable restore flag */ smu->user_dpm_profile.flags &=~SMU_DPM_USER_PROFILE_RESTORE;
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int
Quoted 7 lines
}drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0@@ -2296,39 +2296,45 @@ static int
navi10_set_default_od_settings(struct smu_context *smu)drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-1(OverDriveTable_t *)smu->smu_table.boot_overdrive_table;int ret =0 ; - ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,(void *)od_table, false);
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2299
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+ ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,(void
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+*)boot_od_table, false);if (ret) {dev_err (smu->adev->dev,"Failed to get overdrive table!\n" );return ret;drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-3} -if (!od_table->GfxclkVolt1) { +if (!boot_od_table->GfxclkVolt1) { ret =navi10_overdrive_get_gfx_clk_base_voltage (smu, - &od_table- GfxclkVolt1, - od_table- GfxclkFreq1); +&boot_od_table->GfxclkVolt1,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2311
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+boot_od_table->GfxclkFreq1);drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 12 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-3if (ret)return ret; } -if (!od_table->GfxclkVolt2) { +if (!boot_od_table->GfxclkVolt2) { ret =navi10_overdrive_get_gfx_clk_base_voltage (smu, - &od_table- GfxclkVolt2, - od_table- GfxclkFreq2); +&boot_od_table->GfxclkVolt2,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2321
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+boot_od_table->GfxclkFreq2);drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 12 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-3if (ret)return ret; } -if (!od_table->GfxclkVolt3) { +if (!boot_od_table->GfxclkVolt3) { ret =navi10_overdrive_get_gfx_clk_base_voltage (smu, - &od_table- GfxclkVolt3, - od_table- GfxclkFreq3); +&boot_od_table->GfxclkVolt3,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2331
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+boot_od_table->GfxclkFreq3);drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +3
-2if (ret)return ret; } -memcpy (boot_od_table, od_table,sizeof (OverDriveTable_t)); +navi10_dump_od_table (smu, boot_od_table); -navi10_dump_od_table (smu, od_table); +/* +* For S3/S4/Runpm, no need to install boot od table to
overdrive_tableasdrivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +5
-0+* - either they already share the same OD settings on bootup +* - or they have user customized OD settings +*/ +if (!smu->adev->in_suspend) + memcpy(od_table, boot_od_table,
sizeof(OverDriveTable_t));drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct
Quoted 4 lines
return 0; }drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0@@ -2435,6 +2441,14 @@ static int navi10_od_edit_dpm_table(struct
smu_context*smu, enumPP_OD_DPM_TABLdrivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct · line 2441
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0dev_err(smu->adev->dev, "Failed to importoverdrive table!\n");
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL · line 2445
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-0return ret; } +if (memcmp (table_context->overdrive_table, table_context- boot_overdrive_table, +sizeof (OverDriveTable_t))) {Shouldn't this be - compare against the edited settings and last committed settings,
overdrive_tablevscommitted_overdrive_table?Quoted 5 lines
Quoted 4 lines
Basically,
user_od_tablecan be initialized withboot_odsettings and the flag gives the indication thatuser_odtable is being used or not. Before updating, check if the edited table (overdrive_table) and the currentuser_odtable are different, then commit the new table.[Quan, Evan] Yes, I also considered that. But that cannot handle the case
below:
Quoted 2 lines
1 user made some customizations -> 2 the customizations were committed -> 3 user restored to default(boot) OD
settings(by "echo 'r'")and committed Although there were some changes between 2 and 3, there is actually no real customized changes compared to default(boot) OD settings.
On restore to default, just copy the
boot_tablesettings touser_odand keep the flag as false. We are usinguser_odas the latest user preferred settings andoverdrive_tableis only used for intermediate updates.The flag decides whether to restore or not, but at any point we can refer the
user_odtable to look upon the latest preferred user settings (default or custom).Thanks,
LijoQuoted 12 lines
Quoted 12 lines
Quoted 9 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +6
-0+ smu->user_dpm_profile.committed_od = true; +memcpy (table_context- committed_overdrive_table, table_context->overdrive_table, +sizeof (OverDriveTable_t)); + }else { + smu->user_dpm_profile.committed_od = false; + }break ;Quoted 3 lines
case
PP_OD_EDIT_VDDC_CURVE:
if (!navi10_od_feature_is_supported(od_settings,SMU_11_0_ODCAP_GFXCLK_CURVE)) { @@ -2499,6 +2513,19 @@ staticint
Quoted 1 line
Quoted 1 line
navi10_od_edit_dpm_table(struct
smu_context*smu, enum
PP_OD_DPM_TABLQuoted 14 lines
Quoted 14 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL
Quoted 10 lines
return ret; }drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +7
-0+static int navi10_restore_committed_od_settings (struct smu_context +*smu) { +struct smu_table_context *table_context = &smu->smu_table; +void *od_table = table_context->committed_overdrive_table; +int ret =0 ; + + ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,(void *)od_table, true);
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-0+if (ret) + dev_err(smu->adev->dev, "Failed to import overdrivetable!\n");
Quoted 8 lines
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL · line 2527
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +3
-0+ +return ret; +}As mentioned before, not sure if this is needed as callback. Even if, this can be something common for smuv11, there is nothing ASIC specific in this logic, right?
[Quan, Evan] Yes, in patch2 of the series, it was made as a SMUV11
common API.
Quoted 53 lines
BR
EvanQuoted 50 lines
Thanks,
Lijodrivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static const struct pptable_funcs
Quoted 4 lines
static int navi10_run_btc(struct smu_context *smu) { int ret = 0;drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0@@ -3262,6 +3289,7 @@ static const struct pptable_funcs
navi10_ppt_funcs= {drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static const struct pptable_funcs · line 3289
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0.set_soft_freq_limited_range =
smu_v11_0_set_soft_freq_limited_range,drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_init_smc_tables(struct
Quoted 13 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-0.set_default_od_settings = navi10_set_default_od_settings, .od_edit_dpm_table = navi10_od_edit_dpm_table, + .restore_committed_od_settings = +navi10_restore_committed_od_settings, .run_btc = navi10_run_btc, .set_power_source = smu_v11_0_set_power_source, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, diff --git
a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.cb/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
index0a5d46ac9ccd..28fc3f17c1b1100644drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +0
-0@@ -422,10 +422,20 @@ int smu_v11_0_init_smc_tables(struct
smu_context*smu)drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_init_smc_tables(struct smu_context *smu)
Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +3
-0ret = -ENOMEM ; goto err3_out; } + + smu_table->committed_overdrive_table = + kzalloc(tables[SMU_TABLE_OVERDRIVE].size,
GFP_KERNEL);drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_fini_smc_tables(struct
Quoted 15 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +7
-0+if (!smu_table->committed_overdrive_table) { + ret = -ENOMEM ; + goto err4_out; + } + }return 0 ; +err4_out: +kfree (smu_table->boot_overdrive_table); err3_out:kfree (smu_table->overdrive_table); err2_out:@@ -442,12 +452,14 @@ int smu_v11_0_fini_smc_tables(struct
smu_context*smu)Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +0
-0struct smu_dpm_context *smu_dpm = &smu->smu_dpm;
Quoted 13 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +1
-0kfree (smu_table->gpu_metrics_table); +kfree (smu_table->committed_overdrive_table);kfree (smu_table->boot_overdrive_table);kfree (smu_table->overdrive_table);kfree (smu_table->max_sustainable_clocks);Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_fini_smc_tables(struct smu_context *smu) · line 465
Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +1
-0kfree (smu_table->driver_pptable);kfree (smu_table->clocks_table); smu_table->gpu_metrics_table =NULL ; + smu_table->committed_overdrive_table =NULL ; smu_table->boot_overdrive_table =NULL ; smu_table->overdrive_table =NULL ; smu_table->max_sustainable_clocks =NULL ;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only]
Hi Lijo,
Sorry, I doubled checked. The implementation of Navi1x is right.
The original design for "restores to default settings" is a two-step process.
That means for "case PP_OD_COMMIT_DPM_TABLE:" we must distinguish whether it's an usual customized od setting update or just restoring to defaults. And my current implementation for that is as below. Any comments?
+ if (memcmp(table_context->overdrive_table, table_context->boot_overdrive_table,
+ sizeof(OverDriveTable_t))) {
+ smu->user_dpm_profile.committed_od = true;
+ memcpy(table_context->committed_overdrive_table, table_context->overdrive_table,+ sizeof(OverDriveTable_t));
+ } else {
+ smu->user_dpm_profile.committed_od = false;
+ }
BR
Evan
Quoted 397 lines
-----Original Message-----
From: Quan, Evan
Sent: Friday, July 23, 2021 2:48 PM
To: Lazar, Lijo <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: RE: [PATCH 1/2] drm/amd/pm: restore user customized OD settings properly for NV1x[AMD Official Use Only]
Quoted 10 lines
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Thursday, July 22, 2021 5:03 PM
To: Quan, Evan <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: Re: [PATCH 1/2] drm/amd/pm: restore user customized OD settings properly for NV1xQuoted 9 lines
Quoted 8 lines · Evan
[AMD Official Use Only]
Quoted 4 lines
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Thursday, July 22, 2021 4:10 PM
To: Quan, Evan <[email protected]>; amd-Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Cc: Deucher, Alexander <[email protected]>
Subject: Re: [PATCH 1/2] drm/amd/pm: restore user customized OD settings properly for NV1xQuoted 3 lines · Evan Quan
The customized OD settings can be divided into two parts: those committed ones and non-committed ones.
- For those changes which had been fed to SMU beforeS3/S4/Runpm
Quoted 29 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
suspend kicked, they are committed changes. They should be
properly
Quoted 27 lines
Quoted 27 lines
Quoted 3 lines
restored and fed to SMU on S3/S4/Runpm resume.
- For those non-committed changes, they are restored only
withoutfeeding
Quoted 8 lines
to SMU.
Change-Id Iea7cf7908dfcd919a4d0205e10bff91b1149a440Signed-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 8 +++ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 9 ++++ .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 52++++++++++++++-----
Quoted 14 lines
.../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 12 +++++ 4 files changed, 69 insertions(+), 12 deletions(-)drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1
-0@@ -231,6 +231,7 @@ struct smu_user_dpm_profile {uint32_t power_limit;uint32_t fan_speed_percent;uint32_t flags; +uint32_t committed_od;Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct smu_user_dpm_profile { · line 237
Quoted 2 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0
-0/* user clock state information */ uint32_t clk_mask[SMU_CLK_COUNT]; @@ -352,6 +353,7@@ struct
Quoted 11 lines
Quoted 9 lines
Quoted 7 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct smu_table_context · line 356
Quoted 5 lines
smu_table_contextvoid *overdrive_table; void *boot_overdrive_table;drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1
-0+void *committed_overdrive_table;May be rename it to
user_overdrive_table- OD table with user settings?[Quan, Evan] Actually "
overdrive_table" is theuser_overdrive_table. Itcontains all the modification including those not committed( the commit is performed by echo "c" >
/sys/class/drm/card1/device/pp_od_clk_voltage).Quoted 10 lines
Quoted 1 line
The new member added refers to those user customized but committed
only settings. That's why it was named as "
committed_overdrive_table". Any good suggestion for the naming?As far as I understand, the problem is
overdrive_tablecan have intemediary settings as the edit/commit is a two-step process. At any point we can haveuser_od_tablekeep the latest user mode settings. That is true when user restores to default settings also; that time we can just copy the boot settings back touser_odtable and keep the flag as false indicating that there is no custom settings.[Quan, Evan] For now, on Navi1x the "restores to default settings" is also a two-step process. That will make "copy the boot settings back to
user_odtable and keep the flag as false" tricky. However, it seems that does not fit original design. As per original design, the "restores to default settings" should be a one-step process. Let me correct them with new patch series and proceed further discussion then.BR
EvanQuoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs { · line 625
Quoted 6 lines
uint32_t gpu_metrics_table_size; void *gpu_metrics_table;drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0
-0@@ -623,6 +625,12 @@ struct pptable_funcs { enum
PP_OD_DPM_TABLE_COMMANDQuoted 6 lines
Quoted 6 lines
Quoted 6 lines
type,
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs {
Quoted 4 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +2
-0long *input, uint32_t size); +/** +* @restore_committed_od_settings: Restore the customized and committed
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs {
Quoted 6 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +4
-0+* OD settings on S3/S4/Runpm resume. +*/ +int (*restore_committed_od_settings)(struct smu_context *smu); +/** * @get_clock_by_type_with_latency: Get the speed and latency
Quoted 58 lines
Quoted 9 lines
Quoted 9 lines
Quoted 1 line
of
a clock
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void
Quoted 7 lines
* domain.
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0@@ -416,6 +416,15 @@ static voidsmu_restore_dpm_user_profile(struct
Quoted 20 lines
Quoted 12 lines
smu_context*smu)drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void smu_restore_dpm_user_profile(struct smu_context *smu)
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +6
-0} } +/* Restore customized and committed OD settings */ +if (smu->user_dpm_profile.committed_od) { +if (smu->ppt_funcs->restore_committed_od_settings) { + ret = smu->ppt_funcs-restore_committed_od_settings (smu); +if (ret) + dev_err(smu->adev->dev, "Failed to uploadcustomized OD settings\n");
Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void smu_restore_dpm_user_profile(struct smu_context *smu) · line 427
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +3
-0+ } + } +Just thinking if there is a need to handle it ASIC specific. The flags and table pointer are maintained in common structure. So can't we do the restore of user OD settings directly in this common flow instead of having each ASIC to implement the callback?
Quoted 2 lines
[Quan, Evan] The OD settings restoring is ASIC specific as it performed on
OD table and that(OD table) is ASIC specific.
I was thinking in terms of final logic that is being done. The below structures are available in common table context and we have a common logic to update the table. If there is no custom OD settings available, we could handle it with the flag.
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +5
-0+struct smu_table_context *table_context = &smu->smu_table; +void *od_table = table_context->committed_overdrive_table; +int ret =0 ; + + ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,(void *)od_table, true);
Quoted 12 lines
Quoted 12 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void · line 430
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0/* Disable restore flag */ smu->user_dpm_profile.flags &=~SMU_DPM_USER_PROFILE_RESTORE;
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int
Quoted 7 lines
}drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0@@ -2296,39 +2296,45 @@ static int
navi10_set_default_od_settings(struct smu_context *smu)Quoted 11 lines
Quoted 1 line
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2296
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0(OverDriveTable_t *)smu-smu_table.boot_overdrive_table;
Quoted 9 lines
Quoted 9 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-1int ret =0 ; - ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,(void *)od_table, false);
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2299
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+ ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,(void
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+*)boot_od_table, false);if (ret) { dev_err(smu->adev->dev, "Failed to get overdrivetable!\n");
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-1return ret; } -if (!od_table->GfxclkVolt1) { +if (!boot_od_table->GfxclkVolt1) { ret =navi10_overdrive_get_gfx_clk_base_voltage(smu,
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2310
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-2- &od_table- GfxclkVolt1, - od_table- GfxclkFreq1); +&boot_od_table->GfxclkVolt1,Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
boot_od_table->GfxclkFreq1);drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-1if (ret)return ret; } -if (!od_table->GfxclkVolt2) { +if (!boot_od_table->GfxclkVolt2) { ret =navi10_overdrive_get_gfx_clk_base_voltage(smu,
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2320
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-2- &od_table- GfxclkVolt2, - od_table- GfxclkFreq2); +&boot_od_table->GfxclkVolt2,Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
boot_od_table->GfxclkFreq2);drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-1if (ret)return ret; } -if (!od_table->GfxclkVolt3) { +if (!boot_od_table->GfxclkVolt3) { ret =navi10_overdrive_get_gfx_clk_base_voltage(smu,
Quoted 45 lines
Quoted 45 lines
Quoted 45 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2330
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-2- &od_table- GfxclkVolt3, - od_table- GfxclkFreq3); +&boot_od_table->GfxclkVolt3,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2331
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+boot_od_table->GfxclkFreq3);drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +3
-2if (ret)return ret; } -memcpy (boot_od_table, od_table,sizeof (OverDriveTable_t)); +navi10_dump_od_table (smu, boot_od_table); -navi10_dump_od_table (smu, od_table); +/* +* For S3/S4/Runpm, no need to install boot od table to
overdrive_tableasdrivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +5
-0+* - either they already share the same OD settings on bootup +* - or they have user customized OD settings +*/ +if (!smu->adev->in_suspend) + memcpy(od_table, boot_od_table,
sizeof(OverDriveTable_t));drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct
Quoted 4 lines
return 0; }drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0@@ -2435,6 +2441,14 @@ static int navi10_od_edit_dpm_table(struct
smu_context*smu, enumPP_OD_DPM_TABLdrivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct · line 2441
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0dev_err(smu->adev->dev, "Failed to importoverdrive table!\n");
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL · line 2445
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-0return ret; } +if (memcmp (table_context->overdrive_table, table_context- boot_overdrive_table, +sizeof (OverDriveTable_t))) {Shouldn't this be - compare against the edited settings and last committed settings,
overdrive_tablevscommitted_overdrive_table?Basically,
user_od_tablecan be initialized withboot_odsettings and the flag gives the indication thatuser_odtable is being used or not. Before updating, check if the edited table (overdrive_table) and the currentuser_odtable are different, then commit the new table.Quoted 7 lines
Quoted 2 lines
[Quan, Evan] Yes, I also considered that. But that cannot handle the case
below:
Quoted 3 lines
1 user made some customizations -> 2 the customizations were committed -> 3 user restored to default(boot) OD
settings(by "echo 'r'")and committed Although there were some changes between 2 and 3,
there
Quoted 1 line
is actually no real customized changes compared to default(boot) OD
settings.
Quoted 4 lines
On restore to default, just copy the
boot_tablesettings touser_odand keep the flag as false. We are usinguser_odas the latest user preferred settings andoverdrive_tableis only used for intermediateupdates.
Quoted 9 lines
The flag decides whether to restore or not, but at any point we can refer the
user_odtable to look upon the latest preferred user settings (default or custom).Thanks,
LijoQuoted 1 line
Quoted 1 line
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +6
-0+ smu->user_dpm_profile.committed_od = true; +memcpy (table_context- committed_overdrive_table, table_context->overdrive_table, +sizeof (OverDriveTable_t)); + }else { + smu->user_dpm_profile.committed_od = false; + }break ;case
PP_OD_EDIT_VDDC_CURVE:
if (!navi10_od_feature_is_supported(od_settings,SMU_11_0_ODCAP_GFXCLK_CURVE)) { @@ -2499,6 +2513,19 @@static
Quoted 40 lines
int
Quoted 1 line
Quoted 1 line
navi10_od_edit_dpm_table(struct
smu_context*smu, enum
PP_OD_DPM_TABLQuoted 15 lines
Quoted 15 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL
Quoted 11 lines
return ret; }drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +8
-0+static int navi10_restore_committed_od_settings (struct +smu_context +*smu) { +struct smu_table_context *table_context = &smu->smu_table; +void *od_table = table_context->committed_overdrive_table; +int ret =0 ; + + ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,(void *)od_table, true);
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-0+if (ret) + dev_err(smu->adev->dev, "Failed to import overdrivetable!\n");
Quoted 8 lines
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL · line 2527
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +3
-0+ +return ret; +}As mentioned before, not sure if this is needed as callback. Even if, this can be something common for smuv11, there is nothing ASIC specific in this logic, right?
[Quan, Evan] Yes, in patch2 of the series, it was made as a SMUV11
common API.
Quoted 13 lines
BR
EvanQuoted 10 lines
Thanks,
Lijodrivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static const struct pptable_funcs
Quoted 4 lines
static int navi10_run_btc(struct smu_context *smu) { int ret = 0;drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0@@ -3262,6 +3289,7 @@ static const struct pptable_funcs
navi10_ppt_funcs= {Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0.set_soft_freq_limited_range =Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
smu_v11_0_set_soft_freq_limited_range,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static const struct pptable_funcs navi10_ppt_funcs = { · line 3295
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-0.set_default_od_settings = navi10_set_default_od_settings, .od_edit_dpm_table = navi10_od_edit_dpm_table, + .restore_committed_od_settings = +navi10_restore_committed_od_settings, .run_btc = navi10_run_btc, .set_power_source = smu_v11_0_set_power_source, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask,diff --git
Quoted 32 lines
Quoted 32 lines
Quoted 32 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_init_smc_tables(struct
Quoted 6 lines
a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.cb/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
index0a5d46ac9ccd..28fc3f17c1b1100644drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +0
-0@@ -422,10 +422,20 @@ int smu_v11_0_init_smc_tables(struct
smu_context*smu)drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_init_smc_tables(struct smu_context *smu)
Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +3
-0ret = -ENOMEM ; goto err3_out; } + + smu_table->committed_overdrive_table = + kzalloc(tables[SMU_TABLE_OVERDRIVE].size,
GFP_KERNEL);drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_fini_smc_tables(struct
Quoted 15 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +7
-0+if (!smu_table->committed_overdrive_table) { + ret = -ENOMEM ; + goto err4_out; + } + }return 0 ; +err4_out: +kfree (smu_table->boot_overdrive_table); err3_out:kfree (smu_table->overdrive_table); err2_out:@@ -442,12 +452,14 @@ int smu_v11_0_fini_smc_tables(struct
smu_context*smu)Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +0
-0struct smu_dpm_context *smu_dpm = &smu->smu_dpm;
Quoted 13 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +1
-0kfree (smu_table->gpu_metrics_table); +kfree (smu_table->committed_overdrive_table);kfree (smu_table->boot_overdrive_table);kfree (smu_table->overdrive_table);kfree (smu_table->max_sustainable_clocks);Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_fini_smc_tables(struct smu_context *smu) · line 465
Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +1
-0kfree (smu_table->driver_pptable);kfree (smu_table->clocks_table); smu_table->gpu_metrics_table =NULL ; + smu_table->committed_overdrive_table =NULL ; smu_table->boot_overdrive_table =NULL ; smu_table->overdrive_table =NULL ; smu_table->max_sustainable_clocks =NULL ;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[Public]
Hi Evan,
In that case, using "od_edit" table for the intermediate table
During commit command, what if it's done like
1) Copy and update table if od_edit table is different than user_od table
2) Set the flag to false if od_edit table and boot_od table are different
Then current od settings may always be picked from user_od table and the flag may be used to distinguish if it's boot od settings or custom settings (for restore or other purposes).
Thanks,
Lijo
-----Original Message-----
From: Quan, Evan <[email protected]>
Sent: Friday, July 23, 2021 12:51 PM
To: Lazar, Lijo <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: RE: [PATCH 1/2] drm/amd/pm: restore user customized OD settings properly for NV1x
[AMD Official Use Only]
Hi Lijo,
Sorry, I doubled checked. The implementation of Navi1x is right.
The original design for "restores to default settings" is a two-step process.
That means for "case PP_OD_COMMIT_DPM_TABLE:" we must distinguish whether it's an usual customized od setting update or just restoring to defaults. And my current implementation for that is as below. Any comments?
+ if (memcmp(table_context->overdrive_table, table_context->boot_overdrive_table,
+ sizeof(OverDriveTable_t))) {
+ smu->user_dpm_profile.committed_od = true;
+ memcpy(table_context->committed_overdrive_table, table_context->overdrive_table,+ sizeof(OverDriveTable_t));
+ } else {
+ smu->user_dpm_profile.committed_od = false;
+ }
BR
Evan
Quoted 398 lines
-----Original Message-----
From: Quan, Evan
Sent: Friday, July 23, 2021 2:48 PM
To: Lazar, Lijo <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: RE: [PATCH 1/2] drm/amd/pm: restore user customized OD settings properly for NV1x[AMD Official Use Only]
Quoted 10 lines
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Thursday, July 22, 2021 5:03 PM
To: Quan, Evan <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: Re: [PATCH 1/2] drm/amd/pm: restore user customized OD settings properly for NV1xQuoted 9 lines
Quoted 8 lines · Evan
[AMD Official Use Only]
Quoted 4 lines
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Thursday, July 22, 2021 4:10 PM
To: Quan, Evan <[email protected]>; amd-Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Cc: Deucher, Alexander <[email protected]>
Subject: Re: [PATCH 1/2] drm/amd/pm: restore user customized OD settings properly for NV1xQuoted 3 lines · Evan Quan
The customized OD settings can be divided into two parts: those committed ones and non-committed ones.
- For those changes which had been fed to SMU beforeS3/S4/Runpm
Quoted 29 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
suspend kicked, they are committed changes. They should be
properly
Quoted 27 lines
Quoted 27 lines
Quoted 3 lines
restored and fed to SMU on S3/S4/Runpm resume.
- For those non-committed changes, they are restored only
withoutfeeding
Quoted 8 lines
to SMU.
Change-Id Iea7cf7908dfcd919a4d0205e10bff91b1149a440Signed-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 8 +++ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 9 ++++ .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 52++++++++++++++-----
Quoted 14 lines
.../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 12 +++++ 4 files changed, 69 insertions(+), 12 deletions(-)drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1
-0@@ -231,6 +231,7 @@ struct smu_user_dpm_profile {uint32_t power_limit;uint32_t fan_speed_percent;uint32_t flags; +uint32_t committed_od;Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct smu_user_dpm_profile { · line 237
Quoted 2 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0
-0/* user clock state information */ uint32_t clk_mask[SMU_CLK_COUNT]; @@ -352,6 +353,7@@ struct
Quoted 11 lines
Quoted 9 lines
Quoted 7 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct smu_table_context · line 356
Quoted 5 lines
smu_table_contextvoid *overdrive_table; void *boot_overdrive_table;drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1
-0+void *committed_overdrive_table;May be rename it to
user_overdrive_table- OD table with user settings?[Quan, Evan] Actually "
overdrive_table" is theuser_overdrive_table. Itcontains all the modification including those not committed( the commit is performed by echo "c" >
/sys/class/drm/card1/device/pp_od_clk_voltage).Quoted 10 lines
Quoted 1 line
The new member added refers to those user customized but committed
only settings. That's why it was named as "
committed_overdrive_table". Any good suggestion for the naming?As far as I understand, the problem is
overdrive_tablecan have intemediary settings as the edit/commit is a two-step process. At any point we can haveuser_od_tablekeep the latest user mode settings. That is true when user restores to default settings also; that time we can just copy the boot settings back touser_odtable and keep the flag as false indicating that there is no custom settings.[Quan, Evan] For now, on Navi1x the "restores to default settings" is
also a two-step process. That will make "copy the boot settings back
touser_odtable and keep the flag as false" tricky. However, it seems
that does not fit original design. As per original design, the "restores to default settings" should be a one-step process. Let me correct them with new patch
series and proceed further discussion then.BR
EvanQuoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs { · line 625
Quoted 6 lines
uint32_t gpu_metrics_table_size; void *gpu_metrics_table;drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0
-0@@ -623,6 +625,12 @@ struct pptable_funcs { enum
PP_OD_DPM_TABLE_COMMANDQuoted 6 lines
Quoted 6 lines
Quoted 6 lines
type,
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs {
Quoted 4 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +2
-0long *input, uint32_t size); +/** +* @restore_committed_od_settings: Restore the customized and committed
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs {
Quoted 6 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +4
-0+* OD settings on S3/S4/Runpm resume. +*/ +int (*restore_committed_od_settings)(struct smu_context *smu); +/** * @get_clock_by_type_with_latency: Get the speed and latency
Quoted 58 lines
Quoted 9 lines
Quoted 9 lines
Quoted 1 line
of
a clock
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void
Quoted 7 lines
* domain.
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0@@ -416,6 +416,15 @@ static voidsmu_restore_dpm_user_profile(struct
Quoted 20 lines
Quoted 12 lines
smu_context*smu)drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void smu_restore_dpm_user_profile(struct smu_context *smu)
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +6
-0} } +/* Restore customized and committed OD settings */ +if (smu->user_dpm_profile.committed_od) { +if (smu->ppt_funcs->restore_committed_od_settings) { + ret = smu->ppt_funcs-restore_committed_od_settings (smu); +if (ret) + dev_err(smu->adev->dev, "Failed to uploadcustomized OD settings\n");
Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void smu_restore_dpm_user_profile(struct smu_context *smu) · line 427
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +3
-0+ } + } +Just thinking if there is a need to handle it ASIC specific. The flags and table pointer are maintained in common structure. So can't we do the restore of user OD settings directly in this common flow instead of having each ASIC to implement the callback?
Quoted 2 lines
[Quan, Evan] The OD settings restoring is ASIC specific as it performed on
OD table and that(OD table) is ASIC specific.
I was thinking in terms of final logic that is being done. The below structures are available in common table context and we have a common logic to update the table. If there is no custom OD settings available, we could handle it with the flag.
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +5
-0+struct smu_table_context *table_context = &smu->smu_table; +void *od_table = table_context->committed_overdrive_table; +int ret =0 ; + + ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,(void *)od_table, true);
Quoted 12 lines
Quoted 12 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void · line 430
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0/* Disable restore flag */ smu->user_dpm_profile.flags &=~SMU_DPM_USER_PROFILE_RESTORE;
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int
Quoted 7 lines
}drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0@@ -2296,39 +2296,45 @@ static int
navi10_set_default_od_settings(struct smu_context *smu)Quoted 11 lines
Quoted 1 line
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2296
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0(OverDriveTable_t *)smu-smu_table.boot_overdrive_table;
Quoted 9 lines
Quoted 9 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-1int ret =0 ; - ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,(void *)od_table, false);
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2299
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+ ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,(void
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+*)boot_od_table, false);if (ret) { dev_err(smu->adev->dev, "Failed to get overdrivetable!\n");
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-1return ret; } -if (!od_table->GfxclkVolt1) { +if (!boot_od_table->GfxclkVolt1) { ret =navi10_overdrive_get_gfx_clk_base_voltage(smu,
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2310
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-2- &od_table- GfxclkVolt1, - od_table- GfxclkFreq1); +&boot_od_table->GfxclkVolt1,Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
boot_od_table->GfxclkFreq1);drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-1if (ret)return ret; } -if (!od_table->GfxclkVolt2) { +if (!boot_od_table->GfxclkVolt2) { ret =navi10_overdrive_get_gfx_clk_base_voltage(smu,
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2320
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-2- &od_table- GfxclkVolt2, - od_table- GfxclkFreq2); +&boot_od_table->GfxclkVolt2,Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
boot_od_table->GfxclkFreq2);drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-1if (ret)return ret; } -if (!od_table->GfxclkVolt3) { +if (!boot_od_table->GfxclkVolt3) { ret =navi10_overdrive_get_gfx_clk_base_voltage(smu,
Quoted 46 lines
Quoted 46 lines
Quoted 46 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2330
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-2- &od_table- GfxclkVolt3, - od_table- GfxclkFreq3); +&boot_od_table->GfxclkVolt3,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2331
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+boot_od_table->GfxclkFreq3);drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +3
-2if (ret)return ret; } -memcpy (boot_od_table, od_table,sizeof (OverDriveTable_t)); +navi10_dump_od_table (smu, boot_od_table); -navi10_dump_od_table (smu, od_table); +/* +* For S3/S4/Runpm, no need to install boot od table to
overdrive_tableasdrivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_set_default_od_settings(struct smu_context *smu)
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +5
-0+* - either they already share the same OD settings on bootup +* - or they have user customized OD settings +*/ +if (!smu->adev->in_suspend) + memcpy(od_table, boot_od_table,
sizeof(OverDriveTable_t));Quoted 5 lines
return 0; }drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0@@ -2435,6 +2441,14 @@ static intnavi10_od_edit_dpm_table(struct
smu_context*smu, enumPP_OD_DPM_TABLQuoted 1 line
dev_err(smu->adev->dev, "Failed to importoverdrive table!\n");
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL · line 2445
Quoted 5 lines
return ret; }drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+ if (memcmp(table_context->overdrive_table, table_context-
boot_overdrive_table,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+ sizeof(OverDriveTable_t))) {Shouldn't this be - compare against the edited settings and last committed settings,
overdrive_tablevscommitted_overdrive_table?Basically,
user_od_tablecan be initialized withboot_odsettings and the flag gives the indication thatuser_odtable is being used or not. Before updating, check if the edited table (overdrive_table) and the currentuser_odtable are different, then commit the new table.Quoted 7 lines
Quoted 2 lines
[Quan, Evan] Yes, I also considered that. But that cannot handle the case
below:
Quoted 3 lines
1 user made some customizations -> 2 the customizations were committed -> 3 user restored to default(boot) OD
settings(by "echo 'r'")and committed Although there were some changes between 2 and 3,
there
Quoted 1 line
is actually no real customized changes compared to default(boot) OD
settings.
Quoted 4 lines
On restore to default, just copy the
boot_tablesettings touser_odand keep the flag as false. We are usinguser_odas the latest user preferred settings andoverdrive_tableis only used for intermediateupdates.
Quoted 9 lines
The flag decides whether to restore or not, but at any point we can refer the
user_odtable to look upon the latest preferred user settings (default or custom).Thanks,
LijoQuoted 1 line
Quoted 1 line
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-0+ smu->user_dpm_profile.committed_od = true; + memcpy(table_context-
committed_overdrive_table,table_context->overdrive_table,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +4
-0+ sizeof(OverDriveTable_t)); + } else { + smu->user_dpm_profile.committed_od = false; + }break ;case PP_OD_EDIT_VDDC_CURVE : if (!navi10_od_feature_is_supported(od_settings,
SMU_11_0_ODCAP_GFXCLK_CURVE)) { @@ -2499,6 +2513,19 @@static
Quoted 40 lines
int
Quoted 1 line
Quoted 1 line
navi10_od_edit_dpm_table(struct
smu_context*smu, enum
PP_OD_DPM_TABLQuoted 15 lines
Quoted 15 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL
Quoted 11 lines
return ret; }drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +8
-0+static int navi10_restore_committed_od_settings (struct +smu_context +*smu) { +struct smu_table_context *table_context = &smu->smu_table; +void *od_table = table_context->committed_overdrive_table; +int ret =0 ; + + ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,(void *)od_table, true);
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-0+if (ret) + dev_err(smu->adev->dev, "Failed to import overdrivetable!\n");
Quoted 8 lines
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL · line 2527
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +3
-0+ +return ret; +}As mentioned before, not sure if this is needed as callback. Even if, this can be something common for smuv11, there is nothing ASIC specific in this logic, right?
[Quan, Evan] Yes, in patch2 of the series, it was made as a SMUV11
common API.
Quoted 13 lines
BR
EvanQuoted 10 lines
Thanks,
Lijodrivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static const struct pptable_funcs
Quoted 4 lines
static int navi10_run_btc(struct smu_context *smu) { int ret = 0;drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0@@ -3262,6 +3289,7 @@ static const struct pptable_funcs
navi10_ppt_funcs= {Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0.set_soft_freq_limited_range =Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
smu_v11_0_set_soft_freq_limited_range,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static const struct pptable_funcs navi10_ppt_funcs = { · line 3295
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-0.set_default_od_settings = navi10_set_default_od_settings, .od_edit_dpm_table = navi10_od_edit_dpm_table, + .restore_committed_od_settings = +navi10_restore_committed_od_settings, .run_btc = navi10_run_btc, .set_power_source = smu_v11_0_set_power_source, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask,diff --git
Quoted 32 lines
Quoted 32 lines
Quoted 32 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_init_smc_tables(struct
Quoted 6 lines
a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.cb/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
index0a5d46ac9ccd..28fc3f17c1b1100644drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +0
-0@@ -422,10 +422,20 @@ int smu_v11_0_init_smc_tables(struct
smu_context*smu)drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_init_smc_tables(struct smu_context *smu)
Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +3
-0ret = -ENOMEM ; goto err3_out; } + + smu_table->committed_overdrive_table = + kzalloc(tables[SMU_TABLE_OVERDRIVE].size,
GFP_KERNEL);drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_fini_smc_tables(struct
Quoted 15 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +7
-0+if (!smu_table->committed_overdrive_table) { + ret = -ENOMEM ; + goto err4_out; + } + }return 0 ; +err4_out: +kfree (smu_table->boot_overdrive_table); err3_out:kfree (smu_table->overdrive_table); err2_out:@@ -442,12 +452,14 @@ int smu_v11_0_fini_smc_tables(struct
smu_context*smu)Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +0
-0struct smu_dpm_context *smu_dpm = &smu->smu_dpm;
Quoted 13 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +1
-0kfree (smu_table->gpu_metrics_table); +kfree (smu_table->committed_overdrive_table);kfree (smu_table->boot_overdrive_table);kfree (smu_table->overdrive_table);kfree (smu_table->max_sustainable_clocks);Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_fini_smc_tables(struct smu_context *smu) · line 465
Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +1
-0kfree (smu_table->driver_pptable);kfree (smu_table->clocks_table); smu_table->gpu_metrics_table =NULL ; + smu_table->committed_overdrive_table =NULL ; smu_table->boot_overdrive_table =NULL ; smu_table->overdrive_table =NULL ; smu_table->max_sustainable_clocks =NULL ;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[Public]
I probably get your point. Please check the update V2.
BR
Evan
Quoted 482 lines
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Friday, July 23, 2021 3:39 PM
To: Quan, Evan <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: RE: [PATCH 1/2] drm/amd/pm: restore user customized OD settings properly for NV1x[Public]
Hi Evan,
In that case, using "
od_edit" table for the intermediate tableDuring commit command, what if it's done like
1) Copy and update table ifod_edittable is different thanuser_od
table
2) Set the flag to false ifod_edittable andboot_odtable are
differentThen current od settings may always be picked from
user_odtable and the flag may be used to distinguish if it's boot od settings or custom settings (for restore or other purposes).Thanks,
Lijo-----Original Message-----
From: Quan, Evan <[email protected]>
Sent: Friday, July 23, 2021 12:51 PM
To: Lazar, Lijo <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: RE: [PATCH 1/2] drm/amd/pm: restore user customized OD settings properly for NV1x[AMD Official Use Only]
Hi Lijo,
Sorry, I doubled checked. The implementation of Navi1x is right. The original design for "restores to default settings" is a two-step process. That means for "case
PP_OD_COMMIT_DPM_TABLE:" we must distinguish whether it's an usual customized od setting update or just restoring to defaults.
And my current implementation for that is as below. Any comments?+ if (memcmp(table_context->overdrive_table, table_context-
Quoted 1 line
boot_overdrive_table,(quoted diff) +3
-0+ sizeof(OverDriveTable_t))) { + smu->user_dpm_profile.committed_od = true; + memcpy(table_context->committed_overdrive_table,
table_context->overdrive_table,(quoted diff) +4
-0+ sizeof(OverDriveTable_t)); + } else { + smu->user_dpm_profile.committed_od = false; + }BR
EvanQuoted 72 lines
-----Original Message-----
From: Quan, Evan
Sent: Friday, July 23, 2021 2:48 PM
To: Lazar, Lijo <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: RE: [PATCH 1/2] drm/amd/pm: restore user customized OD settings properly for NV1x[AMD Official Use Only]
Quoted 10 lines
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Thursday, July 22, 2021 5:03 PM
To: Quan, Evan <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: Re: [PATCH 1/2] drm/amd/pm: restore user customized OD settings properly for NV1xQuoted 9 lines
Quoted 8 lines · Evan
[AMD Official Use Only]
Quoted 4 lines
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Thursday, July 22, 2021 4:10 PM
To: Quan, Evan <[email protected]>; amd-Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Cc: Deucher, Alexander <[email protected]>
Subject: Re: [PATCH 1/2] drm/amd/pm: restore user customized OD settings properly for NV1xQuoted 3 lines · Evan Quan
The customized OD settings can be divided into two parts: those committed ones and non-committed ones.
- For those changes which had been fed to SMU beforeS3/S4/Runpm
Quoted 29 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
suspend kicked, they are committed changes. They should be
properly
Quoted 27 lines
Quoted 27 lines
Quoted 3 lines
restored and fed to SMU on S3/S4/Runpm resume.
- For those non-committed changes, they are restored only
withoutfeeding
Quoted 8 lines
to SMU.
Change-Id Iea7cf7908dfcd919a4d0205e10bff91b1149a440Signed-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 8 +++ drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 9 ++++ .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 52++++++++++++++-----
Quoted 14 lines
.../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 12 +++++ 4 files changed, 69 insertions(+), 12 deletions(-)drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1
-0@@ -231,6 +231,7 @@ struct smu_user_dpm_profile {uint32_t power_limit;uint32_t fan_speed_percent;uint32_t flags; +uint32_t committed_od;Quoted 10 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct smu_user_dpm_profile { · line 237
Quoted 2 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0
-0/* user clock state information */ uint32_t clk_mask[SMU_CLK_COUNT]; @@ -352,6 +353,7@@ struct
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h
Quoted 5 lines
smu_table_contextvoid *overdrive_table; void *boot_overdrive_table;drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1
-0+void *committed_overdrive_table;May be rename it to
user_overdrive_table- OD table with usersettings?
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
[Quan, Evan] Actually "
overdrive_table" is theuser_overdrive_table. Itcontains all the modification including those not committed( the commit is performed by echo "c" >
/sys/class/drm/card1/device/pp_od_clk_voltage).Quoted 1 line
Quoted 1 line
The new member added refers to those user customized but
committed
Quoted 9 lines
Quoted 9 lines
only settings. That's why it was named as "
committed_overdrive_table". Any good suggestion for the naming?As far as I understand, the problem is
overdrive_tablecan have intemediary settings as the edit/commit is a two-step process. At any point we can haveuser_od_tablekeep the latest user mode settings. That is true when user restores to default settings also; that time we can just copy the boot settings back touser_odtable and keep the flag as false indicating that there is no custom settings.Quoted 4 lines
[Quan, Evan] For now, on Navi1x the "restores to default settings" is also a two-step process. That will make "copy the boot settings back to
user_odtable and keep the flag as false" tricky. However, it seems that does not fit original design. As per original design, the "restores todefault settings"
Quoted 12 lines
should be a one-step process. Let me correct them with new patch series and proceed further discussion then.
BR
EvanQuoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs { · line 625
Quoted 6 lines
uint32_t gpu_metrics_table_size; void *gpu_metrics_table;drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +0
-0@@ -623,6 +625,12 @@ struct pptable_funcs { enum
PP_OD_DPM_TABLE_COMMANDQuoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
type,
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs { · line 629
Quoted 4 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +2
-0long *input, uint32_t size); +/** +* @restore_committed_od_settings: Restore the customized and
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
committed
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs { · line 632
Quoted 3 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +3
-0+* OD settings on S3/S4/Runpm resume. +*/ + int (*restore_committed_od_settings)(struct smu_context*smu);
Quoted 18 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h struct pptable_funcs { · line 635
Quoted 3 lines
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +1
-0+/** * @get_clock_by_type_with_latency: Get the speed and latency
Quoted 14 lines
Quoted 9 lines
Quoted 9 lines
Quoted 1 line
of
a clock
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void
Quoted 7 lines
* domain.
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0@@ -416,6 +416,15 @@ static voidsmu_restore_dpm_user_profile(struct
Quoted 4 lines
Quoted 4 lines
smu_context*smu)Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0} }Quoted 8 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void · line 421
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +3
-0+/* Restore customized and committed OD settings */ +if (smu->user_dpm_profile.committed_od) { + if (smu->ppt_funcs-
restore_committed_od_settings) {Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void · line 425
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +3
-0+ ret = smu->ppt_funcs-restore_committed_od_settings (smu); +if (ret) + dev_err(smu->adev->dev, "Failed toupload
Quoted 37 lines
Quoted 37 lines
Quoted 11 lines
Quoted 9 lines
customized OD settings\n");
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void · line 428
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +3
-0+ } + } +Just thinking if there is a need to handle it ASIC specific. The flags and table pointer are maintained in common structure. So can't we do the restore of user OD settings directly in this common flow instead of having each ASIC to implement the callback?
[Quan, Evan] The OD settings restoring is ASIC specific as it performed on
OD table and that(OD table) is ASIC specific.
I was thinking in terms of final logic that is being done. The below structures are available in common table context and we have a common logic to update the table. If there is no custom OD settings available, we could handle it with the flag.
(quoted diff) +5
-0+ struct smu_table_context *table_context = &smu->smu_table; + void *od_table = table_context->committed_overdrive_table; + int ret = 0; + + ret = smu_cmn_update_table(smu, SMU_TABLE_OVERDRIVE, 0,(void *)od_table, true);
Quoted 12 lines
Quoted 12 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static void · line 430
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0
-0/* Disable restore flag */ smu->user_dpm_profile.flags &=~SMU_DPM_USER_PROFILE_RESTORE;
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int
Quoted 7 lines
}drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0@@ -2296,39 +2296,45 @@ static int
navi10_set_default_od_settings(struct smu_context *smu)Quoted 5 lines
Quoted 5 lines
Quoted 1 line
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2296
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0(OverDriveTable_t *)smu-smu_table.boot_overdrive_table;
Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2299
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-1int ret =0 ; - ret = smu_cmn_update_table(smu,
SMU_TABLE_OVERDRIVE, 0,Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
(void *)od_table, false);
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2299
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+ ret = smu_cmn_update_table(smu,
SMU_TABLE_OVERDRIVE, 0,Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
(void
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+*)boot_od_table, false);if (ret) { dev_err(smu->adev->dev, "Failed to get overdriveQuoted 9 lines
table!\n");
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2307
Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-1return ret; } -if (!od_table->GfxclkVolt1) { +if (!boot_od_table->GfxclkVolt1) { ret =navi10_overdrive_get_gfx_clk_base_voltage(smu,
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-1-&od_table-Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2309
Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-1GfxclkVolt1, -od_table-
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2310
Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0GfxclkFreq1); +&boot_od_table->GfxclkVolt1,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2311
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+boot_od_table->GfxclkFreq1);Quoted 9 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2317
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-1if (ret)return ret; } -if (!od_table->GfxclkVolt2) { +if (!boot_od_table->GfxclkVolt2) { ret =navi10_overdrive_get_gfx_clk_base_voltage(smu,
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-1-&od_table-Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2319
Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-1GfxclkVolt2, -od_table-
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2320
Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0GfxclkFreq2); +&boot_od_table->GfxclkVolt2,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2321
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+boot_od_table->GfxclkFreq2);Quoted 9 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2327
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-1if (ret)return ret; } -if (!od_table->GfxclkVolt3) { +if (!boot_od_table->GfxclkVolt3) { ret =navi10_overdrive_get_gfx_clk_base_voltage(smu,
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-1-&od_table-Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2329
Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-1GfxclkVolt3, -od_table-
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2330
Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0GfxclkFreq3); +&boot_od_table->GfxclkVolt3,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 2331
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+boot_od_table->GfxclkFreq3);drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-1if (ret)return ret; } - memcpy(boot_od_table, od_table,
sizeof(OverDriveTable_t));Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +3
-1+navi10_dump_od_table (smu, boot_od_table); -navi10_dump_od_table (smu, od_table); +/* +* For S3/S4/Runpm, no need to install boot od table to
overdrive_tableasdrivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+* - either they already share the same OD settings on bootup
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +4
-0+* - or they have user customized OD settings +*/ +if (!smu->adev->in_suspend) + memcpy(od_table, boot_od_table,
sizeof(OverDriveTable_t));Quoted 5 lines
return 0; }drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0@@ -2435,6 +2441,14 @@ static intnavi10_od_edit_dpm_table(struct
smu_context*smu, enumPP_OD_DPM_TABLQuoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 1 line
dev_err(smu->adev->dev, "Failed to importoverdrive table!\n");
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
Quoted 3 lines
return ret; }drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+ if (memcmp(table_context->overdrive_table,table_context-
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
Quoted 2 lines
boot_overdrive_table,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+ sizeof(OverDriveTable_t))) {Shouldn't this be - compare against the edited settings and last committed settings,
overdrive_tablevscommitted_overdrive_table?Basically,
user_od_tablecan be initialized withboot_odsettings and the flag gives the indication thatuser_odtable is being used ornot.
Quoted 22 lines
Quoted 9 lines
Quoted 4 lines
Quoted 2 lines
Before updating, check if the edited table (
overdrive_table) and the currentuser_odtable are different, then commit the new table.[Quan, Evan] Yes, I also considered that. But that cannot handle the case
below:
Quoted 3 lines
1 user made some customizations -> 2 the customizations were committed -> 3 user restored to default(boot) OD
settings(by "echo 'r'")and committed Although there were some changes between 2 and 3,
there
Quoted 1 line
is actually no real customized changes compared to default(boot) OD
settings.
Quoted 4 lines
On restore to default, just copy the
boot_tablesettings touser_odand keep the flag as false. We are usinguser_odas the latest user preferred settings andoverdrive_tableis only used for intermediateupdates.
Quoted 5 lines
The flag decides whether to restore or not, but at any point we can refer the
user_odtable to look upon the latest preferred user settings (default or custom).Quoted 5 lines
Quoted 5 lines
Thanks,
LijoQuoted 2 lines
Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+ smu->user_dpm_profile.committed_od =true;
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+ memcpy(table_context-
committed_overdrive_table,table_context->overdrive_table,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +3
-0+ sizeof(OverDriveTable_t)); + }else { + smu->user_dpm_profile.committed_od =false;
Quoted 17 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+ }break ;case PP_OD_EDIT_VDDC_CURVE : if (!navi10_od_feature_is_supported(od_settings,
SMU_11_0_ODCAP_GFXCLK_CURVE)) { @@ -2499,6 +2513,19 @@static
Quoted 10 lines
int
Quoted 1 line
Quoted 1 line
navi10_od_edit_dpm_table(struct
smu_context*smu, enum
PP_OD_DPM_TABLQuoted 7 lines
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
Quoted 7 lines
return ret; }drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +4
-0+static int navi10_restore_committed_od_settings (struct +smu_context +*smu) { + struct smu_table_context *table_context = &smu-
smu_table;Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-0+ void *od_table = table_context-
committed_overdrive_table;Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +3
-0+int ret =0 ; + + ret = smu_cmn_update_table(smu,
SMU_TABLE_OVERDRIVE, 0,Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
(void *)od_table, true);
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-0+if (ret) + dev_err(smu->adev->dev, "Failed to importoverdrive
Quoted 64 lines
Quoted 23 lines
Quoted 9 lines
Quoted 8 lines
table!\n");
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +3
-0+ +return ret; +}As mentioned before, not sure if this is needed as callback. Even if, this can be something common for smuv11, there is nothing ASIC specific in this logic, right?
[Quan, Evan] Yes, in patch2 of the series, it was made as a SMUV11
common API.
Quoted 13 lines
BR
EvanQuoted 10 lines
Thanks,
Lijodrivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static const struct pptable_funcs
Quoted 4 lines
static int navi10_run_btc(struct smu_context *smu) { int ret = 0;drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0@@ -3262,6 +3289,7 @@ static const struct pptable_funcs
navi10_ppt_funcs= {Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +0
-0.set_soft_freq_limited_range =Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
smu_v11_0_set_soft_freq_limited_range,drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static const struct pptable_funcs
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2
-0.set_default_od_settings = navi10_set_default_od_settings, .od_edit_dpm_table = navi10_od_edit_dpm_table, + .restore_committed_od_settings = +navi10_restore_committed_od_settings, .run_btc = navi10_run_btc, .set_power_source = smu_v11_0_set_power_source, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask,diff --git
Quoted 32 lines
Quoted 32 lines
Quoted 32 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_init_smc_tables(struct
Quoted 6 lines
a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.cb/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
index0a5d46ac9ccd..28fc3f17c1b1100644drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +0
-0@@ -422,10 +422,20 @@ int smu_v11_0_init_smc_tables(struct
smu_context*smu)drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_init_smc_tables(struct · line 427
Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +3
-0ret = -ENOMEM ; goto err3_out; } + + smu_table->committed_overdrive_table = + kzalloc(tables[SMU_TABLE_OVERDRIVE].size,
GFP_KERNEL);drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_fini_smc_tables(struct
Quoted 15 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +7
-0+if (!smu_table->committed_overdrive_table) { + ret = -ENOMEM ; + goto err4_out; + } + }return 0 ; +err4_out: +kfree (smu_table->boot_overdrive_table); err3_out:kfree (smu_table->overdrive_table); err2_out:@@ -442,12 +452,14 @@ int smu_v11_0_fini_smc_tables(struct
smu_context*smu)Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +0
-0struct smu_dpm_context *smu_dpm = &smu->smu_dpm;
Quoted 13 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +1
-0kfree (smu_table->gpu_metrics_table); +kfree (smu_table->committed_overdrive_table);kfree (smu_table->boot_overdrive_table);kfree (smu_table->overdrive_table);kfree (smu_table->max_sustainable_clocks);Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c int smu_v11_0_fini_smc_tables(struct · line 465
Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +1
-0kfree (smu_table->driver_pptable);kfree (smu_table->clocks_table); smu_table->gpu_metrics_table =NULL ; + smu_table->committed_overdrive_table =NULL ; smu_table->boot_overdrive_table =NULL ; smu_table->overdrive_table =NULL ; smu_table->max_sustainable_clocks =NULL ;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 11 lines · Evan Quan
The customized OD settings can be divided into two parts: those committed ones and non-committed ones.
- For those changes which had been fed to SMU before S3/S4/Runpm suspend kicked, they are committed changes. They should be properly restored and fed to SMU on S3/S4/Runpm resume.
- For those non-committed changes, they are restored only without feeding to SMU.Change-Id Iea7cf7908dfcd919a4d0205e10bff91b1149a440Signed-off-by Evan Quan <[email protected]>---
It's been a while since I've been through the SMU code so I don't know all the places that restore_uesr_profile is used, but, just to confirm, these would still go back to default (boot) values on a GPU reset, yes?
I ask because when pushing OD settings too far, GPU resets are often encountered, and you might be able to create a state where it would continually reset if your OD settings are remembered even through a full reset.
Very nice feature other than that, though, as I actually keep radeontop open in a tmux session to prevent my secondary card from resetting my OD settings, so this will be nice.
Thanks for listening, and for the driver in general, Matt
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only]
Thanks for reminder. As I confirmed, the OD settings will be reset to default after gpu reset. As smu->adev->in_suspend is 0 during gpu reset. And that will reset OD settings to default.
BR
Evan
Quoted 31 lines
-----Original Message-----
From: Matt Coffin <[email protected]>
Sent: Saturday, July 24, 2021 4:00 AM
To: Quan, Evan <[email protected]>
Cc: [email protected]
Subject: Re: [PATCH 1/2] drm/amd/pm: restore user customized OD settings properly for NV1xQuoted 6 lines · Evan Quan
The customized OD settings can be divided into two parts: those committed ones and non-committed ones.
- For those changes which had been fed to SMU before S3/S4/Runpm suspend kicked, they are committed changes. They should be properly restored and fed to SMU on S3/S4/Runpm resume.
- For those non-committed changes, they are restored only withoutfeeding
Quoted 5 lines
to SMU.
Change-Id Iea7cf7908dfcd919a4d0205e10bff91b1149a440Signed-off-by Evan Quan <[email protected]>---
It's been a while since I've been through the SMU code so I don't know all the places that
restore_uesr_profileis used, but, just to confirm, these would still go back to default (boot) values on a GPU reset, yes?I ask because when pushing OD settings too far, GPU resets are often encountered, and you might be able to create a state where it would continually reset if your OD settings are remembered even through a full reset.
Quoted 5 lines
Very nice feature other than that, though, as I actually keep
radeontopopen in a tmux session to prevent my secondary card from resetting my OD settings, so this will be nice.Thanks for listening, and for the driver in general, Matt
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx