drm/amdgpu: support rlc_1 fw load for gc 12_1
Subsystems (2)
Alex Deucher
maintainerPATCH 1/2 drm/amdgpu: support rlc_1 fw load for gc 12_1
From: Likun Gao <[email protected]>
Add support to load rlc firmware for rev_id 0 of gfx v12_1.
Signed-off-by Likun Gao <[email protected]>
Reviewed-by Hawking Zhang <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c +8 -2
@@ -61,7 +61,7 @@#define regCP_HQD_IB_CONTROL_DEFAULT 0x00100000MODULE_FIRMWARE ("amdgpu/gc_12_1_0_mec.bin" ); -MODULE_FIRMWARE ("amdgpu/gc_12_1_0_rlc.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_12_1_0_rlc_1.bin" );#define SH_MEM_ALIGNMENT_MODE_UNALIGNED_GFX12_1_0 0x00000001#define DEFAULT_SH_MEM_CONFIG \
@@ -409,7 +409,13 @@ static int gfx_v12_1_init_microcode(struct amdgpu_device *adev)amdgpu_ucode_ip_version_decode (adev,GC_HWIP , ucode_prefix,sizeof (ucode_prefix));if (!amdgpu_sriov_vf (adev)) { - err =amdgpu_ucode_request (adev, &adev->gfx.rlc_fw, +if (amdgpu_ip_version (adev,GC_HWIP ,0 ) ==IP_VERSION (12 ,1 ,0 ) && + adev->rev_id ==0 ) + err =amdgpu_ucode_request (adev, &adev->gfx.rlc_fw, +AMDGPU_UCODE_REQUIRED , +"amdgpu/%s_rlc_1.bin" , ucode_prefix); +else + err =amdgpu_ucode_request (adev, &adev->gfx.rlc_fw,AMDGPU_UCODE_REQUIRED ,"amdgpu/%s_rlc.bin" , ucode_prefix);if (err)
Signature · 1 line
2.53.0
Alex Deucher
maintainerPATCH 2/2 drm/amdgpu: support toc_1 fw load for mp0 v15_0_8
From: Likun Gao <[email protected]>
Support for TOC fw load for psp v15_0_8 rev id 0.
Signed-off-by Likun Gao <[email protected]>
Reviewed-by Hawking Zhang <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 7 ++++++- drivers/gpu/drm/amd/amdgpu/psp_v15_0_8.c | 1 + 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +6 -1
@@ -3899,7 +3899,12 @@ int psp_init_toc_microcode(struct psp_context *psp, const char *chip_name)const struct psp_firmware_header_v1_0 *toc_hdr;int err =0 ; - err =amdgpu_ucode_request (adev, &adev->psp.toc_fw,AMDGPU_UCODE_REQUIRED , +if (amdgpu_ip_version (adev,MP0_HWIP ,0 ) ==IP_VERSION (15 ,0 ,8 ) && + adev->rev_id ==0 ) + err =amdgpu_ucode_request (adev, &adev->psp.toc_fw,AMDGPU_UCODE_REQUIRED , +"amdgpu/%s_toc_1.bin" , chip_name); +else + err =amdgpu_ucode_request (adev, &adev->psp.toc_fw,AMDGPU_UCODE_REQUIRED ,"amdgpu/%s_toc.bin" , chip_name);if (err) goto out;
drivers/gpu/drm/amd/amdgpu/psp_v15_0_8.c +1 -0
@@ -32,6 +32,7 @@#include "mp/mp_15_0_8_sh_mask.h" MODULE_FIRMWARE ("amdgpu/psp_15_0_8_toc.bin" ); +MODULE_FIRMWARE ("amdgpu/psp_15_0_8_toc_1.bin" );static int psp_v15_0_8_init_microcode (struct psp_context *psp) {
Signature · 1 line
2.53.0