drm/amdgpu/vg20:support new UVD FW version naming convention

Vega20 UVD Firmware has a new version naming convention:
  [31, 30] for encode interface major
  [29, 24] for encode interface minor
  [15, 8] for decode interface minor
  [7, 0] for hardware family id

Signed-off-by: James Zhu <James.Zhu@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index bcf68f80bbf058b9cfb8f7a1239f82259f95774b..630e273c16cebc6c99e8e0c6f285995c79b410a3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -208,10 +208,21 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
 
        hdr = (const struct common_firmware_header *)adev->uvd.fw->data;
        family_id = le32_to_cpu(hdr->ucode_version) & 0xff;
-       version_major = (le32_to_cpu(hdr->ucode_version) >> 24) & 0xff;
-       version_minor = (le32_to_cpu(hdr->ucode_version) >> 8) & 0xff;
-       DRM_INFO("Found UVD firmware Version: %hu.%hu Family ID: %hu\n",
-               version_major, version_minor, family_id);
+
+       if (adev->asic_type < CHIP_VEGA20) {
+               version_major = (le32_to_cpu(hdr->ucode_version) >> 24) & 0xff;
+               version_minor = (le32_to_cpu(hdr->ucode_version) >> 8) & 0xff;
+               DRM_INFO("Found UVD firmware Version: %hu.%hu Family ID: %hu\n",
+                       version_major, version_minor, family_id);
+       } else {
+               unsigned int enc_major, enc_minor, dec_minor;
+
+               dec_minor = (le32_to_cpu(hdr->ucode_version) >> 8) & 0xff;
+               enc_minor = (le32_to_cpu(hdr->ucode_version) >> 24) & 0x3f;
+               enc_major = (le32_to_cpu(hdr->ucode_version) >> 30) & 0x3;
+               DRM_INFO("Found UVD firmware ENC: %hu.%hu DEC: .%hu Family ID: %hu\n",
+                       enc_major, enc_minor, dec_minor, family_id);
+       }
 
        /*
         * Limit the number of UVD handles depending on microcode major
@@ -219,7 +230,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
         * instances support is 1.80. So all subsequent versions should
         * also have the same support.
         */
-       if ((version_major > 0x01) ||
+       if (adev->asic_type >= CHIP_VEGA20 || (version_major > 0x01) ||
            ((version_major == 0x01) && (version_minor >= 0x50)))
                adev->uvd.max_handles = AMDGPU_MAX_UVD_HANDLES;