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

drm/amd/pm: drop unneeded smu->metrics_lock 



As all those related APIs are already well protected by
adev->pm.mutex and smu->message_lock.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarGuchun Chen <guchun.chen@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 974d5ef0

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

+0 −1
Original line number Diff line number Diff line
@@ -956,7 +956,6 @@ static int smu_sw_init(void *handle) 
	bitmap_zero(smu->smu_feature.allowed, SMU_FEATURE_MAX);



	mutex_init(&smu->sensor_lock);

	mutex_init(&smu->metrics_lock);

	mutex_init(&smu->message_lock);



	INIT_WORK(&smu->throttling_logging_work, smu_throttling_logging_work_fn);

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

+0 −1
Original line number Diff line number Diff line
@@ -487,7 +487,6 @@ struct smu_context 
	const struct cmn2asic_mapping	*pwr_src_map;

	const struct cmn2asic_mapping	*workload_map;

	struct mutex			sensor_lock;

	struct mutex			metrics_lock;

	struct mutex			message_lock;

	uint64_t pool_size;

drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c

+4 −10
Original line number Diff line number Diff line
@@ -602,15 +602,11 @@ static int arcturus_get_smu_metrics_data(struct smu_context *smu, 
	SmuMetrics_t *metrics = (SmuMetrics_t *)smu_table->metrics_table;

	int ret = 0;



	mutex_lock(&smu->metrics_lock);



	ret = smu_cmn_get_metrics_table_locked(smu,

	ret = smu_cmn_get_metrics_table(smu,

					NULL,

					false);

	if (ret) {

		mutex_unlock(&smu->metrics_lock);

	if (ret)

		return ret;

	}



	switch (member) {

	case METRICS_CURR_GFXCLK:
@@ -693,8 +689,6 @@ static int arcturus_get_smu_metrics_data(struct smu_context *smu, 
		break;

	}



	mutex_unlock(&smu->metrics_lock);



	return ret;

}

drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c

+2 −8
Original line number Diff line number Diff line
@@ -150,13 +150,9 @@ cyan_skillfish_get_smu_metrics_data(struct smu_context *smu, 
	SmuMetrics_t *metrics = (SmuMetrics_t *)smu_table->metrics_table;

	int ret = 0;



	mutex_lock(&smu->metrics_lock);



	ret = smu_cmn_get_metrics_table_locked(smu, NULL, false);

	if (ret) {

		mutex_unlock(&smu->metrics_lock);

	ret = smu_cmn_get_metrics_table(smu, NULL, false);

	if (ret)

		return ret;

	}



	switch (member) {

	case METRICS_CURR_GFXCLK:
@@ -200,8 +196,6 @@ cyan_skillfish_get_smu_metrics_data(struct smu_context *smu, 
		break;

	}



	mutex_unlock(&smu->metrics_lock);



	return ret;

}

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c

+32 −80
Original line number Diff line number Diff line
@@ -546,15 +546,11 @@ static int navi10_get_legacy_smu_metrics_data(struct smu_context *smu, 
		(SmuMetrics_legacy_t *)smu_table->metrics_table;

	int ret = 0;



	mutex_lock(&smu->metrics_lock);



	ret = smu_cmn_get_metrics_table_locked(smu,

	ret = smu_cmn_get_metrics_table(smu,

					NULL,

					false);

	if (ret) {

		mutex_unlock(&smu->metrics_lock);

	if (ret)

		return ret;

	}



	switch (member) {

	case METRICS_CURR_GFXCLK:
@@ -624,8 +620,6 @@ static int navi10_get_legacy_smu_metrics_data(struct smu_context *smu, 
		break;

	}



	mutex_unlock(&smu->metrics_lock);



	return ret;

}
@@ -638,15 +632,11 @@ static int navi10_get_smu_metrics_data(struct smu_context *smu, 
		(SmuMetrics_t *)smu_table->metrics_table;

	int ret = 0;



	mutex_lock(&smu->metrics_lock);



	ret = smu_cmn_get_metrics_table_locked(smu,

	ret = smu_cmn_get_metrics_table(smu,

					NULL,

					false);

	if (ret) {

		mutex_unlock(&smu->metrics_lock);

	if (ret)

		return ret;

	}



	switch (member) {

	case METRICS_CURR_GFXCLK:
@@ -719,8 +709,6 @@ static int navi10_get_smu_metrics_data(struct smu_context *smu, 
		break;

	}



	mutex_unlock(&smu->metrics_lock);



	return ret;

}
@@ -733,15 +721,11 @@ static int navi12_get_legacy_smu_metrics_data(struct smu_context *smu, 
		(SmuMetrics_NV12_legacy_t *)smu_table->metrics_table;

	int ret = 0;



	mutex_lock(&smu->metrics_lock);



	ret = smu_cmn_get_metrics_table_locked(smu,

	ret = smu_cmn_get_metrics_table(smu,

					NULL,

					false);

	if (ret) {

		mutex_unlock(&smu->metrics_lock);

	if (ret)

		return ret;

	}



	switch (member) {

	case METRICS_CURR_GFXCLK:
@@ -811,8 +795,6 @@ static int navi12_get_legacy_smu_metrics_data(struct smu_context *smu, 
		break;

	}



	mutex_unlock(&smu->metrics_lock);



	return ret;

}
@@ -825,15 +807,11 @@ static int navi12_get_smu_metrics_data(struct smu_context *smu, 
		(SmuMetrics_NV12_t *)smu_table->metrics_table;

	int ret = 0;



	mutex_lock(&smu->metrics_lock);



	ret = smu_cmn_get_metrics_table_locked(smu,

	ret = smu_cmn_get_metrics_table(smu,

					NULL,

					false);

	if (ret) {

		mutex_unlock(&smu->metrics_lock);

	if (ret)

		return ret;

	}



	switch (member) {

	case METRICS_CURR_GFXCLK:
@@ -906,8 +884,6 @@ static int navi12_get_smu_metrics_data(struct smu_context *smu, 
		break;

	}



	mutex_unlock(&smu->metrics_lock);



	return ret;

}
@@ -2708,20 +2684,14 @@ static ssize_t navi10_get_legacy_gpu_metrics(struct smu_context *smu, 
	SmuMetrics_legacy_t metrics;

	int ret = 0;



	mutex_lock(&smu->metrics_lock);



	ret = smu_cmn_get_metrics_table_locked(smu,

	ret = smu_cmn_get_metrics_table(smu,

					NULL,

					true);

	if (ret) {

		mutex_unlock(&smu->metrics_lock);

	if (ret)

		return ret;

	}



	memcpy(&metrics, smu_table->metrics_table, sizeof(SmuMetrics_legacy_t));



	mutex_unlock(&smu->metrics_lock);



	smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 3);



	gpu_metrics->temperature_edge = metrics.TemperatureEdge;
@@ -2901,20 +2871,14 @@ static ssize_t navi10_get_gpu_metrics(struct smu_context *smu, 
	SmuMetrics_t metrics;

	int ret = 0;



	mutex_lock(&smu->metrics_lock);



	ret = smu_cmn_get_metrics_table_locked(smu,

	ret = smu_cmn_get_metrics_table(smu,

					NULL,

					true);

	if (ret) {

		mutex_unlock(&smu->metrics_lock);

	if (ret)

		return ret;

	}



	memcpy(&metrics, smu_table->metrics_table, sizeof(SmuMetrics_t));



	mutex_unlock(&smu->metrics_lock);



	smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 3);



	gpu_metrics->temperature_edge = metrics.TemperatureEdge;
@@ -2979,20 +2943,14 @@ static ssize_t navi12_get_legacy_gpu_metrics(struct smu_context *smu, 
	SmuMetrics_NV12_legacy_t metrics;

	int ret = 0;



	mutex_lock(&smu->metrics_lock);



	ret = smu_cmn_get_metrics_table_locked(smu,

	ret = smu_cmn_get_metrics_table(smu,

					NULL,

					true);

	if (ret) {

		mutex_unlock(&smu->metrics_lock);

	if (ret)

		return ret;

	}



	memcpy(&metrics, smu_table->metrics_table, sizeof(SmuMetrics_NV12_legacy_t));



	mutex_unlock(&smu->metrics_lock);



	smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 3);



	gpu_metrics->temperature_edge = metrics.TemperatureEdge;
@@ -3060,20 +3018,14 @@ static ssize_t navi12_get_gpu_metrics(struct smu_context *smu, 
	SmuMetrics_NV12_t metrics;

	int ret = 0;



	mutex_lock(&smu->metrics_lock);



	ret = smu_cmn_get_metrics_table_locked(smu,

	ret = smu_cmn_get_metrics_table(smu,

					NULL,

					true);

	if (ret) {

		mutex_unlock(&smu->metrics_lock);

	if (ret)

		return ret;

	}



	memcpy(&metrics, smu_table->metrics_table, sizeof(SmuMetrics_NV12_t));



	mutex_unlock(&smu->metrics_lock);



	smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 3);



	gpu_metrics->temperature_edge = metrics.TemperatureEdge;