Commit cfd053be authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/pm: expose pmfw attached timestamp on Aldebaran 



Available with 68.18.0 and later PMFWs.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarHarish Kasiviswanathan <Harish.Kasiviswanathan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 403c9674

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

+8 −5
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ 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_1);

	smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v1_2);

	smu_table->gpu_metrics_table = kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL);

	if (!smu_table->gpu_metrics_table) {

		kfree(smu_table->metrics_table);
@@ -1632,8 +1632,8 @@ 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_1 *gpu_metrics =

		(struct gpu_metrics_v1_1 *)smu_table->gpu_metrics_table;

	struct gpu_metrics_v1_2 *gpu_metrics =

		(struct gpu_metrics_v1_2 *)smu_table->gpu_metrics_table;

	SmuMetrics_t metrics;

	int i, ret = 0;
@@ -1643,7 +1643,7 @@ static ssize_t aldebaran_get_gpu_metrics(struct smu_context *smu, 
	if (ret)

		return ret;



	smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 1);

	smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 2);



	gpu_metrics->temperature_edge = metrics.TemperatureEdge;

	gpu_metrics->temperature_hotspot = metrics.TemperatureHotspot;
@@ -1690,9 +1690,12 @@ static ssize_t aldebaran_get_gpu_metrics(struct smu_context *smu, 
	for (i = 0; i < NUM_HBM_INSTANCES; i++)

		gpu_metrics->temperature_hbm[i] = metrics.TemperatureAllHBM[i];



	gpu_metrics->firmware_timestamp = ((uint64_t)metrics.TimeStampHigh << 32) |

					metrics.TimeStampLow;



	*table = (void *)gpu_metrics;



	return sizeof(struct gpu_metrics_v1_1);

	return sizeof(struct gpu_metrics_v1_2);

}



static int aldebaran_mode2_reset(struct smu_context *smu)

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

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

		structure_size = sizeof(struct gpu_metrics_v1_1);

		break;

	case METRICS_VERSION(1, 2):

		structure_size = sizeof(struct gpu_metrics_v1_2);

		break;

	case METRICS_VERSION(2, 0):

		structure_size = sizeof(struct gpu_metrics_v2_0);

		break;