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

drm/amd/pm: Use cached gpu metrics table 



If cached gpu metrics table is available, return it directly. Also,
deprecate gpu_metrics_table variables as they are no longer used.

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 618c1441

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

+11 −0
Original line number Diff line number Diff line
@@ -3659,6 +3659,9 @@ static int smu_get_dpm_clock_table(void *handle, 
static ssize_t smu_sys_get_gpu_metrics(void *handle, void **table)

{

	struct smu_context *smu = handle;

	struct smu_table_context *smu_table = &smu->smu_table;

	struct smu_driver_table *driver_tables = smu_table->driver_tables;

	struct smu_driver_table *gpu_metrics_table;



	if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)

		return -EOPNOTSUPP;
@@ -3666,6 +3669,14 @@ static ssize_t smu_sys_get_gpu_metrics(void *handle, void **table) 
	if (!smu->ppt_funcs->get_gpu_metrics)

		return -EOPNOTSUPP;



	gpu_metrics_table = &driver_tables[SMU_DRIVER_TABLE_GPU_METRICS];



	/* If cached table is valid, return it */

	if (smu_driver_table_is_valid(gpu_metrics_table)) {

		*table = gpu_metrics_table->cache.buffer;

		return gpu_metrics_table->cache.size;

	}



	return smu->ppt_funcs->get_gpu_metrics(smu, table);

}

drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h

+0 −3
Original line number Diff line number Diff line
@@ -414,9 +414,6 @@ struct smu_table_context { 
	void                            *boot_overdrive_table;

	void				*user_overdrive_table;



	uint32_t			gpu_metrics_table_size;

	void				*gpu_metrics_table;



	struct smu_driver_table driver_tables[SMU_DRIVER_TABLE_COUNT];

};