Commit 7843f537 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/powerplay: avoid calling SMU9 specific SMU message implemention 



Prepare for coming lock protection for SMU message issuing.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarKenneth Feng <kenneth.feng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 92e0070e

drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c

+12 −12
Original line number Diff line number Diff line
@@ -47,13 +47,13 @@ static int vega10_copy_table_from_smc(struct pp_hwmgr *hwmgr, 
			"Invalid SMU Table version!", return -EINVAL);

	PP_ASSERT_WITH_CODE(priv->smu_tables.entry[table_id].size != 0,

			"Invalid SMU Table Length!", return -EINVAL);

	smu9_send_msg_to_smc_with_parameter(hwmgr,

	smum_send_msg_to_smc_with_parameter(hwmgr,

			PPSMC_MSG_SetDriverDramAddrHigh,

			upper_32_bits(priv->smu_tables.entry[table_id].mc_addr));

	smu9_send_msg_to_smc_with_parameter(hwmgr,

	smum_send_msg_to_smc_with_parameter(hwmgr,

			PPSMC_MSG_SetDriverDramAddrLow,

			lower_32_bits(priv->smu_tables.entry[table_id].mc_addr));

	smu9_send_msg_to_smc_with_parameter(hwmgr,

	smum_send_msg_to_smc_with_parameter(hwmgr,

			PPSMC_MSG_TransferTableSmu2Dram,

			priv->smu_tables.entry[table_id].table_id);
@@ -90,13 +90,13 @@ static int vega10_copy_table_to_smc(struct pp_hwmgr *hwmgr, 


	amdgpu_asic_flush_hdp(adev, NULL);



	smu9_send_msg_to_smc_with_parameter(hwmgr,

	smum_send_msg_to_smc_with_parameter(hwmgr,

			PPSMC_MSG_SetDriverDramAddrHigh,

			upper_32_bits(priv->smu_tables.entry[table_id].mc_addr));

	smu9_send_msg_to_smc_with_parameter(hwmgr,

	smum_send_msg_to_smc_with_parameter(hwmgr,

			PPSMC_MSG_SetDriverDramAddrLow,

			lower_32_bits(priv->smu_tables.entry[table_id].mc_addr));

	smu9_send_msg_to_smc_with_parameter(hwmgr,

	smum_send_msg_to_smc_with_parameter(hwmgr,

			PPSMC_MSG_TransferTableDram2Smu,

			priv->smu_tables.entry[table_id].table_id);
@@ -127,8 +127,8 @@ int vega10_get_enabled_smc_features(struct pp_hwmgr *hwmgr, 
	if (features_enabled == NULL)

		return -EINVAL;



	smu9_send_msg_to_smc(hwmgr, PPSMC_MSG_GetEnabledSmuFeatures);

	*features_enabled = smu9_get_argument(hwmgr);

	smum_send_msg_to_smc(hwmgr, PPSMC_MSG_GetEnabledSmuFeatures);

	*features_enabled = smum_get_argument(hwmgr);



	return 0;

}
@@ -150,10 +150,10 @@ static int vega10_set_tools_address(struct pp_hwmgr *hwmgr) 
	struct vega10_smumgr *priv = hwmgr->smu_backend;



	if (priv->smu_tables.entry[TOOLSTABLE].mc_addr) {

		smu9_send_msg_to_smc_with_parameter(hwmgr,

		smum_send_msg_to_smc_with_parameter(hwmgr,

				PPSMC_MSG_SetToolsDramAddrHigh,

				upper_32_bits(priv->smu_tables.entry[TOOLSTABLE].mc_addr));

		smu9_send_msg_to_smc_with_parameter(hwmgr,

		smum_send_msg_to_smc_with_parameter(hwmgr,

				PPSMC_MSG_SetToolsDramAddrLow,

				lower_32_bits(priv->smu_tables.entry[TOOLSTABLE].mc_addr));

	}
@@ -167,11 +167,11 @@ static int vega10_verify_smc_interface(struct pp_hwmgr *hwmgr) 
	uint32_t dev_id;

	uint32_t rev_id;



	PP_ASSERT_WITH_CODE(!smu9_send_msg_to_smc(hwmgr,

	PP_ASSERT_WITH_CODE(!smum_send_msg_to_smc(hwmgr,

			PPSMC_MSG_GetDriverIfVersion),

			"Attempt to get SMC IF Version Number Failed!",

			return -EINVAL);

	smc_driver_if_version = smu9_get_argument(hwmgr);

	smc_driver_if_version = smum_get_argument(hwmgr);



	dev_id = adev->pdev->device;

	rev_id = adev->pdev->revision;

drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c

+16 −16
Original line number Diff line number Diff line
@@ -50,16 +50,16 @@ static int vega12_copy_table_from_smc(struct pp_hwmgr *hwmgr, 
			"Invalid SMU Table version!", return -EINVAL);

	PP_ASSERT_WITH_CODE(priv->smu_tables.entry[table_id].size != 0,

			"Invalid SMU Table Length!", return -EINVAL);

	PP_ASSERT_WITH_CODE(smu9_send_msg_to_smc_with_parameter(hwmgr,

	PP_ASSERT_WITH_CODE(smum_send_msg_to_smc_with_parameter(hwmgr,

			PPSMC_MSG_SetDriverDramAddrHigh,

			upper_32_bits(priv->smu_tables.entry[table_id].mc_addr)) == 0,

			"[CopyTableFromSMC] Attempt to Set Dram Addr High Failed!", return -EINVAL);

	PP_ASSERT_WITH_CODE(smu9_send_msg_to_smc_with_parameter(hwmgr,

	PP_ASSERT_WITH_CODE(smum_send_msg_to_smc_with_parameter(hwmgr,

			PPSMC_MSG_SetDriverDramAddrLow,

			lower_32_bits(priv->smu_tables.entry[table_id].mc_addr)) == 0,

			"[CopyTableFromSMC] Attempt to Set Dram Addr Low Failed!",

			return -EINVAL);

	PP_ASSERT_WITH_CODE(smu9_send_msg_to_smc_with_parameter(hwmgr,

	PP_ASSERT_WITH_CODE(smum_send_msg_to_smc_with_parameter(hwmgr,

			PPSMC_MSG_TransferTableSmu2Dram,

			table_id) == 0,

			"[CopyTableFromSMC] Attempt to Transfer Table From SMU Failed!",
@@ -98,17 +98,17 @@ static int vega12_copy_table_to_smc(struct pp_hwmgr *hwmgr, 


	amdgpu_asic_flush_hdp(adev, NULL);



	PP_ASSERT_WITH_CODE(smu9_send_msg_to_smc_with_parameter(hwmgr,

	PP_ASSERT_WITH_CODE(smum_send_msg_to_smc_with_parameter(hwmgr,

			PPSMC_MSG_SetDriverDramAddrHigh,

			upper_32_bits(priv->smu_tables.entry[table_id].mc_addr)) == 0,

			"[CopyTableToSMC] Attempt to Set Dram Addr High Failed!",

			return -EINVAL;);

	PP_ASSERT_WITH_CODE(smu9_send_msg_to_smc_with_parameter(hwmgr,

	PP_ASSERT_WITH_CODE(smum_send_msg_to_smc_with_parameter(hwmgr,

			PPSMC_MSG_SetDriverDramAddrLow,

			lower_32_bits(priv->smu_tables.entry[table_id].mc_addr)) == 0,

			"[CopyTableToSMC] Attempt to Set Dram Addr Low Failed!",

			return -EINVAL);

	PP_ASSERT_WITH_CODE(smu9_send_msg_to_smc_with_parameter(hwmgr,

	PP_ASSERT_WITH_CODE(smum_send_msg_to_smc_with_parameter(hwmgr,

			PPSMC_MSG_TransferTableDram2Smu,

			table_id) == 0,

			"[CopyTableToSMC] Attempt to Transfer Table To SMU Failed!",
@@ -126,20 +126,20 @@ int vega12_enable_smc_features(struct pp_hwmgr *hwmgr, 
	smu_features_high = (uint32_t)((feature_mask & SMU_FEATURES_HIGH_MASK) >> SMU_FEATURES_HIGH_SHIFT);



	if (enable) {

		PP_ASSERT_WITH_CODE(smu9_send_msg_to_smc_with_parameter(hwmgr,

		PP_ASSERT_WITH_CODE(smum_send_msg_to_smc_with_parameter(hwmgr,

				PPSMC_MSG_EnableSmuFeaturesLow, smu_features_low) == 0,

				"[EnableDisableSMCFeatures] Attempt to enable SMU features Low failed!",

				return -EINVAL);

		PP_ASSERT_WITH_CODE(smu9_send_msg_to_smc_with_parameter(hwmgr,

		PP_ASSERT_WITH_CODE(smum_send_msg_to_smc_with_parameter(hwmgr,

				PPSMC_MSG_EnableSmuFeaturesHigh, smu_features_high) == 0,

				"[EnableDisableSMCFeatures] Attempt to enable SMU features High failed!",

				return -EINVAL);

	} else {

		PP_ASSERT_WITH_CODE(smu9_send_msg_to_smc_with_parameter(hwmgr,

		PP_ASSERT_WITH_CODE(smum_send_msg_to_smc_with_parameter(hwmgr,

				PPSMC_MSG_DisableSmuFeaturesLow, smu_features_low) == 0,

				"[EnableDisableSMCFeatures] Attempt to disable SMU features Low failed!",

				return -EINVAL);

		PP_ASSERT_WITH_CODE(smu9_send_msg_to_smc_with_parameter(hwmgr,

		PP_ASSERT_WITH_CODE(smum_send_msg_to_smc_with_parameter(hwmgr,

				PPSMC_MSG_DisableSmuFeaturesHigh, smu_features_high) == 0,

				"[EnableDisableSMCFeatures] Attempt to disable SMU features High failed!",

				return -EINVAL);
@@ -156,17 +156,17 @@ int vega12_get_enabled_smc_features(struct pp_hwmgr *hwmgr, 
	if (features_enabled == NULL)

		return -EINVAL;



	PP_ASSERT_WITH_CODE(smu9_send_msg_to_smc(hwmgr,

	PP_ASSERT_WITH_CODE(smum_send_msg_to_smc(hwmgr,

			PPSMC_MSG_GetEnabledSmuFeaturesLow) == 0,

			"[GetEnabledSMCFeatures] Attempt to get SMU features Low failed!",

			return -EINVAL);

	smc_features_low = smu9_get_argument(hwmgr);

	smc_features_low = smum_get_argument(hwmgr);



	PP_ASSERT_WITH_CODE(smu9_send_msg_to_smc(hwmgr,

	PP_ASSERT_WITH_CODE(smum_send_msg_to_smc(hwmgr,

			PPSMC_MSG_GetEnabledSmuFeaturesHigh) == 0,

			"[GetEnabledSMCFeatures] Attempt to get SMU features High failed!",

			return -EINVAL);

	smc_features_high = smu9_get_argument(hwmgr);

	smc_features_high = smum_get_argument(hwmgr);



	*features_enabled = ((((uint64_t)smc_features_low << SMU_FEATURES_LOW_SHIFT) & SMU_FEATURES_LOW_MASK) |

			(((uint64_t)smc_features_high << SMU_FEATURES_HIGH_SHIFT) & SMU_FEATURES_HIGH_MASK));
@@ -192,10 +192,10 @@ static int vega12_set_tools_address(struct pp_hwmgr *hwmgr) 
			(struct vega12_smumgr *)(hwmgr->smu_backend);



	if (priv->smu_tables.entry[TABLE_PMSTATUSLOG].mc_addr) {

		if (!smu9_send_msg_to_smc_with_parameter(hwmgr,

		if (!smum_send_msg_to_smc_with_parameter(hwmgr,

				PPSMC_MSG_SetToolsDramAddrHigh,

				upper_32_bits(priv->smu_tables.entry[TABLE_PMSTATUSLOG].mc_addr)))

			smu9_send_msg_to_smc_with_parameter(hwmgr,

			smum_send_msg_to_smc_with_parameter(hwmgr,

					PPSMC_MSG_SetToolsDramAddrLow,

					lower_32_bits(priv->smu_tables.entry[TABLE_PMSTATUSLOG].mc_addr));

	}