Commit 1da87c9f authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/smu: add metrics table lock for arcturus (v2)

To protect access to the metrics table.

v2: unlock on error

Bug: https://gitlab.freedesktop.org/drm/amd/issues/900


Reviewed-by: default avatarKevin Wang <kevin1.wang@amd.com>
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 073d5eef
Loading
Loading
Loading
Loading
+3 −0
Original line number Original line Diff line number Diff line
@@ -862,18 +862,21 @@ static int arcturus_get_metrics_table(struct smu_context *smu,
	struct smu_table_context *smu_table= &smu->smu_table;
	struct smu_table_context *smu_table= &smu->smu_table;
	int ret = 0;
	int ret = 0;


	mutex_lock(&smu->metrics_lock);
	if (!smu_table->metrics_time ||
	if (!smu_table->metrics_time ||
	     time_after(jiffies, smu_table->metrics_time + HZ / 1000)) {
	     time_after(jiffies, smu_table->metrics_time + HZ / 1000)) {
		ret = smu_update_table(smu, SMU_TABLE_SMU_METRICS, 0,
		ret = smu_update_table(smu, SMU_TABLE_SMU_METRICS, 0,
				(void *)smu_table->metrics_table, false);
				(void *)smu_table->metrics_table, false);
		if (ret) {
		if (ret) {
			pr_info("Failed to export SMU metrics table!\n");
			pr_info("Failed to export SMU metrics table!\n");
			mutex_unlock(&smu->metrics_lock);
			return ret;
			return ret;
		}
		}
		smu_table->metrics_time = jiffies;
		smu_table->metrics_time = jiffies;
	}
	}


	memcpy(metrics_table, smu_table->metrics_table, sizeof(SmuMetrics_t));
	memcpy(metrics_table, smu_table->metrics_table, sizeof(SmuMetrics_t));
	mutex_unlock(&smu->metrics_lock);


	return ret;
	return ret;
}
}