tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm/amd/pm: bump SMU 13.0.7 driver_if header version

This can suppress the warning caused by version mismatch.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Guchun Chen <guchun.chen@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 6.1.x

authored by

Evan Quan and committed by
Alex Deucher dc38b996 9874cc2d

+16 -15
+15 -14
drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h
··· 113 113 #define NUM_FEATURES 64 114 114 115 115 #define ALLOWED_FEATURE_CTRL_DEFAULT 0xFFFFFFFFFFFFFFFFULL 116 - #define ALLOWED_FEATURE_CTRL_SCPM (1 << FEATURE_DPM_GFXCLK_BIT) | \ 117 - (1 << FEATURE_DPM_GFX_POWER_OPTIMIZER_BIT) | \ 118 - (1 << FEATURE_DPM_UCLK_BIT) | \ 119 - (1 << FEATURE_DPM_FCLK_BIT) | \ 120 - (1 << FEATURE_DPM_SOCCLK_BIT) | \ 121 - (1 << FEATURE_DPM_MP0CLK_BIT) | \ 122 - (1 << FEATURE_DPM_LINK_BIT) | \ 123 - (1 << FEATURE_DPM_DCN_BIT) | \ 124 - (1 << FEATURE_DS_GFXCLK_BIT) | \ 125 - (1 << FEATURE_DS_SOCCLK_BIT) | \ 126 - (1 << FEATURE_DS_FCLK_BIT) | \ 127 - (1 << FEATURE_DS_LCLK_BIT) | \ 128 - (1 << FEATURE_DS_DCFCLK_BIT) | \ 129 - (1 << FEATURE_DS_UCLK_BIT) 116 + #define ALLOWED_FEATURE_CTRL_SCPM ((1 << FEATURE_DPM_GFXCLK_BIT) | \ 117 + (1 << FEATURE_DPM_GFX_POWER_OPTIMIZER_BIT) | \ 118 + (1 << FEATURE_DPM_UCLK_BIT) | \ 119 + (1 << FEATURE_DPM_FCLK_BIT) | \ 120 + (1 << FEATURE_DPM_SOCCLK_BIT) | \ 121 + (1 << FEATURE_DPM_MP0CLK_BIT) | \ 122 + (1 << FEATURE_DPM_LINK_BIT) | \ 123 + (1 << FEATURE_DPM_DCN_BIT) | \ 124 + (1 << FEATURE_DS_GFXCLK_BIT) | \ 125 + (1 << FEATURE_DS_SOCCLK_BIT) | \ 126 + (1 << FEATURE_DS_FCLK_BIT) | \ 127 + (1 << FEATURE_DS_LCLK_BIT) | \ 128 + (1 << FEATURE_DS_DCFCLK_BIT) | \ 129 + (1 << FEATURE_DS_UCLK_BIT) | \ 130 + (1ULL << FEATURE_DS_VCN_BIT)) 130 131 131 132 //For use with feature control messages 132 133 typedef enum {
+1 -1
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h
··· 32 32 #define SMU13_DRIVER_IF_VERSION_SMU_V13_0_4 0x07 33 33 #define SMU13_DRIVER_IF_VERSION_SMU_V13_0_5 0x04 34 34 #define SMU13_DRIVER_IF_VERSION_SMU_V13_0_0_10 0x32 35 - #define SMU13_DRIVER_IF_VERSION_SMU_V13_0_7 0x35 35 + #define SMU13_DRIVER_IF_VERSION_SMU_V13_0_7 0x37 36 36 #define SMU13_DRIVER_IF_VERSION_SMU_V13_0_10 0x1D 37 37 38 38 #define SMU13_MODE1_RESET_WAIT_TIME_IN_MS 500 //500ms