Commit 22a7dcf5 authored by Graham Sider's avatar Graham Sider Committed by Alex Deucher
Browse files

drm/amd/pm: Add u64 throttler status field to gpu_metrics 



This patch set adds support for a new ASIC independant u64 throttler
status field (indep_throttle_status). Piggybacks off the
gpu_metrics_v1_3 bump and similarly bumps gpu_metrics_v2 version (to
v2_2) to add field.

Signed-off-by: default avatarGraham Sider <Graham.Sider@amd.com>
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2a9a151f

drivers/gpu/drm/amd/include/kgd_pp_interface.h

+57 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ struct gpu_metrics_v1_2 { 
	uint16_t			current_vclk1;

	uint16_t			current_dclk1;



	/* Throttle status */

	/* Throttle status (ASIC dependent) */

	uint32_t			throttle_status;



	/* Fans */
@@ -648,6 +648,9 @@ struct gpu_metrics_v1_3 { 
	uint16_t			voltage_mem;



	uint16_t			padding1;



	/* Throttle status (ASIC independent) */

	uint64_t			indep_throttle_status;

};



/*
@@ -754,4 +757,57 @@ struct gpu_metrics_v2_1 { 
	uint16_t			padding[3];

};



struct gpu_metrics_v2_2 {

	struct metrics_table_header	common_header;



	/* Temperature */

	uint16_t			temperature_gfx; // gfx temperature on APUs

	uint16_t			temperature_soc; // soc temperature on APUs

	uint16_t			temperature_core[8]; // CPU core temperature on APUs

	uint16_t			temperature_l3[2];



	/* Utilization */

	uint16_t			average_gfx_activity;

	uint16_t			average_mm_activity; // UVD or VCN



	/* Driver attached timestamp (in ns) */

	uint64_t			system_clock_counter;



	/* Power/Energy */

	uint16_t			average_socket_power; // dGPU + APU power on A + A platform

	uint16_t			average_cpu_power;

	uint16_t			average_soc_power;

	uint16_t			average_gfx_power;

	uint16_t			average_core_power[8]; // CPU core power on APUs



	/* Average clocks */

	uint16_t			average_gfxclk_frequency;

	uint16_t			average_socclk_frequency;

	uint16_t			average_uclk_frequency;

	uint16_t			average_fclk_frequency;

	uint16_t			average_vclk_frequency;

	uint16_t			average_dclk_frequency;



	/* Current clocks */

	uint16_t			current_gfxclk;

	uint16_t			current_socclk;

	uint16_t			current_uclk;

	uint16_t			current_fclk;

	uint16_t			current_vclk;

	uint16_t			current_dclk;

	uint16_t			current_coreclk[8]; // CPU core clocks

	uint16_t			current_l3clk[2];



	/* Throttle status (ASIC dependent) */

	uint32_t			throttle_status;



	/* Fans */

	uint16_t			fan_pwm;



	uint16_t			padding[3];



	/* Throttle status (ASIC independent) */

	uint64_t			indep_throttle_status;

};



#endif

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

+3 −0
Original line number Diff line number Diff line
@@ -773,6 +773,9 @@ void smu_cmn_init_soft_gpu_metrics(void *table, uint8_t frev, uint8_t crev) 
	case METRICS_VERSION(2, 1):

		structure_size = sizeof(struct gpu_metrics_v2_1);

		break;

	case METRICS_VERSION(2, 2):

		structure_size = sizeof(struct gpu_metrics_v2_2);

		break;

	default:

		return;

	}