mirror of https://gitee.com/openkylin/linux.git
drm/amdgpu/smu: add metrics table lock for navi (v2)
To protect access to the metrics table. v2: unlock on error Bug: https://gitlab.freedesktop.org/drm/amd/issues/900 Reviewed-by: Kevin Wang <kevin1.wang@amd.com> Reviewed-by: Evan Quan <evan.quan@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
This commit is contained in:
parent
1da87c9f67
commit
e0e384c398
|
@ -562,17 +562,20 @@ static int navi10_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 || time_after(jiffies, smu_table->metrics_time + msecs_to_jiffies(100))) {
|
if (!smu_table->metrics_time || time_after(jiffies, smu_table->metrics_time + msecs_to_jiffies(100))) {
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue