diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
index e705067b4dd291e1b3f83728479a03c6b719cba9..7df9d3c1509459fded225471fa746e61740abfa4 100644
--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
@@ -581,6 +581,8 @@ static int navi10_print_clk_levels(struct smu_context *smu,
 		ret = smu_get_current_clk_freq(smu, clk_type, &cur_value);
 		if (ret)
 			return size;
+		/* 10KHz -> MHz */
+		cur_value = cur_value / 100;
 
 		size += sprintf(buf, "current clk: %uMhz\n", cur_value);
 
diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
index ec7862ea299d093e26cb4c141e0e5b394582f9ee..29f868f0ef3cabdf29a476d9b6affbb8f03fcdc9 100644
--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
+++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
@@ -1098,16 +1098,17 @@ static int smu_v11_0_get_current_clk_freq(struct smu_context *smu,
 
 	/* if don't has GetDpmClockFreq Message, try get current clock by SmuMetrics_t */
 	if (smu_msg_get_index(smu, SMU_MSG_GetDpmClockFreq) == 0)
-		return smu_get_current_clk_freq_by_table(smu, clk_id, value);
-
-	ret = smu_send_smc_msg_with_param(smu, SMU_MSG_GetDpmClockFreq,
-					  (smu_clk_get_index(smu, clk_id) << 16));
-	if (ret)
-		return ret;
+		ret =  smu_get_current_clk_freq_by_table(smu, clk_id, &freq);
+	else {
+		ret = smu_send_smc_msg_with_param(smu, SMU_MSG_GetDpmClockFreq,
+						  (smu_clk_get_index(smu, clk_id) << 16));
+		if (ret)
+			return ret;
 
-	ret = smu_read_smc_arg(smu, &freq);
-	if (ret)
-		return ret;
+		ret = smu_read_smc_arg(smu, &freq);
+		if (ret)
+			return ret;
+	}
 
 	freq *= 100;
 	*value = freq;