Commit 21f0742a authored by Darren Powell's avatar Darren Powell Committed by Alex Deucher
Browse files

amdgpu/pm: Replace vega10 usage of sprintf with sysfs_emit 



 initial modification of files
  vega10_hwmgr.c

=== Test ===
AMDGPU_PCI_ADDR=`lspci -nn | grep "VGA\|Display" | cut -d " " -f 1`
AMDGPU_HWMON=`ls -la /sys/class/hwmon | grep $AMDGPU_PCI_ADDR | awk '{print $9}'`
HWMON_DIR=/sys/class/hwmon/${AMDGPU_HWMON}
LOGFILE=pp_printf.test.log

lspci -nn | grep "VGA\|Display"  > $LOGFILE
FILES="pp_dpm_sclk
pp_features
pp_power_profile_mode "

for f in $FILES
do
  echo === $f === >> $LOGFILE
  cat $HWMON_DIR/device/$f >> $LOGFILE
done
cat $LOGFILE

Signed-off-by: default avatarDarren Powell <darren.powell@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e738c2f0

drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c

+19 −19
Original line number Diff line number Diff line
@@ -4553,13 +4553,13 @@ static int vega10_get_ppfeature_status(struct pp_hwmgr *hwmgr, char *buf) 
			"[EnableAllSmuFeatures] Failed to get enabled smc features!",

			return ret);



	size += sprintf(buf + size, "Current ppfeatures: 0x%016llx\n", features_enabled);

	size += sprintf(buf + size, "%-19s %-22s %s\n",

	size += sysfs_emit_at(buf, size, "Current ppfeatures: 0x%016llx\n", features_enabled);

	size += sysfs_emit_at(buf, size, "%-19s %-22s %s\n",

				output_title[0],

				output_title[1],

				output_title[2]);

	for (i = 0; i < GNLD_FEATURES_MAX; i++) {

		size += sprintf(buf + size, "%-19s 0x%016llx %6s\n",

		size += sysfs_emit_at(buf, size, "%-19s 0x%016llx %6s\n",

					ppfeature_name[i],

					1ULL << i,

					(features_enabled & (1ULL << i)) ? "Y" : "N");
@@ -4650,7 +4650,7 @@ static int vega10_print_clock_levels(struct pp_hwmgr *hwmgr, 
		else

			count = sclk_table->count;

		for (i = 0; i < count; i++)

			size += sprintf(buf + size, "%d: %uMhz %s\n",

			size += sysfs_emit_at(buf, size, "%d: %uMhz %s\n",

					i, sclk_table->dpm_levels[i].value / 100,

					(i == now) ? "*" : "");

		break;
@@ -4661,7 +4661,7 @@ static int vega10_print_clock_levels(struct pp_hwmgr *hwmgr, 
		smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetCurrentUclkIndex, &now);



		for (i = 0; i < mclk_table->count; i++)

			size += sprintf(buf + size, "%d: %uMhz %s\n",

			size += sysfs_emit_at(buf, size, "%d: %uMhz %s\n",

					i, mclk_table->dpm_levels[i].value / 100,

					(i == now) ? "*" : "");

		break;
@@ -4672,7 +4672,7 @@ static int vega10_print_clock_levels(struct pp_hwmgr *hwmgr, 
		smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetCurrentSocclkIndex, &now);



		for (i = 0; i < soc_table->count; i++)

			size += sprintf(buf + size, "%d: %uMhz %s\n",

			size += sysfs_emit_at(buf, size, "%d: %uMhz %s\n",

					i, soc_table->dpm_levels[i].value / 100,

					(i == now) ? "*" : "");

		break;
@@ -4684,7 +4684,7 @@ static int vega10_print_clock_levels(struct pp_hwmgr *hwmgr, 
				PPSMC_MSG_GetClockFreqMHz, CLK_DCEFCLK, &now);



		for (i = 0; i < dcef_table->count; i++)

			size += sprintf(buf + size, "%d: %uMhz %s\n",

			size += sysfs_emit_at(buf, size, "%d: %uMhz %s\n",

					i, dcef_table->dpm_levels[i].value / 100,

					(dcef_table->dpm_levels[i].value / 100 == now) ?

					"*" : "");
@@ -4698,7 +4698,7 @@ static int vega10_print_clock_levels(struct pp_hwmgr *hwmgr, 
			gen_speed = pptable->PcieGenSpeed[i];

			lane_width = pptable->PcieLaneCount[i];



			size += sprintf(buf + size, "%d: %s %s %s\n", i,

			size += sysfs_emit_at(buf, size, "%d: %s %s %s\n", i,

					(gen_speed == 0) ? "2.5GT/s," :

					(gen_speed == 1) ? "5.0GT/s," :

					(gen_speed == 2) ? "8.0GT/s," :
@@ -4717,34 +4717,34 @@ static int vega10_print_clock_levels(struct pp_hwmgr *hwmgr, 


	case OD_SCLK:

		if (hwmgr->od_enabled) {

			size = sprintf(buf, "%s:\n", "OD_SCLK");

			size = sysfs_emit(buf, "%s:\n", "OD_SCLK");

			podn_vdd_dep = &data->odn_dpm_table.vdd_dep_on_sclk;

			for (i = 0; i < podn_vdd_dep->count; i++)

				size += sprintf(buf + size, "%d: %10uMhz %10umV\n",

				size += sysfs_emit_at(buf, size, "%d: %10uMhz %10umV\n",

					i, podn_vdd_dep->entries[i].clk / 100,

						podn_vdd_dep->entries[i].vddc);

		}

		break;

	case OD_MCLK:

		if (hwmgr->od_enabled) {

			size = sprintf(buf, "%s:\n", "OD_MCLK");

			size = sysfs_emit(buf, "%s:\n", "OD_MCLK");

			podn_vdd_dep = &data->odn_dpm_table.vdd_dep_on_mclk;

			for (i = 0; i < podn_vdd_dep->count; i++)

				size += sprintf(buf + size, "%d: %10uMhz %10umV\n",

				size += sysfs_emit_at(buf, size, "%d: %10uMhz %10umV\n",

					i, podn_vdd_dep->entries[i].clk/100,

						podn_vdd_dep->entries[i].vddc);

		}

		break;

	case OD_RANGE:

		if (hwmgr->od_enabled) {

			size = sprintf(buf, "%s:\n", "OD_RANGE");

			size += sprintf(buf + size, "SCLK: %7uMHz %10uMHz\n",

			size = sysfs_emit(buf, "%s:\n", "OD_RANGE");

			size += sysfs_emit_at(buf, size, "SCLK: %7uMHz %10uMHz\n",

				data->golden_dpm_table.gfx_table.dpm_levels[0].value/100,

				hwmgr->platform_descriptor.overdriveLimit.engineClock/100);

			size += sprintf(buf + size, "MCLK: %7uMHz %10uMHz\n",

			size += sysfs_emit_at(buf, size, "MCLK: %7uMHz %10uMHz\n",

				data->golden_dpm_table.mem_table.dpm_levels[0].value/100,

				hwmgr->platform_descriptor.overdriveLimit.memoryClock/100);

			size += sprintf(buf + size, "VDDC: %7umV %11umV\n",

			size += sysfs_emit_at(buf, size, "VDDC: %7umV %11umV\n",

				data->odn_dpm_table.min_vddc,

				data->odn_dpm_table.max_vddc);

		}
@@ -5112,15 +5112,15 @@ static int vega10_get_power_profile_mode(struct pp_hwmgr *hwmgr, char *buf) 
	if (!buf)

		return -EINVAL;



	size += sprintf(buf + size, "%s %16s %s %s %s %s\n",title[0],

	size += sysfs_emit_at(buf, size, "%s %16s %s %s %s %s\n",title[0],

			title[1], title[2], title[3], title[4], title[5]);



	for (i = 0; i < PP_SMC_POWER_PROFILE_CUSTOM; i++)

		size += sprintf(buf + size, "%3d %14s%s: %14d %3d %10d %14d\n",

		size += sysfs_emit_at(buf, size, "%3d %14s%s: %14d %3d %10d %14d\n",

			i, profile_name[i], (i == hwmgr->power_profile_mode) ? "*" : " ",

			profile_mode_setting[i][0], profile_mode_setting[i][1],

			profile_mode_setting[i][2], profile_mode_setting[i][3]);

	size += sprintf(buf + size, "%3d %14s%s: %14d %3d %10d %14d\n", i,

	size += sysfs_emit_at(buf, size, "%3d %14s%s: %14d %3d %10d %14d\n", i,

			profile_name[i], (i == hwmgr->power_profile_mode) ? "*" : " ",

			data->custom_profile_mode[0], data->custom_profile_mode[1],

			data->custom_profile_mode[2], data->custom_profile_mode[3]);