drm/amdgpu/smu: add metrics table lock for navi (v2) (e0e384c3) · Commits · 戴 / test

To protect access to the metrics table. v2: unlock on error Bug: https://gitlab.freedesktop.org/drm/amd/issues/900 Reviewed-by:

drivers/gpu/drm/amd/powerplay/navi10_ppt.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -562,17 +562,20 @@ static int navi10_get_metrics_table(struct smu_context *smu,
		struct smu_table_context *smu_table= &smu->smu_table;
		int ret = 0;

		mutex_lock(&smu->metrics_lock);
		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,
		(void *)smu_table->metrics_table, false);
		if (ret) {
		pr_info("Failed to export SMU metrics table!\n");
		mutex_unlock(&smu->metrics_lock);
		return ret;
		}
		smu_table->metrics_time = jiffies;
		}

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

		return ret;
		}