#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
{
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);
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;
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;
*table = (void *)gpu_metrics;
+ smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS);
+
return sizeof(struct gpu_metrics_v1_3);
}
{
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),
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;
return 0;
err1_out:
- smu_table->gpu_metrics_table_size = 0;
kfree(smu_table->metrics_table);
err0_out:
return -ENOMEM;
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;
*table = (void *)gpu_metrics;
+ smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS);
+
return sizeof(struct gpu_metrics_v2_2);
}
{
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);
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);
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:
{
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;
*table = (void *)gpu_metrics;
+ smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS);
+
return sizeof(struct gpu_metrics_v1_3);
}
{
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;
*table = (void *)gpu_metrics;
+ smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS);
+
return sizeof(struct gpu_metrics_v1_3);
}
{
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;
*table = (void *)gpu_metrics;
+ smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS);
+
return sizeof(struct gpu_metrics_v1_3);
}
{
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;
*table = (void *)gpu_metrics;
+ smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS);
+
return sizeof(struct gpu_metrics_v1_3);
}
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,
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);
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:
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);
*table = (void *)gpu_metrics;
+ smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS);
+
return sizeof(struct gpu_metrics_v1_3);
}
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;
{
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);
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);
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:
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;
*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;
*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;
*table = (void *)gpu_metrics;
+ smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS);
+
return sizeof(struct gpu_metrics_v2_3);
}
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);
*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;
*table = (void *)gpu_metrics;
+ smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS);
+
return sizeof(struct gpu_metrics_v2_2);
}