diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4652-drm-amdgpu-vg20-support-new-UVD-FW-version-naming-co.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/4652-drm-amdgpu-vg20-support-new-UVD-FW-version-naming-co.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4652-drm-amdgpu-vg20-support-new-UVD-FW-version-naming-co.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4652-drm-amdgpu-vg20-support-new-UVD-FW-version-naming-co.patch new file mode 100644 index 00000000..073a6a8b --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4652-drm-amdgpu-vg20-support-new-UVD-FW-version-naming-co.patch @@ -0,0 +1,60 @@ +From 59feb212fc82ef449af46186baabbe38546236c2 Mon Sep 17 00:00:00 2001 +From: James Zhu <James.Zhu@amd.com> +Date: Wed, 6 Jun 2018 14:38:14 -0400 +Subject: [PATCH 4652/5725] 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> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 21 ++++++++++++++++----- + 1 file changed, 16 insertions(+), 5 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +index aadc494..9ceab34 100644 +--- 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; + +-- +2.7.4 + |