diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3824-drm-amdgpu-gfx10-add-support-for-wks-firmware-loadin.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3824-drm-amdgpu-gfx10-add-support-for-wks-firmware-loadin.patch | 106 |
1 files changed, 106 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3824-drm-amdgpu-gfx10-add-support-for-wks-firmware-loadin.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3824-drm-amdgpu-gfx10-add-support-for-wks-firmware-loadin.patch new file mode 100644 index 00000000..25efb32e --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3824-drm-amdgpu-gfx10-add-support-for-wks-firmware-loadin.patch @@ -0,0 +1,106 @@ +From 59a1b672b32b60a65f2e103909fe8bf51fc77672 Mon Sep 17 00:00:00 2001 +From: "Tianci.Yin" <tianci.yin@amd.com> +Date: Thu, 12 Sep 2019 17:40:22 +0800 +Subject: [PATCH 3824/4256] drm/amdgpu/gfx10: add support for wks firmware + loading + +load different cp firmware according to the DID and RID + +Change-Id: I6bb4cee12c8c47be6d3ef1150df93d7e1fbbecc7 +Reviewed-by: Feifei Xu <Feifei.Xu@amd.com> +Signed-off-by: Tianci.Yin <tianci.yin@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 22 ++++++++++++++++------ + 1 file changed, 16 insertions(+), 6 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +index 082a0b3298a9..65caf404e7d1 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +@@ -66,6 +66,11 @@ MODULE_FIRMWARE("amdgpu/navi10_mec.bin"); + MODULE_FIRMWARE("amdgpu/navi10_mec2.bin"); + MODULE_FIRMWARE("amdgpu/navi10_rlc.bin"); + ++MODULE_FIRMWARE("amdgpu/navi14_ce_wks.bin"); ++MODULE_FIRMWARE("amdgpu/navi14_pfp_wks.bin"); ++MODULE_FIRMWARE("amdgpu/navi14_me_wks.bin"); ++MODULE_FIRMWARE("amdgpu/navi14_mec_wks.bin"); ++MODULE_FIRMWARE("amdgpu/navi14_mec2_wks.bin"); + MODULE_FIRMWARE("amdgpu/navi14_ce.bin"); + MODULE_FIRMWARE("amdgpu/navi14_pfp.bin"); + MODULE_FIRMWARE("amdgpu/navi14_me.bin"); +@@ -591,7 +596,8 @@ static void gfx_v10_0_check_gfxoff_flag(struct amdgpu_device *adev) + static int gfx_v10_0_init_microcode(struct amdgpu_device *adev) + { + const char *chip_name; +- char fw_name[30]; ++ char fw_name[40]; ++ char wks[10]; + int err; + struct amdgpu_firmware_info *info = NULL; + const struct common_firmware_header *header = NULL; +@@ -604,12 +610,16 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev) + + DRM_DEBUG("\n"); + ++ memset(wks, 0, sizeof(wks)); + switch (adev->asic_type) { + case CHIP_NAVI10: + chip_name = "navi10"; + break; + case CHIP_NAVI14: + chip_name = "navi14"; ++ if (!(adev->pdev->device == 0x7340 && ++ adev->pdev->revision != 0x00)) ++ snprintf(wks, sizeof(wks), "_wks"); + break; + case CHIP_NAVI12: + chip_name = "navi12"; +@@ -618,7 +628,7 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev) + BUG(); + } + +- snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_pfp.bin", chip_name); ++ snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_pfp%s.bin", chip_name, wks); + err = request_firmware(&adev->gfx.pfp_fw, fw_name, adev->dev); + if (err) + goto out; +@@ -629,7 +639,7 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev) + adev->gfx.pfp_fw_version = le32_to_cpu(cp_hdr->header.ucode_version); + adev->gfx.pfp_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version); + +- snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_me.bin", chip_name); ++ snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_me%s.bin", chip_name, wks); + err = request_firmware(&adev->gfx.me_fw, fw_name, adev->dev); + if (err) + goto out; +@@ -640,7 +650,7 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev) + adev->gfx.me_fw_version = le32_to_cpu(cp_hdr->header.ucode_version); + adev->gfx.me_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version); + +- snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ce.bin", chip_name); ++ snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ce%s.bin", chip_name, wks); + err = request_firmware(&adev->gfx.ce_fw, fw_name, adev->dev); + if (err) + goto out; +@@ -705,7 +715,7 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev) + if (adev->gfx.rlc.is_rlc_v2_1) + gfx_v10_0_init_rlc_ext_microcode(adev); + +- snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec.bin", chip_name); ++ snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec%s.bin", chip_name, wks); + err = request_firmware(&adev->gfx.mec_fw, fw_name, adev->dev); + if (err) + goto out; +@@ -716,7 +726,7 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev) + adev->gfx.mec_fw_version = le32_to_cpu(cp_hdr->header.ucode_version); + adev->gfx.mec_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version); + +- snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec2.bin", chip_name); ++ snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec2%s.bin", chip_name, wks); + err = request_firmware(&adev->gfx.mec2_fw, fw_name, adev->dev); + if (!err) { + err = amdgpu_ucode_validate(adev->gfx.mec2_fw); +-- +2.17.1 + |