Merge tag 'amd-drm-next-5.11-2020-11-05' of git://people.freedesktop.org/~agd5f/linux...

[mirror_ubuntu-jammy-kernel.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_kms.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index efda38349a0322f108c2eb7d1abd2a4fa85d233a..918d4e9c6461aec7cfeaebab1eb39776f536ef5d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -325,6 +325,10 @@ static int amdgpu_firmware_info(struct drm_amdgpu_info_firmware *fw_info,
                fw_info->ver = adev->dm.dmcub_fw_version;
                fw_info->feature = 0;
                break;
+       case AMDGPU_INFO_FW_TOC:
+               fw_info->ver = adev->psp.toc_fw_version;
+               fw_info->feature = adev->psp.toc_feature_version;
+               break;
        default:
                return -EINVAL;
        }
@@ -1466,6 +1470,13 @@ static int amdgpu_debugfs_firmware_info(struct seq_file *m, void *data)
        seq_printf(m, "DMCUB feature version: %u, firmware version: 0x%08x\n",
                   fw_info.feature, fw_info.ver);
 
+       /* TOC */
+       query_fw.fw_type = AMDGPU_INFO_FW_TOC;
+       ret = amdgpu_firmware_info(&fw_info, &query_fw, adev);
+       if (ret)
+               return ret;
+       seq_printf(m, "TOC feature version: %u, firmware version: 0x%08x\n",
+                  fw_info.feature, fw_info.ver);
 
        seq_printf(m, "VBIOS version: %s\n", ctx->vbios_version);