Commit a7505591 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amdgpu/pm: Don't show pp_power_profile_mode for unsupported devices 



For ASICs not supporting power profile mode, don't show the attribute.
Verify that the function has been implemented by the subsystem.

Suggested-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a035be8a

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

+4 −0
Original line number Diff line number Diff line
@@ -2094,6 +2094,10 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_ 
	} else if (DEVICE_ATTR_IS(pp_dpm_dclk)) {

		if (!(asic_type == CHIP_VANGOGH || asic_type == CHIP_SIENNA_CICHLID))

			*states = ATTR_STATE_UNSUPPORTED;

	} else if (DEVICE_ATTR_IS(pp_power_profile_mode)) {

		if (!adev->powerplay.pp_funcs->get_power_profile_mode ||

		    amdgpu_dpm_get_power_profile_mode(adev, NULL) == -EOPNOTSUPP)

			*states = ATTR_STATE_UNSUPPORTED;

	}



	switch (asic_type) {

drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c

+2 −12
Original line number Diff line number Diff line
@@ -877,16 +877,11 @@ static int pp_get_power_profile_mode(void *handle, char *buf) 
	struct pp_hwmgr *hwmgr = handle;

	int ret;



	if (!hwmgr || !hwmgr->pm_en)

	if (!hwmgr || !hwmgr->pm_en || !hwmgr->hwmgr_func->get_power_profile_mode)

		return -EOPNOTSUPP;

	if (!buf)

		return -EINVAL;



	if (hwmgr->hwmgr_func->get_power_profile_mode == NULL) {

		pr_info_ratelimited("%s was not implemented.\n", __func__);

		return snprintf(buf, PAGE_SIZE, "\n");

	}



	mutex_lock(&hwmgr->smu_lock);

	ret = hwmgr->hwmgr_func->get_power_profile_mode(hwmgr, buf);

	mutex_unlock(&hwmgr->smu_lock);
@@ -898,13 +893,8 @@ static int pp_set_power_profile_mode(void *handle, long *input, uint32_t size) 
	struct pp_hwmgr *hwmgr = handle;

	int ret = -EOPNOTSUPP;



	if (!hwmgr || !hwmgr->pm_en)

		return ret;



	if (hwmgr->hwmgr_func->set_power_profile_mode == NULL) {

		pr_info_ratelimited("%s was not implemented.\n", __func__);

	if (!hwmgr || !hwmgr->pm_en || !hwmgr->hwmgr_func->set_power_profile_mode)

		return ret;

	}



	if (hwmgr->dpm_level != AMD_DPM_FORCED_LEVEL_MANUAL) {

		pr_debug("power profile setting is for manual dpm mode only.\n");

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

+7 −4
Original line number Diff line number Diff line
@@ -2534,12 +2534,14 @@ static int smu_get_power_profile_mode(void *handle, char *buf) 
	struct smu_context *smu = handle;

	int ret = 0;



	if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)

	if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled ||

	    !smu->ppt_funcs->get_power_profile_mode)

		return -EOPNOTSUPP;

	if (!buf)

		return -EINVAL;



	mutex_lock(&smu->mutex);



	if (smu->ppt_funcs->get_power_profile_mode)

	ret = smu->ppt_funcs->get_power_profile_mode(smu, buf);



	mutex_unlock(&smu->mutex);
@@ -2554,7 +2556,8 @@ static int smu_set_power_profile_mode(void *handle, 
	struct smu_context *smu = handle;

	int ret = 0;



	if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)

	if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled ||

	    !smu->ppt_funcs->set_power_profile_mode)

		return -EOPNOTSUPP;



	mutex_lock(&smu->mutex);