Commit 2d282665 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/pm: update the data type for retrieving enabled ppfeatures 



Use uint64_t instead of an array of uint32_t. This can avoid
some non-necessary intermediate uint32_t -> uint64_t conversions.

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 5af779ad

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

+1 −1
Original line number Diff line number Diff line
@@ -2341,7 +2341,7 @@ static int smu_read_sensor(void *handle, 
		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_ENABLED_SMC_FEATURES_MASK:

		ret = smu_feature_get_enabled_mask(smu, (uint32_t *)data, 2);

		ret = smu_feature_get_enabled_mask(smu, (uint64_t *)data);

		*size = 8;

		break;

	case AMDGPU_PP_SENSOR_UVD_POWER:

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

+2 −3
Original line number Diff line number Diff line
@@ -989,10 +989,9 @@ struct pptable_funcs { 
	/**

	 * @get_enabled_mask: Get a mask of features that are currently enabled

	 *                    on the SMU.

	 * &feature_mask: Array representing enabled feature mask.

	 * &num: Elements in &feature_mask.

	 * &feature_mask: Enabled feature mask.

	 */

	int (*get_enabled_mask)(struct smu_context *smu, uint32_t *feature_mask, uint32_t num);

	int (*get_enabled_mask)(struct smu_context *smu, uint64_t *feature_mask);



	/**

	 * @feature_is_enabled: Test if a feature is enabled.

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

+1 −4
Original line number Diff line number Diff line
@@ -2021,15 +2021,12 @@ static void arcturus_dump_pptable(struct smu_context *smu) 
static bool arcturus_is_dpm_running(struct smu_context *smu)

{

	int ret = 0;

	uint32_t feature_mask[2];

	uint64_t feature_enabled;



	ret = smu_cmn_get_enabled_mask(smu, feature_mask, 2);

	ret = smu_cmn_get_enabled_mask(smu, &feature_enabled);

	if (ret)

		return false;



	feature_enabled = (uint64_t)feature_mask[1] << 32 | feature_mask[0];



	return !!(feature_enabled & SMC_DPM_FEATURE);

}

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

+1 −5
Original line number Diff line number Diff line
@@ -350,20 +350,16 @@ static bool cyan_skillfish_is_dpm_running(struct smu_context *smu) 
{

	struct amdgpu_device *adev = smu->adev;

	int ret = 0;

	uint32_t feature_mask[2];

	uint64_t feature_enabled;



	/* we need to re-init after suspend so return false */

	if (adev->in_suspend)

		return false;



	ret = smu_cmn_get_enabled_mask(smu, feature_mask, 2);

	ret = smu_cmn_get_enabled_mask(smu, &feature_enabled);

	if (ret)

		return false;



	feature_enabled = (uint64_t)feature_mask[0] |

				((uint64_t)feature_mask[1] << 32);



	/*

	 * cyan_skillfish specific, query default sclk inseted of hard code.

	 */

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

+1 −4
Original line number Diff line number Diff line
@@ -1639,15 +1639,12 @@ static int navi10_display_config_changed(struct smu_context *smu) 
static bool navi10_is_dpm_running(struct smu_context *smu)

{

	int ret = 0;

	uint32_t feature_mask[2];

	uint64_t feature_enabled;



	ret = smu_cmn_get_enabled_mask(smu, feature_mask, 2);

	ret = smu_cmn_get_enabled_mask(smu, &feature_enabled);

	if (ret)

		return false;



	feature_enabled = (uint64_t)feature_mask[1] << 32 | feature_mask[0];



	return !!(feature_enabled & SMC_DPM_FEATURE);

}