Commit 3c6591e9 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/pm: drop the cache for enabled ppfeatures 



The following scenarios make the driver cache for enabled ppfeatures
outdated and invalid:
  - Other tools interact with PMFW to change the enabled ppfeatures.
  - PMFW may enable/disable some features behind driver's back. E.g.
    for sienna_cichild, on gfxoff entering, PMFW will disable gfx
    related DPM features. All those are performed without driver's
    notice.
Also considering driver does not actually interact with PMFW such
frequently, the benefit brought by such cache is very limited.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7ade3ca9

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

+0 −1
Original line number Diff line number Diff line
@@ -950,7 +950,6 @@ static int smu_sw_init(void *handle) 
	smu->pool_size = adev->pm.smu_prv_buffer_size;

	smu->smu_feature.feature_num = SMU_FEATURE_MAX;

	bitmap_zero(smu->smu_feature.supported, SMU_FEATURE_MAX);

	bitmap_zero(smu->smu_feature.enabled, SMU_FEATURE_MAX);

	bitmap_zero(smu->smu_feature.allowed, SMU_FEATURE_MAX);



	mutex_init(&smu->message_lock);

drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h

+0 −1
Original line number Diff line number Diff line
@@ -390,7 +390,6 @@ struct smu_feature 
	uint32_t feature_num;

	DECLARE_BITMAP(supported, SMU_FEATURE_MAX);

	DECLARE_BITMAP(allowed, SMU_FEATURE_MAX);

	DECLARE_BITMAP(enabled, SMU_FEATURE_MAX);

};



struct smu_clocks {

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

+2 −21
Original line number Diff line number Diff line
@@ -798,27 +798,8 @@ int smu_v11_0_set_allowed_mask(struct smu_context *smu) 
int smu_v11_0_system_features_control(struct smu_context *smu,

					     bool en)

{

	struct smu_feature *feature = &smu->smu_feature;

	uint64_t feature_mask;

	int ret = 0;



	ret = smu_cmn_send_smc_msg(smu, (en ? SMU_MSG_EnableAllSmuFeatures :

	return smu_cmn_send_smc_msg(smu, (en ? SMU_MSG_EnableAllSmuFeatures :

					  SMU_MSG_DisableAllSmuFeatures), NULL);

	if (ret)

		return ret;



	bitmap_zero(feature->enabled, feature->feature_num);



	if (en) {

		ret = smu_cmn_get_enabled_mask(smu, &feature_mask);

		if (ret)

			return ret;



		bitmap_copy(feature->enabled, (unsigned long *)&feature_mask,

			    feature->feature_num);

	}



	return ret;

}



int smu_v11_0_notify_display_change(struct smu_context *smu)

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

+1 −15
Original line number Diff line number Diff line
@@ -1947,27 +1947,13 @@ static int vangogh_get_dpm_clock_table(struct smu_context *smu, struct dpm_clock 
static int vangogh_system_features_control(struct smu_context *smu, bool en)

{

	struct amdgpu_device *adev = smu->adev;

	struct smu_feature *feature = &smu->smu_feature;

	uint64_t feature_mask;

	int ret = 0;



	if (adev->pm.fw_version >= 0x43f1700 && !en)

		ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_RlcPowerNotify,

						      RLC_STATUS_OFF, NULL);



	bitmap_zero(feature->enabled, feature->feature_num);



	if (!en)

		return ret;



	ret = smu_cmn_get_enabled_mask(smu, &feature_mask);

	if (ret)

	return ret;



	bitmap_copy(feature->enabled, (unsigned long *)&feature_mask,

		    feature->feature_num);



	return 0;

}



static int vangogh_post_smu_init(struct smu_context *smu)

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c

+2 −21
Original line number Diff line number Diff line
@@ -764,27 +764,8 @@ int smu_v13_0_gfx_off_control(struct smu_context *smu, bool enable) 
int smu_v13_0_system_features_control(struct smu_context *smu,

				      bool en)

{

	struct smu_feature *feature = &smu->smu_feature;

	uint64_t feature_mask;

	int ret = 0;



	ret = smu_cmn_send_smc_msg(smu, (en ? SMU_MSG_EnableAllSmuFeatures :

	return smu_cmn_send_smc_msg(smu, (en ? SMU_MSG_EnableAllSmuFeatures :

					  SMU_MSG_DisableAllSmuFeatures), NULL);

	if (ret)

		return ret;



	bitmap_zero(feature->enabled, feature->feature_num);



	if (en) {

		ret = smu_cmn_get_enabled_mask(smu, &feature_mask);

		if (ret)

			return ret;



		bitmap_copy(feature->enabled, (unsigned long *)&feature_mask,

			    feature->feature_num);

	}



	return ret;

}



int smu_v13_0_notify_display_change(struct smu_context *smu)