Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73a0e628 authored by Evan Quan's avatar Evan Quan Committed by Greg Kroah-Hartman
Browse files

drm/amd/powerplay: correct Vega20 cached smu feature state 



[ Upstream commit 266d81d9eed30f4994d76a2b237c63ece062eefe ]

Correct the cached smu feature state on pp_features sysfs
setting.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d2da80e0

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c

+19 −19
Original line number Diff line number Diff line
@@ -981,27 +981,15 @@ static int vega20_disable_all_smu_features(struct pp_hwmgr *hwmgr) 
{

	struct vega20_hwmgr *data =

			(struct vega20_hwmgr *)(hwmgr->backend);

	uint64_t features_enabled;

	int i;

	bool enabled;

	int ret = 0;

	int i, ret = 0;



	PP_ASSERT_WITH_CODE((ret = smum_send_msg_to_smc(hwmgr,

			PPSMC_MSG_DisableAllSmuFeatures)) == 0,

			"[DisableAllSMUFeatures] Failed to disable all smu features!",

			return ret);



	ret = vega20_get_enabled_smc_features(hwmgr, &features_enabled);

	PP_ASSERT_WITH_CODE(!ret,

			"[DisableAllSMUFeatures] Failed to get enabled smc features!",

			return ret);



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

		enabled = (features_enabled & data->smu_features[i].smu_feature_bitmap) ?

			true : false;

		data->smu_features[i].enabled = enabled;

		data->smu_features[i].supported = enabled;

	}

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

		data->smu_features[i].enabled = 0;



	return 0;

}
@@ -3211,10 +3199,11 @@ static int vega20_get_ppfeature_status(struct pp_hwmgr *hwmgr, char *buf) 


static int vega20_set_ppfeature_status(struct pp_hwmgr *hwmgr, uint64_t new_ppfeature_masks)

{

	uint64_t features_enabled;

	uint64_t features_to_enable;

	uint64_t features_to_disable;

	int ret = 0;

	struct vega20_hwmgr *data =

			(struct vega20_hwmgr *)(hwmgr->backend);

	uint64_t features_enabled, features_to_enable, features_to_disable;

	int i, ret = 0;

	bool enabled;



	if (new_ppfeature_masks >= (1ULL << GNLD_FEATURES_MAX))

		return -EINVAL;
@@ -3243,6 +3232,17 @@ static int vega20_set_ppfeature_status(struct pp_hwmgr *hwmgr, uint64_t new_ppfe 
			return ret;

	}



	/* Update the cached feature enablement state */

	ret = vega20_get_enabled_smc_features(hwmgr, &features_enabled);

	if (ret)

		return ret;



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

		enabled = (features_enabled & data->smu_features[i].smu_feature_bitmap) ?

			true : false;

		data->smu_features[i].enabled = enabled;

	}



	return 0;

}