Merge tag 'amd-drm-next-6.7-2023-10-13' of https://gitlab.freedesktop.org/agd5f/linux...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / pm / swsmu / inc / smu_types.h

diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
index e57265cf637c990692b64c96274447d0f87179c9..9dd47d91093eb6e3248c8d6de8edc5ed493be137 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
+++ b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
@@ -247,7 +247,19 @@
        __SMU_DUMMY_MAP(Mode2Reset),    \
        __SMU_DUMMY_MAP(RequestI2cTransaction), \
        __SMU_DUMMY_MAP(GetMetricsTable), \
-       __SMU_DUMMY_MAP(DALNotPresent),
+       __SMU_DUMMY_MAP(DALNotPresent), \
+       __SMU_DUMMY_MAP(ClearMcaOnRead),        \
+       __SMU_DUMMY_MAP(QueryValidMcaCount),    \
+       __SMU_DUMMY_MAP(QueryValidMcaCeCount),  \
+       __SMU_DUMMY_MAP(McaBankDumpDW),         \
+       __SMU_DUMMY_MAP(McaBankCeDumpDW),       \
+       __SMU_DUMMY_MAP(SelectPLPDMode),        \
+       __SMU_DUMMY_MAP(PowerUpVpe),    \
+       __SMU_DUMMY_MAP(PowerDownVpe), \
+       __SMU_DUMMY_MAP(PowerUpUmsch),  \
+       __SMU_DUMMY_MAP(PowerDownUmsch),        \
+       __SMU_DUMMY_MAP(SetSoftMaxVpe), \
+       __SMU_DUMMY_MAP(SetSoftMinVpe),
 
 #undef __SMU_DUMMY_MAP
 #define __SMU_DUMMY_MAP(type)  SMU_MSG_##type
@@ -280,6 +292,11 @@ enum smu_clk_type {
        SMU_OD_VDDC_CURVE,
        SMU_OD_RANGE,
        SMU_OD_VDDGFX_OFFSET,
+       SMU_OD_FAN_CURVE,
+       SMU_OD_ACOUSTIC_LIMIT,
+       SMU_OD_ACOUSTIC_TARGET,
+       SMU_OD_FAN_TARGET_TEMPERATURE,
+       SMU_OD_FAN_MINIMUM_PWM,
        SMU_CLK_COUNT,
 };
 
@@ -404,7 +421,9 @@ enum smu_clk_type {
        __SMU_DUMMY_MAP(MEM_TEMP_READ),                 \
        __SMU_DUMMY_MAP(ATHUB_MMHUB_PG),                        \
        __SMU_DUMMY_MAP(BACO_CG),                       \
-       __SMU_DUMMY_MAP(SOC_CG),
+       __SMU_DUMMY_MAP(SOC_CG),    \
+       __SMU_DUMMY_MAP(LOW_POWER_DCNCLKS),       \
+       __SMU_DUMMY_MAP(WHISPER_MODE),
 
 #undef __SMU_DUMMY_MAP
 #define __SMU_DUMMY_MAP(feature)       SMU_FEATURE_##feature##_BIT