Commit e3e4f03f authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amd/pm: Use driver table structure in smuv13 



Use driver table structure for gpu metrics in smuv13. The default cache
interval is set at 5ms.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarAsad Kamal <asad.kamal@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f8e8d7da

drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c

+11 −7
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ static int aldebaran_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);
@@ -246,17 +247,18 @@ static int aldebaran_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;

	}



	smu_table->ecc_table = kzalloc(tables[SMU_TABLE_ECCINFO].size, GFP_KERNEL);

	if (!smu_table->ecc_table) {

		kfree(smu_table->metrics_table);

		kfree(smu_table->gpu_metrics_table);

		smu_driver_table_fini(smu, SMU_DRIVER_TABLE_GPU_METRICS);

		return -ENOMEM;

	}
@@ -1641,9 +1643,9 @@ static int aldebaran_get_current_pcie_link_speed(struct smu_context *smu) 
static ssize_t aldebaran_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 i, ret = 0;
@@ -1715,6 +1717,8 @@ static ssize_t aldebaran_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);

}

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c

+1 −2
Original line number Diff line number Diff line
@@ -507,14 +507,13 @@ int smu_v13_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->combo_pptable);

	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);

	smu_table->gpu_metrics_table = NULL;

	smu_table->combo_pptable = NULL;

	smu_table->user_overdrive_table = NULL;

	smu_table->boot_overdrive_table = NULL;

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c

+10 −6
Original line number Diff line number Diff line
@@ -482,6 +482,7 @@ static int smu_v13_0_0_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);
@@ -511,9 +512,10 @@ static int smu_v13_0_0_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);
@@ -529,7 +531,7 @@ static int smu_v13_0_0_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:
@@ -2039,9 +2041,9 @@ static int smu_v13_0_0_get_thermal_temperature_range(struct smu_context *smu, 
static ssize_t smu_v13_0_0_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_ext;

	SmuMetrics_t *metrics = &metrics_ext.SmuMetrics;

	int ret = 0;
@@ -2115,6 +2117,8 @@ static ssize_t smu_v13_0_0_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);

}

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c

+10 −7
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ static int smu_v13_0_4_init_smc_tables(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);
@@ -172,9 +173,10 @@ static int smu_v13_0_4_init_smc_tables(struct smu_context *smu) 
	if (!smu_table->watermarks_table)

		goto err2_out;



	smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v2_1);

	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_1),

				     SMU_GPU_METRICS_CACHE_INTERVAL);

	if (ret)

		goto err3_out;



	return 0;
@@ -202,8 +204,7 @@ static int smu_v13_0_4_fini_smc_tables(struct smu_context *smu) 
	kfree(smu_table->watermarks_table);

	smu_table->watermarks_table = NULL;



	kfree(smu_table->gpu_metrics_table);

	smu_table->gpu_metrics_table = NULL;

	smu_driver_table_fini(smu, SMU_DRIVER_TABLE_GPU_METRICS);



	return 0;

}
@@ -247,9 +248,9 @@ static int smu_v13_0_4_system_features_control(struct smu_context *smu, bool en) 
static ssize_t smu_v13_0_4_get_gpu_metrics(struct smu_context *smu,

					   void **table)

{

	struct smu_table_context *smu_table = &smu->smu_table;

	struct gpu_metrics_v2_1 *gpu_metrics =

		(struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table;

		(struct gpu_metrics_v2_1 *)smu_driver_table_ptr(

			smu, SMU_DRIVER_TABLE_GPU_METRICS);

	SmuMetrics_t metrics;

	int ret = 0;
@@ -294,6 +295,8 @@ static ssize_t smu_v13_0_4_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_1);

}

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c

+11 −8
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ static int smu_v13_0_5_init_smc_tables(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);
@@ -146,9 +147,10 @@ static int smu_v13_0_5_init_smc_tables(struct smu_context *smu) 
	if (!smu_table->watermarks_table)

		goto err2_out;



	smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v2_1);

	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_1),

				     SMU_GPU_METRICS_CACHE_INTERVAL);

	if (ret)

		goto err3_out;



	return 0;
@@ -176,8 +178,7 @@ static int smu_v13_0_5_fini_smc_tables(struct smu_context *smu) 
	kfree(smu_table->watermarks_table);

	smu_table->watermarks_table = NULL;



	kfree(smu_table->gpu_metrics_table);

	smu_table->gpu_metrics_table = NULL;

	smu_driver_table_fini(smu, SMU_DRIVER_TABLE_GPU_METRICS);



	return 0;

}
@@ -468,9 +469,9 @@ static int smu_v13_0_5_set_watermarks_table(struct smu_context *smu, 
static ssize_t smu_v13_0_5_get_gpu_metrics(struct smu_context *smu,

					   void **table)

{

	struct smu_table_context *smu_table = &smu->smu_table;

	struct gpu_metrics_v2_1 *gpu_metrics =

		(struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table;

		(struct gpu_metrics_v2_1 *)smu_driver_table_ptr(

			smu, SMU_DRIVER_TABLE_GPU_METRICS);

	SmuMetrics_t metrics;

	int ret = 0;
@@ -500,6 +501,8 @@ static ssize_t smu_v13_0_5_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_1);

}