mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-28 21:33:52 +00:00
Code Issues Releases Wiki Activity

drm/amd/pm: bump SMU13.0.0 driver_if header to version 0x34

Browse source 
commit 272b981416 upstream.

To fit the latest PMFW and suppress the warning emerged on driver loading.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 6.0, 6.1
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Evan Quan 2022-12-15 13:38:46 +08:00 committed by Greg Kroah-Hartman
parent 59ad9d9723
commit c7a2baa10b
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h
View file

@ -522,9 +522,9 @@ typedef enum {
TEMP_HOTSPOT_M, TEMP_HOTSPOT_M,
TEMP_MEM, TEMP_MEM,
TEMP_VR_GFX, TEMP_VR_GFX,
TEMP_VR_SOC,
TEMP_VR_MEM0, TEMP_VR_MEM0,
TEMP_VR_MEM1, TEMP_VR_MEM1,
TEMP_VR_SOC,
TEMP_VR_U, TEMP_VR_U,
TEMP_LIQUID0, TEMP_LIQUID0,
TEMP_LIQUID1, TEMP_LIQUID1,

1
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h
View file

@ -28,6 +28,7 @@
#define SMU13_DRIVER_IF_VERSION_INV 0xFFFFFFFF #define SMU13_DRIVER_IF_VERSION_INV 0xFFFFFFFF
#define SMU13_DRIVER_IF_VERSION_YELLOW_CARP 0x04 #define SMU13_DRIVER_IF_VERSION_YELLOW_CARP 0x04
#define SMU13_DRIVER_IF_VERSION_ALDE 0x08 #define SMU13_DRIVER_IF_VERSION_ALDE 0x08
#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_0_0 0x34
#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_4 0x07 #define SMU13_DRIVER_IF_VERSION_SMU_V13_0_4 0x07
#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_5 0x04 #define SMU13_DRIVER_IF_VERSION_SMU_V13_0_5 0x04
#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_0_10 0x32 #define SMU13_DRIVER_IF_VERSION_SMU_V13_0_0_10 0x32

2
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
View file

@ -288,6 +288,8 @@ int smu_v13_0_check_fw_version(struct smu_context *smu)
smu->smc_driver_if_version = SMU13_DRIVER_IF_VERSION_ALDE; smu->smc_driver_if_version = SMU13_DRIVER_IF_VERSION_ALDE;
break; break;
case IP_VERSION(13, 0, 0): case IP_VERSION(13, 0, 0):
smu->smc_driver_if_version = SMU13_DRIVER_IF_VERSION_SMU_V13_0_0_0;
break;
case IP_VERSION(13, 0, 10): case IP_VERSION(13, 0, 10):
smu->smc_driver_if_version = SMU13_DRIVER_IF_VERSION_SMU_V13_0_0_10; smu->smc_driver_if_version = SMU13_DRIVER_IF_VERSION_SMU_V13_0_0_10;
break; break;