Commit 4c07ff7d authored by Asad Kamal's avatar Asad Kamal Committed by Alex Deucher
Browse files

drm/amd/pm: Add gpu_metrics_v1_6 



Add new gpu_metrics_v1_6 with activities per partition

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

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

+102 −1
Original line number Diff line number Diff line
@@ -336,7 +336,8 @@ enum pp_policy_soc_pstate { 
#define MAX_CLKS 4

#define NUM_VCN 4

#define NUM_JPEG_ENG 32



#define MAX_XCC 8

#define NUM_XCP 8

struct seq_file;

enum amd_pp_clock_type;

struct amd_pp_simple_clock_info;
@@ -350,6 +351,15 @@ struct pp_smu_wm_range_sets; 
struct pp_smu_nv_clock_table;

struct dpm_clocks;



struct amdgpu_xcp_metrics {

	/* Utilization Instantaneous (%) */

	u32 gfx_busy_inst[MAX_XCC];

	u16 jpeg_busy[NUM_JPEG_ENG];

	u16 vcn_busy[NUM_VCN];

	/* Utilization Accumulated (%) */

	u64 gfx_busy_acc[MAX_XCC];

};



struct amd_pm_funcs {

/* export for dpm on ci and si */

	int (*pre_set_power_state)(void *handle);
@@ -872,6 +882,97 @@ struct gpu_metrics_v1_5 { 
	uint16_t			padding;

};



struct gpu_metrics_v1_6 {

	struct metrics_table_header	common_header;



	/* Temperature (Celsius) */

	uint16_t			temperature_hotspot;

	uint16_t			temperature_mem;

	uint16_t			temperature_vrsoc;



	/* Power (Watts) */

	uint16_t			curr_socket_power;



	/* Utilization (%) */

	uint16_t			average_gfx_activity;

	uint16_t			average_umc_activity; // memory controller



	/* Energy (15.259uJ (2^-16) units) */

	uint64_t			energy_accumulator;



	/* Driver attached timestamp (in ns) */

	uint64_t			system_clock_counter;



	/* Accumulation cycle counter */

	uint32_t                        accumulation_counter;



	/* Accumulated throttler residencies */

	uint32_t                        prochot_residency_acc;

	uint32_t                        ppt_residency_acc;

	uint32_t                        socket_thm_residency_acc;

	uint32_t                        vr_thm_residency_acc;

	uint32_t                        hbm_thm_residency_acc;



	/* Clock Lock Status. Each bit corresponds to clock instance */

	uint32_t			gfxclk_lock_status;



	/* Link width (number of lanes) and speed (in 0.1 GT/s) */

	uint16_t			pcie_link_width;

	uint16_t			pcie_link_speed;



	/* XGMI bus width and bitrate (in Gbps) */

	uint16_t			xgmi_link_width;

	uint16_t			xgmi_link_speed;



	/* Utilization Accumulated (%) */

	uint32_t			gfx_activity_acc;

	uint32_t			mem_activity_acc;



	/*PCIE accumulated bandwidth (GB/sec) */

	uint64_t			pcie_bandwidth_acc;



	/*PCIE instantaneous bandwidth (GB/sec) */

	uint64_t			pcie_bandwidth_inst;



	/* PCIE L0 to recovery state transition accumulated count */

	uint64_t			pcie_l0_to_recov_count_acc;



	/* PCIE replay accumulated count */

	uint64_t			pcie_replay_count_acc;



	/* PCIE replay rollover accumulated count */

	uint64_t			pcie_replay_rover_count_acc;



	/* PCIE NAK sent  accumulated count */

	uint32_t			pcie_nak_sent_count_acc;



	/* PCIE NAK received accumulated count */

	uint32_t			pcie_nak_rcvd_count_acc;



	/* XGMI accumulated data transfer size(KiloBytes) */

	uint64_t			xgmi_read_data_acc[NUM_XGMI_LINKS];

	uint64_t			xgmi_write_data_acc[NUM_XGMI_LINKS];



	/* PMFW attached timestamp (10ns resolution) */

	uint64_t			firmware_timestamp;



	/* Current clocks (Mhz) */

	uint16_t			current_gfxclk[MAX_GFX_CLKS];

	uint16_t			current_socclk[MAX_CLKS];

	uint16_t			current_vclk0[MAX_CLKS];

	uint16_t			current_dclk0[MAX_CLKS];

	uint16_t			current_uclk;



	/* Number of current partition */

	uint16_t			num_partition;



	/* XCP metrics stats */

	struct amdgpu_xcp_metrics	xcp_stats[NUM_XCP];



	/* PCIE other end recovery counter */

	uint32_t			pcie_lc_perf_other_end_recovery;

};



/*

 * gpu_metrics_v2_0 is not recommended as it's not naturally aligned.

 * Use gpu_metrics_v2_1 or later instead.

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

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

		structure_size = sizeof(struct gpu_metrics_v1_5);

		break;

	case METRICS_VERSION(1, 6):

		structure_size = sizeof(struct gpu_metrics_v1_6);

		break;

	case METRICS_VERSION(2, 0):

		structure_size = sizeof(struct gpu_metrics_v2_0);

		break;