Commit f3527a64 authored by Marina Nikolic's avatar Marina Nikolic Committed by Alex Deucher
Browse files

drm/amd/pm: Enable sysfs required by rocm-smi tool for One VF mode 



Enable power level, power limit and fan speed
information retrieval in one VF mode.
This is required so that tool ROCM-SMI
can provide this information to users.

Signed-off-by: default avatarMarina Nikolic <Marina.Nikolic@amd.com>
Acked-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarKevin Wang <kevinyang.wang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 22c16d25

drivers/gpu/drm/amd/pm/amdgpu_pm.c

+2 −15
Original line number Diff line number Diff line
@@ -1903,8 +1903,8 @@ static struct amdgpu_device_attr amdgpu_device_attrs[] = { 
	AMDGPU_DEVICE_ATTR_RW(pp_dpm_fclk,				ATTR_FLAG_BASIC|ATTR_FLAG_ONEVF),

	AMDGPU_DEVICE_ATTR_RW(pp_dpm_vclk,				ATTR_FLAG_BASIC|ATTR_FLAG_ONEVF),

	AMDGPU_DEVICE_ATTR_RW(pp_dpm_dclk,				ATTR_FLAG_BASIC|ATTR_FLAG_ONEVF),

	AMDGPU_DEVICE_ATTR_RW(pp_dpm_dcefclk,				ATTR_FLAG_BASIC),

	AMDGPU_DEVICE_ATTR_RW(pp_dpm_pcie,				ATTR_FLAG_BASIC),

	AMDGPU_DEVICE_ATTR_RW(pp_dpm_dcefclk,				ATTR_FLAG_BASIC|ATTR_FLAG_ONEVF),

	AMDGPU_DEVICE_ATTR_RW(pp_dpm_pcie,				ATTR_FLAG_BASIC|ATTR_FLAG_ONEVF),

	AMDGPU_DEVICE_ATTR_RW(pp_sclk_od,				ATTR_FLAG_BASIC),

	AMDGPU_DEVICE_ATTR_RW(pp_mclk_od,				ATTR_FLAG_BASIC),

	AMDGPU_DEVICE_ATTR_RW(pp_power_profile_mode,			ATTR_FLAG_BASIC|ATTR_FLAG_ONEVF),
@@ -3152,19 +3152,6 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj, 
	if (amdgpu_sriov_vf(adev) && !amdgpu_sriov_is_pp_one_vf(adev))

		return 0;



	/* there is no fan under pp one vf mode */

	if (amdgpu_sriov_is_pp_one_vf(adev) &&

	    (attr == &sensor_dev_attr_pwm1.dev_attr.attr ||

	     attr == &sensor_dev_attr_pwm1_enable.dev_attr.attr ||

	     attr == &sensor_dev_attr_pwm1_max.dev_attr.attr ||

	     attr == &sensor_dev_attr_pwm1_min.dev_attr.attr ||

	     attr == &sensor_dev_attr_fan1_input.dev_attr.attr ||

	     attr == &sensor_dev_attr_fan1_min.dev_attr.attr ||

	     attr == &sensor_dev_attr_fan1_max.dev_attr.attr ||

	     attr == &sensor_dev_attr_fan1_target.dev_attr.attr ||

	     attr == &sensor_dev_attr_fan1_enable.dev_attr.attr))

		return 0;



	/* Skip fan attributes if fan is not present */

	if (adev->pm.no_fan && (attr == &sensor_dev_attr_pwm1.dev_attr.attr ||

	    attr == &sensor_dev_attr_pwm1_enable.dev_attr.attr ||

drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static struct cmn2asic_msg_mapping sienna_cichlid_message_map[SMU_MSG_MAX_COUNT] 
	MSG_MAP(PrepareMp1ForUnload,		PPSMC_MSG_PrepareMp1ForUnload,         1),

	MSG_MAP(AllowGfxOff,			PPSMC_MSG_AllowGfxOff,                 0),

	MSG_MAP(DisallowGfxOff,			PPSMC_MSG_DisallowGfxOff,              0),

	MSG_MAP(GetPptLimit,			PPSMC_MSG_GetPptLimit,                 0),

	MSG_MAP(GetPptLimit,			PPSMC_MSG_GetPptLimit,                 1),

	MSG_MAP(GetDcModeMaxDpmFreq,		PPSMC_MSG_GetDcModeMaxDpmFreq,         1),

	MSG_MAP(ExitBaco,			PPSMC_MSG_ExitBaco,                    0),

	MSG_MAP(PowerUpVcn,			PPSMC_MSG_PowerUpVcn,                  0),