Commit dcd10d87 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher

drm/amd/pm: fix reading SMU FW version from amdgpu_firmware_info on YC

This value does not get cached into adev->pm.fw_version during
startup for smu13 like it does for other SMU like smu12.
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 841933d5
...@@ -198,6 +198,7 @@ int smu_v13_0_check_fw_status(struct smu_context *smu) ...@@ -198,6 +198,7 @@ int smu_v13_0_check_fw_status(struct smu_context *smu)
int smu_v13_0_check_fw_version(struct smu_context *smu) int smu_v13_0_check_fw_version(struct smu_context *smu)
{ {
struct amdgpu_device *adev = smu->adev;
uint32_t if_version = 0xff, smu_version = 0xff; uint32_t if_version = 0xff, smu_version = 0xff;
uint16_t smu_major; uint16_t smu_major;
uint8_t smu_minor, smu_debug; uint8_t smu_minor, smu_debug;
...@@ -210,6 +211,8 @@ int smu_v13_0_check_fw_version(struct smu_context *smu) ...@@ -210,6 +211,8 @@ int smu_v13_0_check_fw_version(struct smu_context *smu)
smu_major = (smu_version >> 16) & 0xffff; smu_major = (smu_version >> 16) & 0xffff;
smu_minor = (smu_version >> 8) & 0xff; smu_minor = (smu_version >> 8) & 0xff;
smu_debug = (smu_version >> 0) & 0xff; smu_debug = (smu_version >> 0) & 0xff;
if (smu->is_apu)
adev->pm.fw_version = smu_version;
switch (smu->adev->ip_versions[MP1_HWIP][0]) { switch (smu->adev->ip_versions[MP1_HWIP][0]) {
case IP_VERSION(13, 0, 2): case IP_VERSION(13, 0, 2):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment