Commit 518dcf95 authored by Likun Gao's avatar Likun Gao Committed by Alex Deucher
Browse files

drm/amd/powerplay: correct smu message for vf mode 



Set valid_in_vf to false for the message not support in vf mode on
sienna cichlid.

Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ef69ab6a

drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c

+35 −35
Original line number Diff line number Diff line
@@ -74,10 +74,10 @@ static struct cmn2asic_msg_mapping sienna_cichlid_message_map[SMU_MSG_MAX_COUNT] 
	MSG_MAP(TestMessage,			PPSMC_MSG_TestMessage,                 1),

	MSG_MAP(GetSmuVersion,			PPSMC_MSG_GetSmuVersion,               1),

	MSG_MAP(GetDriverIfVersion,		PPSMC_MSG_GetDriverIfVersion,          1),

	MSG_MAP(SetAllowedFeaturesMaskLow,	PPSMC_MSG_SetAllowedFeaturesMaskLow,   1),

	MSG_MAP(SetAllowedFeaturesMaskHigh,	PPSMC_MSG_SetAllowedFeaturesMaskHigh,  1),

	MSG_MAP(EnableAllSmuFeatures,		PPSMC_MSG_EnableAllSmuFeatures,        1),

	MSG_MAP(DisableAllSmuFeatures,		PPSMC_MSG_DisableAllSmuFeatures,       1),

	MSG_MAP(SetAllowedFeaturesMaskLow,	PPSMC_MSG_SetAllowedFeaturesMaskLow,   0),

	MSG_MAP(SetAllowedFeaturesMaskHigh,	PPSMC_MSG_SetAllowedFeaturesMaskHigh,  0),

	MSG_MAP(EnableAllSmuFeatures,		PPSMC_MSG_EnableAllSmuFeatures,        0),

	MSG_MAP(DisableAllSmuFeatures,		PPSMC_MSG_DisableAllSmuFeatures,       0),

	MSG_MAP(EnableSmuFeaturesLow,		PPSMC_MSG_EnableSmuFeaturesLow,        1),

	MSG_MAP(EnableSmuFeaturesHigh,		PPSMC_MSG_EnableSmuFeaturesHigh,       1),

	MSG_MAP(DisableSmuFeaturesLow,		PPSMC_MSG_DisableSmuFeaturesLow,       1),
@@ -85,43 +85,43 @@ static struct cmn2asic_msg_mapping sienna_cichlid_message_map[SMU_MSG_MAX_COUNT] 
	MSG_MAP(GetEnabledSmuFeaturesLow,       PPSMC_MSG_GetRunningSmuFeaturesLow,    1),

	MSG_MAP(GetEnabledSmuFeaturesHigh,	PPSMC_MSG_GetRunningSmuFeaturesHigh,   1),

	MSG_MAP(SetWorkloadMask,		PPSMC_MSG_SetWorkloadMask,             1),

	MSG_MAP(SetPptLimit,			PPSMC_MSG_SetPptLimit,                 1),

	MSG_MAP(SetDriverDramAddrHigh,		PPSMC_MSG_SetDriverDramAddrHigh,       1),

	MSG_MAP(SetDriverDramAddrLow,		PPSMC_MSG_SetDriverDramAddrLow,        1),

	MSG_MAP(SetToolsDramAddrHigh,		PPSMC_MSG_SetToolsDramAddrHigh,        1),

	MSG_MAP(SetToolsDramAddrLow,		PPSMC_MSG_SetToolsDramAddrLow,         1),

	MSG_MAP(TransferTableSmu2Dram,		PPSMC_MSG_TransferTableSmu2Dram,       1),

	MSG_MAP(TransferTableDram2Smu,		PPSMC_MSG_TransferTableDram2Smu,       1),

	MSG_MAP(UseDefaultPPTable,		PPSMC_MSG_UseDefaultPPTable,           1),

	MSG_MAP(EnterBaco,			PPSMC_MSG_EnterBaco,                   1),

	MSG_MAP(SetSoftMinByFreq,		PPSMC_MSG_SetSoftMinByFreq,            1),

	MSG_MAP(SetSoftMaxByFreq,		PPSMC_MSG_SetSoftMaxByFreq,            1),

	MSG_MAP(SetPptLimit,			PPSMC_MSG_SetPptLimit,                 0),

	MSG_MAP(SetDriverDramAddrHigh,		PPSMC_MSG_SetDriverDramAddrHigh,       0),

	MSG_MAP(SetDriverDramAddrLow,		PPSMC_MSG_SetDriverDramAddrLow,        0),

	MSG_MAP(SetToolsDramAddrHigh,		PPSMC_MSG_SetToolsDramAddrHigh,        0),

	MSG_MAP(SetToolsDramAddrLow,		PPSMC_MSG_SetToolsDramAddrLow,         0),

	MSG_MAP(TransferTableSmu2Dram,		PPSMC_MSG_TransferTableSmu2Dram,       0),

	MSG_MAP(TransferTableDram2Smu,		PPSMC_MSG_TransferTableDram2Smu,       0),

	MSG_MAP(UseDefaultPPTable,		PPSMC_MSG_UseDefaultPPTable,           0),

	MSG_MAP(EnterBaco,			PPSMC_MSG_EnterBaco,                   0),

	MSG_MAP(SetSoftMinByFreq,		PPSMC_MSG_SetSoftMinByFreq,            0),

	MSG_MAP(SetSoftMaxByFreq,		PPSMC_MSG_SetSoftMaxByFreq,            0),

	MSG_MAP(SetHardMinByFreq,		PPSMC_MSG_SetHardMinByFreq,            1),

	MSG_MAP(SetHardMaxByFreq,		PPSMC_MSG_SetHardMaxByFreq,            1),

	MSG_MAP(SetHardMaxByFreq,		PPSMC_MSG_SetHardMaxByFreq,            0),

	MSG_MAP(GetMinDpmFreq,			PPSMC_MSG_GetMinDpmFreq,               1),

	MSG_MAP(GetMaxDpmFreq,			PPSMC_MSG_GetMaxDpmFreq,               1),

	MSG_MAP(GetDpmFreqByIndex,		PPSMC_MSG_GetDpmFreqByIndex,           1),

	MSG_MAP(SetGeminiMode,			PPSMC_MSG_SetGeminiMode,               1),

	MSG_MAP(SetGeminiApertureHigh,		PPSMC_MSG_SetGeminiApertureHigh,       1),

	MSG_MAP(SetGeminiApertureLow,		PPSMC_MSG_SetGeminiApertureLow,        1),

	MSG_MAP(OverridePcieParameters,		PPSMC_MSG_OverridePcieParameters,      1),

	MSG_MAP(ReenableAcDcInterrupt,		PPSMC_MSG_ReenableAcDcInterrupt,       1),

	MSG_MAP(NotifyPowerSource,		PPSMC_MSG_NotifyPowerSource,           1),

	MSG_MAP(SetUclkFastSwitch,		PPSMC_MSG_SetUclkFastSwitch,           1),

	MSG_MAP(SetVideoFps,			PPSMC_MSG_SetVideoFps,                 1),

	MSG_MAP(SetGeminiMode,			PPSMC_MSG_SetGeminiMode,               0),

	MSG_MAP(SetGeminiApertureHigh,		PPSMC_MSG_SetGeminiApertureHigh,       0),

	MSG_MAP(SetGeminiApertureLow,		PPSMC_MSG_SetGeminiApertureLow,        0),

	MSG_MAP(OverridePcieParameters,		PPSMC_MSG_OverridePcieParameters,      0),

	MSG_MAP(ReenableAcDcInterrupt,		PPSMC_MSG_ReenableAcDcInterrupt,       0),

	MSG_MAP(NotifyPowerSource,		PPSMC_MSG_NotifyPowerSource,           0),

	MSG_MAP(SetUclkFastSwitch,		PPSMC_MSG_SetUclkFastSwitch,           0),

	MSG_MAP(SetVideoFps,			PPSMC_MSG_SetVideoFps,                 0),

	MSG_MAP(PrepareMp1ForUnload,		PPSMC_MSG_PrepareMp1ForUnload,         1),

	MSG_MAP(AllowGfxOff,			PPSMC_MSG_AllowGfxOff,                 1),

	MSG_MAP(DisallowGfxOff,			PPSMC_MSG_DisallowGfxOff,              1),

	MSG_MAP(GetPptLimit,			PPSMC_MSG_GetPptLimit,                 1),

	MSG_MAP(AllowGfxOff,			PPSMC_MSG_AllowGfxOff,                 0),

	MSG_MAP(DisallowGfxOff,			PPSMC_MSG_DisallowGfxOff,              0),

	MSG_MAP(GetPptLimit,			PPSMC_MSG_GetPptLimit,                 0),

	MSG_MAP(GetDcModeMaxDpmFreq,		PPSMC_MSG_GetDcModeMaxDpmFreq,         1),

	MSG_MAP(ExitBaco,			PPSMC_MSG_ExitBaco,                    1),

	MSG_MAP(PowerUpVcn,			PPSMC_MSG_PowerUpVcn,                  1),

	MSG_MAP(PowerDownVcn,			PPSMC_MSG_PowerDownVcn,                1),

	MSG_MAP(PowerUpJpeg,			PPSMC_MSG_PowerUpJpeg,                 1),

	MSG_MAP(PowerDownJpeg,			PPSMC_MSG_PowerDownJpeg,               1),

	MSG_MAP(BacoAudioD3PME,			PPSMC_MSG_BacoAudioD3PME,              1),

	MSG_MAP(ArmD3,				PPSMC_MSG_ArmD3,                       1),

	MSG_MAP(Mode1Reset,                     PPSMC_MSG_Mode1Reset,		       1),

	MSG_MAP(ExitBaco,			PPSMC_MSG_ExitBaco,                    0),

	MSG_MAP(PowerUpVcn,			PPSMC_MSG_PowerUpVcn,                  0),

	MSG_MAP(PowerDownVcn,			PPSMC_MSG_PowerDownVcn,                0),

	MSG_MAP(PowerUpJpeg,			PPSMC_MSG_PowerUpJpeg,                 0),

	MSG_MAP(PowerDownJpeg,			PPSMC_MSG_PowerDownJpeg,               0),

	MSG_MAP(BacoAudioD3PME,			PPSMC_MSG_BacoAudioD3PME,              0),

	MSG_MAP(ArmD3,				PPSMC_MSG_ArmD3,                       0),

	MSG_MAP(Mode1Reset,                     PPSMC_MSG_Mode1Reset,		       0),

};



static struct cmn2asic_mapping sienna_cichlid_clk_map[SMU_CLK_COUNT] = {