[PATCH] drm/amd/powerplay: simplify sw-smu message map macro
Huang, Ray
Ray.Huang at amd.com
Wed Mar 6 12:38:48 UTC 2019
> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf
> Of Wang, Kevin(Yang)
> Sent: Wednesday, March 06, 2019 7:53 PM
> To: amd-gfx at lists.freedesktop.org
> Cc: Huang, Ray <Ray.Huang at amd.com>; Wang, Kevin(Yang)
> <Kevin1.Wang at amd.com>
> Subject: [PATCH] drm/amd/powerplay: simplify sw-smu message map macro
>
> simplify macro of MSG_MAP for sw-smu
>
> Signed-off-by:Kevin Wang <kevin1.wang at amd.com>
Reviewed-by: Huang Rui <ray.huang at amd.com>
> ---
> drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 170 ++++++++++++++----
> -----------
> 1 file changed, 85 insertions(+), 85 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c
> b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c
> index c9cc7bb..f4869353 100644
> --- a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c
> +++ b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c
> @@ -40,8 +40,8 @@
> #define smnPCIE_LC_SPEED_CNTL 0x11140290
> #define smnPCIE_LC_LINK_WIDTH_CNTL 0x11140288
>
> -#define MSG_MAP(msg, index) \
> - [SMU_MSG_##msg] = index
> +#define MSG_MAP(msg) \
> + [SMU_MSG_##msg] = PPSMC_MSG_##msg
>
> #define SMC_DPM_FEATURE (FEATURE_DPM_PREFETCHER_MASK | \
> FEATURE_DPM_GFXCLK_MASK | \
> @@ -54,89 +54,89 @@
> FEATURE_DPM_DCEFCLK_MASK)
>
> static int vega20_message_map[SMU_MSG_MAX_COUNT] = {
> - MSG_MAP(TestMessage,
> PPSMC_MSG_TestMessage),
> - MSG_MAP(GetSmuVersion,
> PPSMC_MSG_GetSmuVersion),
> - MSG_MAP(GetDriverIfVersion,
> PPSMC_MSG_GetDriverIfVersion),
> - MSG_MAP(SetAllowedFeaturesMaskLow,
> PPSMC_MSG_SetAllowedFeaturesMaskLow),
> - MSG_MAP(SetAllowedFeaturesMaskHigh,
> PPSMC_MSG_SetAllowedFeaturesMaskHigh),
> - MSG_MAP(EnableAllSmuFeatures,
> PPSMC_MSG_EnableAllSmuFeatures),
> - MSG_MAP(DisableAllSmuFeatures,
> PPSMC_MSG_DisableAllSmuFeatures),
> - MSG_MAP(EnableSmuFeaturesLow,
> PPSMC_MSG_EnableSmuFeaturesLow),
> - MSG_MAP(EnableSmuFeaturesHigh,
> PPSMC_MSG_EnableSmuFeaturesHigh),
> - MSG_MAP(DisableSmuFeaturesLow,
> PPSMC_MSG_DisableSmuFeaturesLow),
> - MSG_MAP(DisableSmuFeaturesHigh,
> PPSMC_MSG_DisableSmuFeaturesHigh),
> - MSG_MAP(GetEnabledSmuFeaturesLow,
> PPSMC_MSG_GetEnabledSmuFeaturesLow),
> - MSG_MAP(GetEnabledSmuFeaturesHigh,
> PPSMC_MSG_GetEnabledSmuFeaturesHigh),
> - MSG_MAP(SetWorkloadMask,
> PPSMC_MSG_SetWorkloadMask),
> - MSG_MAP(SetPptLimit,
> PPSMC_MSG_SetPptLimit),
> - MSG_MAP(SetDriverDramAddrHigh,
> PPSMC_MSG_SetDriverDramAddrHigh),
> - MSG_MAP(SetDriverDramAddrLow,
> PPSMC_MSG_SetDriverDramAddrLow),
> - MSG_MAP(SetToolsDramAddrHigh,
> PPSMC_MSG_SetToolsDramAddrHigh),
> - MSG_MAP(SetToolsDramAddrLow,
> PPSMC_MSG_SetToolsDramAddrLow),
> - MSG_MAP(TransferTableSmu2Dram,
> PPSMC_MSG_TransferTableSmu2Dram),
> - MSG_MAP(TransferTableDram2Smu,
> PPSMC_MSG_TransferTableDram2Smu),
> - MSG_MAP(UseDefaultPPTable,
> PPSMC_MSG_UseDefaultPPTable),
> - MSG_MAP(UseBackupPPTable,
> PPSMC_MSG_UseBackupPPTable),
> - MSG_MAP(RunBtc,
> PPSMC_MSG_RunBtc),
> - MSG_MAP(RequestI2CBus,
> PPSMC_MSG_RequestI2CBus),
> - MSG_MAP(ReleaseI2CBus,
> PPSMC_MSG_ReleaseI2CBus),
> - MSG_MAP(SetFloorSocVoltage,
> PPSMC_MSG_SetFloorSocVoltage),
> - MSG_MAP(SoftReset, PPSMC_MSG_SoftReset),
> - MSG_MAP(StartBacoMonitor,
> PPSMC_MSG_StartBacoMonitor),
> - MSG_MAP(CancelBacoMonitor,
> PPSMC_MSG_CancelBacoMonitor),
> - MSG_MAP(EnterBaco, PPSMC_MSG_EnterBaco),
> - MSG_MAP(SetSoftMinByFreq,
> PPSMC_MSG_SetSoftMinByFreq),
> - MSG_MAP(SetSoftMaxByFreq,
> PPSMC_MSG_SetSoftMaxByFreq),
> - MSG_MAP(SetHardMinByFreq,
> PPSMC_MSG_SetHardMinByFreq),
> - MSG_MAP(SetHardMaxByFreq,
> PPSMC_MSG_SetHardMaxByFreq),
> - MSG_MAP(GetMinDpmFreq,
> PPSMC_MSG_GetMinDpmFreq),
> - MSG_MAP(GetMaxDpmFreq,
> PPSMC_MSG_GetMaxDpmFreq),
> - MSG_MAP(GetDpmFreqByIndex,
> PPSMC_MSG_GetDpmFreqByIndex),
> - MSG_MAP(GetDpmClockFreq,
> PPSMC_MSG_GetDpmClockFreq),
> - MSG_MAP(GetSsVoltageByDpm,
> PPSMC_MSG_GetSsVoltageByDpm),
> - MSG_MAP(SetMemoryChannelConfig,
> PPSMC_MSG_SetMemoryChannelConfig),
> - MSG_MAP(SetGeminiMode,
> PPSMC_MSG_SetGeminiMode),
> - MSG_MAP(SetGeminiApertureHigh,
> PPSMC_MSG_SetGeminiApertureHigh),
> - MSG_MAP(SetGeminiApertureLow,
> PPSMC_MSG_SetGeminiApertureLow),
> - MSG_MAP(SetMinLinkDpmByIndex,
> PPSMC_MSG_SetMinLinkDpmByIndex),
> - MSG_MAP(OverridePcieParameters,
> PPSMC_MSG_OverridePcieParameters),
> - MSG_MAP(OverDriveSetPercentage,
> PPSMC_MSG_OverDriveSetPercentage),
> - MSG_MAP(SetMinDeepSleepDcefclk,
> PPSMC_MSG_SetMinDeepSleepDcefclk),
> - MSG_MAP(ReenableAcDcInterrupt,
> PPSMC_MSG_ReenableAcDcInterrupt),
> - MSG_MAP(NotifyPowerSource,
> PPSMC_MSG_NotifyPowerSource),
> - MSG_MAP(SetUclkFastSwitch,
> PPSMC_MSG_SetUclkFastSwitch),
> - MSG_MAP(SetUclkDownHyst,
> PPSMC_MSG_SetUclkDownHyst),
> - MSG_MAP(GetCurrentRpm,
> PPSMC_MSG_GetCurrentRpm),
> - MSG_MAP(SetVideoFps,
> PPSMC_MSG_SetVideoFps),
> - MSG_MAP(SetTjMax, PPSMC_MSG_SetTjMax),
> - MSG_MAP(SetFanTemperatureTarget,
> PPSMC_MSG_SetFanTemperatureTarget),
> - MSG_MAP(PrepareMp1ForUnload,
> PPSMC_MSG_PrepareMp1ForUnload),
> - MSG_MAP(DramLogSetDramAddrHigh,
> PPSMC_MSG_DramLogSetDramAddrHigh),
> - MSG_MAP(DramLogSetDramAddrLow,
> PPSMC_MSG_DramLogSetDramAddrLow),
> - MSG_MAP(DramLogSetDramSize,
> PPSMC_MSG_DramLogSetDramSize),
> - MSG_MAP(SetFanMaxRpm,
> PPSMC_MSG_SetFanMaxRpm),
> - MSG_MAP(SetFanMinPwm,
> PPSMC_MSG_SetFanMinPwm),
> - MSG_MAP(ConfigureGfxDidt,
> PPSMC_MSG_ConfigureGfxDidt),
> - MSG_MAP(NumOfDisplays,
> PPSMC_MSG_NumOfDisplays),
> - MSG_MAP(RemoveMargins,
> PPSMC_MSG_RemoveMargins),
> - MSG_MAP(ReadSerialNumTop32,
> PPSMC_MSG_ReadSerialNumTop32),
> - MSG_MAP(ReadSerialNumBottom32,
> PPSMC_MSG_ReadSerialNumBottom32),
> - MSG_MAP(SetSystemVirtualDramAddrHigh,
> PPSMC_MSG_SetSystemVirtualDramAddrHigh),
> - MSG_MAP(SetSystemVirtualDramAddrLow,
> PPSMC_MSG_SetSystemVirtualDramAddrLow),
> - MSG_MAP(WaflTest, PPSMC_MSG_WaflTest),
> - MSG_MAP(SetFclkGfxClkRatio,
> PPSMC_MSG_SetFclkGfxClkRatio),
> - MSG_MAP(AllowGfxOff,
> PPSMC_MSG_AllowGfxOff),
> - MSG_MAP(DisallowGfxOff,
> PPSMC_MSG_DisallowGfxOff),
> - MSG_MAP(GetPptLimit,
> PPSMC_MSG_GetPptLimit),
> - MSG_MAP(GetDcModeMaxDpmFreq,
> PPSMC_MSG_GetDcModeMaxDpmFreq),
> - MSG_MAP(GetDebugData,
> PPSMC_MSG_GetDebugData),
> - MSG_MAP(SetXgmiMode,
> PPSMC_MSG_SetXgmiMode),
> - MSG_MAP(RunAfllBtc, PPSMC_MSG_RunAfllBtc),
> - MSG_MAP(ExitBaco, PPSMC_MSG_ExitBaco),
> - MSG_MAP(PrepareMp1ForReset,
> PPSMC_MSG_PrepareMp1ForReset),
> - MSG_MAP(PrepareMp1ForShutdown,
> PPSMC_MSG_PrepareMp1ForShutdown),
> - MSG_MAP(SetMGpuFanBoostLimitRpm,
> PPSMC_MSG_SetMGpuFanBoostLimitRpm),
> - MSG_MAP(GetAVFSVoltageByDpm,
> PPSMC_MSG_GetAVFSVoltageByDpm),
> + MSG_MAP(TestMessage),
> + MSG_MAP(GetSmuVersion),
> + MSG_MAP(GetDriverIfVersion),
> + MSG_MAP(SetAllowedFeaturesMaskLow),
> + MSG_MAP(SetAllowedFeaturesMaskHigh),
> + MSG_MAP(EnableAllSmuFeatures),
> + MSG_MAP(DisableAllSmuFeatures),
> + MSG_MAP(EnableSmuFeaturesLow),
> + MSG_MAP(EnableSmuFeaturesHigh),
> + MSG_MAP(DisableSmuFeaturesLow),
> + MSG_MAP(DisableSmuFeaturesHigh),
> + MSG_MAP(GetEnabledSmuFeaturesLow),
> + MSG_MAP(GetEnabledSmuFeaturesHigh),
> + MSG_MAP(SetWorkloadMask),
> + MSG_MAP(SetPptLimit),
> + MSG_MAP(SetDriverDramAddrHigh),
> + MSG_MAP(SetDriverDramAddrLow),
> + MSG_MAP(SetToolsDramAddrHigh),
> + MSG_MAP(SetToolsDramAddrLow),
> + MSG_MAP(TransferTableSmu2Dram),
> + MSG_MAP(TransferTableDram2Smu),
> + MSG_MAP(UseDefaultPPTable),
> + MSG_MAP(UseBackupPPTable),
> + MSG_MAP(RunBtc),
> + MSG_MAP(RequestI2CBus),
> + MSG_MAP(ReleaseI2CBus),
> + MSG_MAP(SetFloorSocVoltage),
> + MSG_MAP(SoftReset),
> + MSG_MAP(StartBacoMonitor),
> + MSG_MAP(CancelBacoMonitor),
> + MSG_MAP(EnterBaco),
> + MSG_MAP(SetSoftMinByFreq),
> + MSG_MAP(SetSoftMaxByFreq),
> + MSG_MAP(SetHardMinByFreq),
> + MSG_MAP(SetHardMaxByFreq),
> + MSG_MAP(GetMinDpmFreq),
> + MSG_MAP(GetMaxDpmFreq),
> + MSG_MAP(GetDpmFreqByIndex),
> + MSG_MAP(GetDpmClockFreq),
> + MSG_MAP(GetSsVoltageByDpm),
> + MSG_MAP(SetMemoryChannelConfig),
> + MSG_MAP(SetGeminiMode),
> + MSG_MAP(SetGeminiApertureHigh),
> + MSG_MAP(SetGeminiApertureLow),
> + MSG_MAP(SetMinLinkDpmByIndex),
> + MSG_MAP(OverridePcieParameters),
> + MSG_MAP(OverDriveSetPercentage),
> + MSG_MAP(SetMinDeepSleepDcefclk),
> + MSG_MAP(ReenableAcDcInterrupt),
> + MSG_MAP(NotifyPowerSource),
> + MSG_MAP(SetUclkFastSwitch),
> + MSG_MAP(SetUclkDownHyst),
> + MSG_MAP(GetCurrentRpm),
> + MSG_MAP(SetVideoFps),
> + MSG_MAP(SetTjMax),
> + MSG_MAP(SetFanTemperatureTarget),
> + MSG_MAP(PrepareMp1ForUnload),
> + MSG_MAP(DramLogSetDramAddrHigh),
> + MSG_MAP(DramLogSetDramAddrLow),
> + MSG_MAP(DramLogSetDramSize),
> + MSG_MAP(SetFanMaxRpm),
> + MSG_MAP(SetFanMinPwm),
> + MSG_MAP(ConfigureGfxDidt),
> + MSG_MAP(NumOfDisplays),
> + MSG_MAP(RemoveMargins),
> + MSG_MAP(ReadSerialNumTop32),
> + MSG_MAP(ReadSerialNumBottom32),
> + MSG_MAP(SetSystemVirtualDramAddrHigh),
> + MSG_MAP(SetSystemVirtualDramAddrLow),
> + MSG_MAP(WaflTest),
> + MSG_MAP(SetFclkGfxClkRatio),
> + MSG_MAP(AllowGfxOff),
> + MSG_MAP(DisallowGfxOff),
> + MSG_MAP(GetPptLimit),
> + MSG_MAP(GetDcModeMaxDpmFreq),
> + MSG_MAP(GetDebugData),
> + MSG_MAP(SetXgmiMode),
> + MSG_MAP(RunAfllBtc),
> + MSG_MAP(ExitBaco),
> + MSG_MAP(PrepareMp1ForReset),
> + MSG_MAP(PrepareMp1ForShutdown),
> + MSG_MAP(SetMGpuFanBoostLimitRpm),
> + MSG_MAP(GetAVFSVoltageByDpm),
> };
>
> static int vega20_get_smu_msg_index(struct smu_context *smc, uint32_t
> index)
> --
> 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
More information about the amd-gfx
mailing list