Use driver table structure for gpu metrics in smuv11. The default cache interval is set at 5ms.
Signed-off-by: Lijo Lazar <[email protected]> --- drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 2 + .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 16 ++++--- .../amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 15 ++++--- .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 33 +++++++++----- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 16 ++++--- .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 3 +- .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 44 ++++++++++++------- 7 files changed, 83 insertions(+), 46 deletions(-) diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h index 23ab75b705b6..e5c04da15b6f 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +++ b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h @@ -41,6 +41,8 @@ #define SMU_CUSTOM_FAN_SPEED_RPM (1 << 1) #define SMU_CUSTOM_FAN_SPEED_PWM (1 << 2) +#define SMU_GPU_METRICS_CACHE_INTERVAL 5 + // Power Throttlers #define SMU_THROTTLER_PPT0_BIT 0 #define SMU_THROTTLER_PPT1_BIT 1 diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c index 4fff78da81ff..dca4b2836696 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c @@ -251,6 +251,7 @@ static int arcturus_tables_init(struct smu_context *smu) { struct smu_table_context *smu_table = &smu->smu_table; struct smu_table *tables = smu_table->tables; + int ret; SMU_TABLE_INIT(tables, SMU_TABLE_PPTABLE, sizeof(PPTable_t), PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM); @@ -273,11 +274,12 @@ static int arcturus_tables_init(struct smu_context *smu) return -ENOMEM; smu_table->metrics_time = 0; - smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v1_3); - smu_table->gpu_metrics_table = kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL); - if (!smu_table->gpu_metrics_table) { + ret = smu_driver_table_init(smu, SMU_DRIVER_TABLE_GPU_METRICS, + sizeof(struct gpu_metrics_v1_3), + SMU_GPU_METRICS_CACHE_INTERVAL); + if (ret) { kfree(smu_table->metrics_table); - return -ENOMEM; + return ret; } return 0; @@ -1874,9 +1876,9 @@ static uint16_t arcturus_get_current_pcie_link_speed(struct smu_context *smu) static ssize_t arcturus_get_gpu_metrics(struct smu_context *smu, void **table) { - struct smu_table_context *smu_table = &smu->smu_table; struct gpu_metrics_v1_3 *gpu_metrics = - (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table; + (struct gpu_metrics_v1_3 *)smu_driver_table_ptr( + smu, SMU_DRIVER_TABLE_GPU_METRICS); SmuMetrics_t metrics; int ret = 0; @@ -1930,6 +1932,8 @@ static ssize_t arcturus_get_gpu_metrics(struct smu_context *smu, *table = (void *)gpu_metrics; + smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS); + return sizeof(struct gpu_metrics_v1_3); } diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c index 55401e6b2b0b..276d7559a2d3 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c @@ -88,6 +88,7 @@ static int cyan_skillfish_tables_init(struct smu_context *smu) { struct smu_table_context *smu_table = &smu->smu_table; struct smu_table *tables = smu_table->tables; + int ret; SMU_TABLE_INIT(tables, SMU_TABLE_SMU_METRICS, sizeof(SmuMetrics_t), @@ -98,9 +99,10 @@ static int cyan_skillfish_tables_init(struct smu_context *smu) if (!smu_table->metrics_table) goto err0_out; - smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v2_2); - smu_table->gpu_metrics_table = kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL); - if (!smu_table->gpu_metrics_table) + ret = smu_driver_table_init(smu, SMU_DRIVER_TABLE_GPU_METRICS, + sizeof(struct gpu_metrics_v2_2), + SMU_GPU_METRICS_CACHE_INTERVAL); + if (ret) goto err1_out; smu_table->metrics_time = 0; @@ -108,7 +110,6 @@ static int cyan_skillfish_tables_init(struct smu_context *smu) return 0; err1_out: - smu_table->gpu_metrics_table_size = 0; kfree(smu_table->metrics_table); err0_out: return -ENOMEM; @@ -384,9 +385,9 @@ static bool cyan_skillfish_is_dpm_running(struct smu_context *smu) static ssize_t cyan_skillfish_get_gpu_metrics(struct smu_context *smu, void **table) { - struct smu_table_context *smu_table = &smu->smu_table; struct gpu_metrics_v2_2 *gpu_metrics = - (struct gpu_metrics_v2_2 *)smu_table->gpu_metrics_table; + (struct gpu_metrics_v2_2 *)smu_driver_table_ptr( + smu, SMU_DRIVER_TABLE_GPU_METRICS); SmuMetrics_t metrics; int i, ret = 0; @@ -433,6 +434,8 @@ static ssize_t cyan_skillfish_get_gpu_metrics(struct smu_context *smu, *table = (void *)gpu_metrics; + smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS); + return sizeof(struct gpu_metrics_v2_2); } diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c index 7c9f77124ab2..4822e446468e 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c @@ -495,8 +495,8 @@ static int navi10_tables_init(struct smu_context *smu) { struct smu_table_context *smu_table = &smu->smu_table; struct smu_table *tables = smu_table->tables; - struct smu_table *dummy_read_1_table = - &smu_table->dummy_read_1_table; + struct smu_table *dummy_read_1_table = &smu_table->dummy_read_1_table; + int ret; SMU_TABLE_INIT(tables, SMU_TABLE_PPTABLE, sizeof(PPTable_t), PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM); @@ -526,9 +526,10 @@ static int navi10_tables_init(struct smu_context *smu) goto err0_out; smu_table->metrics_time = 0; - smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v1_3); - smu_table->gpu_metrics_table = kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL); - if (!smu_table->gpu_metrics_table) + ret = smu_driver_table_init(smu, SMU_DRIVER_TABLE_GPU_METRICS, + sizeof(struct gpu_metrics_v1_3), + SMU_GPU_METRICS_CACHE_INTERVAL); + if (ret) goto err1_out; smu_table->watermarks_table = kzalloc(sizeof(Watermarks_t), GFP_KERNEL); @@ -545,7 +546,7 @@ static int navi10_tables_init(struct smu_context *smu) err3_out: kfree(smu_table->watermarks_table); err2_out: - kfree(smu_table->gpu_metrics_table); + smu_driver_table_fini(smu, SMU_DRIVER_TABLE_GPU_METRICS); err1_out: kfree(smu_table->metrics_table); err0_out: @@ -2964,7 +2965,8 @@ static ssize_t navi10_get_legacy_gpu_metrics(struct smu_context *smu, { struct smu_table_context *smu_table = &smu->smu_table; struct gpu_metrics_v1_3 *gpu_metrics = - (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table; + (struct gpu_metrics_v1_3 *)smu_driver_table_ptr( + smu, SMU_DRIVER_TABLE_GPU_METRICS); SmuMetrics_legacy_t metrics; int ret = 0; @@ -3026,6 +3028,8 @@ static ssize_t navi10_get_legacy_gpu_metrics(struct smu_context *smu, *table = (void *)gpu_metrics; + smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS); + return sizeof(struct gpu_metrics_v1_3); } @@ -3172,7 +3176,8 @@ static ssize_t navi10_get_gpu_metrics(struct smu_context *smu, { struct smu_table_context *smu_table = &smu->smu_table; struct gpu_metrics_v1_3 *gpu_metrics = - (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table; + (struct gpu_metrics_v1_3 *)smu_driver_table_ptr( + smu, SMU_DRIVER_TABLE_GPU_METRICS); SmuMetrics_t metrics; int ret = 0; @@ -3236,6 +3241,8 @@ static ssize_t navi10_get_gpu_metrics(struct smu_context *smu, *table = (void *)gpu_metrics; + smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS); + return sizeof(struct gpu_metrics_v1_3); } @@ -3244,7 +3251,8 @@ static ssize_t navi12_get_legacy_gpu_metrics(struct smu_context *smu, { struct smu_table_context *smu_table = &smu->smu_table; struct gpu_metrics_v1_3 *gpu_metrics = - (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table; + (struct gpu_metrics_v1_3 *)smu_driver_table_ptr( + smu, SMU_DRIVER_TABLE_GPU_METRICS); SmuMetrics_NV12_legacy_t metrics; int ret = 0; @@ -3311,6 +3319,8 @@ static ssize_t navi12_get_legacy_gpu_metrics(struct smu_context *smu, *table = (void *)gpu_metrics; + smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS); + return sizeof(struct gpu_metrics_v1_3); } @@ -3319,7 +3329,8 @@ static ssize_t navi12_get_gpu_metrics(struct smu_context *smu, { struct smu_table_context *smu_table = &smu->smu_table; struct gpu_metrics_v1_3 *gpu_metrics = - (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table; + (struct gpu_metrics_v1_3 *)smu_driver_table_ptr( + smu, SMU_DRIVER_TABLE_GPU_METRICS); SmuMetrics_NV12_t metrics; int ret = 0; @@ -3388,6 +3399,8 @@ static ssize_t navi12_get_gpu_metrics(struct smu_context *smu, *table = (void *)gpu_metrics; + smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS); + return sizeof(struct gpu_metrics_v1_3); } diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c index 774283ac7827..a0dc585877fe 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c @@ -533,6 +533,7 @@ static int sienna_cichlid_tables_init(struct smu_context *smu) struct smu_table_context *smu_table = &smu->smu_table; struct smu_table *tables = smu_table->tables; int table_size; + int ret; table_size = get_table_size(smu); SMU_TABLE_INIT(tables, SMU_TABLE_PPTABLE, table_size, @@ -560,9 +561,10 @@ static int sienna_cichlid_tables_init(struct smu_context *smu) goto err0_out; smu_table->metrics_time = 0; - smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v1_3); - smu_table->gpu_metrics_table = kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL); - if (!smu_table->gpu_metrics_table) + ret = smu_driver_table_init(smu, SMU_DRIVER_TABLE_GPU_METRICS, + sizeof(struct gpu_metrics_v1_3), + SMU_GPU_METRICS_CACHE_INTERVAL); + if (ret) goto err1_out; smu_table->watermarks_table = kzalloc(sizeof(Watermarks_t), GFP_KERNEL); @@ -585,7 +587,7 @@ static int sienna_cichlid_tables_init(struct smu_context *smu) err3_out: kfree(smu_table->watermarks_table); err2_out: - kfree(smu_table->gpu_metrics_table); + smu_driver_table_fini(smu, SMU_DRIVER_TABLE_GPU_METRICS); err1_out: kfree(smu_table->metrics_table); err0_out: @@ -2674,9 +2676,9 @@ static void sienna_cichlid_i2c_control_fini(struct smu_context *smu) static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu, void **table) { - struct smu_table_context *smu_table = &smu->smu_table; struct gpu_metrics_v1_3 *gpu_metrics = - (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table; + (struct gpu_metrics_v1_3 *)smu_driver_table_ptr( + smu, SMU_DRIVER_TABLE_GPU_METRICS); SmuMetricsExternal_t metrics_external; SmuMetrics_t *metrics = &(metrics_external.SmuMetrics); @@ -2825,6 +2827,8 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu, *table = (void *)gpu_metrics; + smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS); + return sizeof(struct gpu_metrics_v1_3); } diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c index b0d6487171d7..32055e6c313f 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c @@ -428,14 +428,13 @@ int smu_v11_0_fini_smc_tables(struct smu_context *smu) struct smu_table_context *smu_table = &smu->smu_table; struct smu_dpm_context *smu_dpm = &smu->smu_dpm; - kfree(smu_table->gpu_metrics_table); + smu_driver_table_fini(smu, SMU_DRIVER_TABLE_GPU_METRICS); kfree(smu_table->user_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->user_overdrive_table = NULL; smu_table->boot_overdrive_table = NULL; smu_table->overdrive_table = NULL; diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c index 9626da2dba58..f2b9f2e3c2df 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c @@ -225,6 +225,7 @@ static int vangogh_tables_init(struct smu_context *smu) { struct smu_table_context *smu_table = &smu->smu_table; struct smu_table *tables = smu_table->tables; + int ret; SMU_TABLE_INIT(tables, SMU_TABLE_WATERMARKS, sizeof(Watermarks_t), PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM); @@ -242,11 +243,12 @@ static int vangogh_tables_init(struct smu_context *smu) goto err0_out; smu_table->metrics_time = 0; - smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v2_2); - smu_table->gpu_metrics_table_size = max(smu_table->gpu_metrics_table_size, sizeof(struct gpu_metrics_v2_3)); - smu_table->gpu_metrics_table_size = max(smu_table->gpu_metrics_table_size, sizeof(struct gpu_metrics_v2_4)); - smu_table->gpu_metrics_table = kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL); - if (!smu_table->gpu_metrics_table) + ret = smu_driver_table_init(smu, SMU_DRIVER_TABLE_GPU_METRICS, + max3(sizeof(struct gpu_metrics_v2_2), + sizeof(struct gpu_metrics_v2_3), + sizeof(struct gpu_metrics_v2_4)), + SMU_GPU_METRICS_CACHE_INTERVAL); + if (ret) goto err1_out; smu_table->watermarks_table = kzalloc(sizeof(Watermarks_t), GFP_KERNEL); @@ -262,7 +264,7 @@ static int vangogh_tables_init(struct smu_context *smu) err3_out: kfree(smu_table->watermarks_table); err2_out: - kfree(smu_table->gpu_metrics_table); + smu_driver_table_fini(smu, SMU_DRIVER_TABLE_GPU_METRICS); err1_out: kfree(smu_table->metrics_table); err0_out: @@ -1652,9 +1654,9 @@ static int vangogh_set_watermarks_table(struct smu_context *smu, static ssize_t vangogh_get_legacy_gpu_metrics_v2_3(struct smu_context *smu, void **table) { - struct smu_table_context *smu_table = &smu->smu_table; struct gpu_metrics_v2_3 *gpu_metrics = - (struct gpu_metrics_v2_3 *)smu_table->gpu_metrics_table; + (struct gpu_metrics_v2_3 *)smu_driver_table_ptr( + smu, SMU_DRIVER_TABLE_GPU_METRICS); SmuMetrics_legacy_t metrics; int ret = 0; @@ -1703,15 +1705,17 @@ static ssize_t vangogh_get_legacy_gpu_metrics_v2_3(struct smu_context *smu, *table = (void *)gpu_metrics; + smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS); + return sizeof(struct gpu_metrics_v2_3); } static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu, void **table) { - struct smu_table_context *smu_table = &smu->smu_table; struct gpu_metrics_v2_2 *gpu_metrics = - (struct gpu_metrics_v2_2 *)smu_table->gpu_metrics_table; + (struct gpu_metrics_v2_2 *)smu_driver_table_ptr( + smu, SMU_DRIVER_TABLE_GPU_METRICS); SmuMetrics_legacy_t metrics; int ret = 0; @@ -1760,15 +1764,17 @@ static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu, *table = (void *)gpu_metrics; + smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS); + return sizeof(struct gpu_metrics_v2_2); } static ssize_t vangogh_get_gpu_metrics_v2_3(struct smu_context *smu, void **table) { - struct smu_table_context *smu_table = &smu->smu_table; struct gpu_metrics_v2_3 *gpu_metrics = - (struct gpu_metrics_v2_3 *)smu_table->gpu_metrics_table; + (struct gpu_metrics_v2_3 *)smu_driver_table_ptr( + smu, SMU_DRIVER_TABLE_GPU_METRICS); SmuMetrics_t metrics; int ret = 0; @@ -1831,6 +1837,8 @@ static ssize_t vangogh_get_gpu_metrics_v2_3(struct smu_context *smu, *table = (void *)gpu_metrics; + smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS); + return sizeof(struct gpu_metrics_v2_3); } @@ -1838,9 +1846,9 @@ static ssize_t vangogh_get_gpu_metrics_v2_4(struct smu_context *smu, void **table) { SmuMetrics_t metrics; - struct smu_table_context *smu_table = &smu->smu_table; struct gpu_metrics_v2_4 *gpu_metrics = - (struct gpu_metrics_v2_4 *)smu_table->gpu_metrics_table; + (struct gpu_metrics_v2_4 *)smu_driver_table_ptr( + smu, SMU_DRIVER_TABLE_GPU_METRICS); int ret = 0; ret = smu_cmn_get_metrics_table(smu, &metrics, true); @@ -1911,15 +1919,17 @@ static ssize_t vangogh_get_gpu_metrics_v2_4(struct smu_context *smu, *table = (void *)gpu_metrics; + smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS); + return sizeof(struct gpu_metrics_v2_4); } static ssize_t vangogh_get_gpu_metrics(struct smu_context *smu, void **table) { - struct smu_table_context *smu_table = &smu->smu_table; struct gpu_metrics_v2_2 *gpu_metrics = - (struct gpu_metrics_v2_2 *)smu_table->gpu_metrics_table; + (struct gpu_metrics_v2_2 *)smu_driver_table_ptr( + smu, SMU_DRIVER_TABLE_GPU_METRICS); SmuMetrics_t metrics; int ret = 0; @@ -1975,6 +1985,8 @@ static ssize_t vangogh_get_gpu_metrics(struct smu_context *smu, *table = (void *)gpu_metrics; + smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS); + return sizeof(struct gpu_metrics_v2_2); } -- 2.49.0
