drm/radeon/si: load special ucode for certain MC configs
Subsystems (2)
PATCH 1/2 drm/radeon/si: load special ucode for certain MC configs
Required for certain MC configs.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/radeon/si.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/si.c +10 -1
@@ -116,6 +116,8 @@ MODULE_FIRMWARE("radeon/hainan_rlc.bin");MODULE_FIRMWARE ("radeon/hainan_smc.bin" );MODULE_FIRMWARE ("radeon/hainan_k_smc.bin" ); +MODULE_FIRMWARE ("radeon/si58_mc.bin" ); +static u32 si_get_cu_active_bitmap (struct radeon_device *rdev,u32 se,u32 sh);static void si_pcie_gen3_enable (struct radeon_device *rdev);static void si_program_aspm (struct radeon_device *rdev);
@@ -1651,6 +1653,7 @@ static int si_init_microcode(struct radeon_device *rdev)int err;int new_fw =0 ;bool new_smc = false; +bool si58_fw = false;DRM_DEBUG ("\n" );
@@ -1746,6 +1749,9 @@ static int si_init_microcode(struct radeon_device *rdev)default :BUG (); } +if (((RREG32 (MC_SEQ_MISC0 ) &0xff000000 ) >>24 ) ==0x58 ) + si58_fw = true; +DRM_INFO ("Loading %s Microcode\n" , new_chip_name);snprintf (fw_name,sizeof (fw_name),"radeon/%s_pfp.bin" , new_chip_name);
@@ -1849,7 +1855,10 @@ static int si_init_microcode(struct radeon_device *rdev) } } -snprintf (fw_name,sizeof (fw_name),"radeon/%s_mc.bin" , new_chip_name); +if (si58_fw) +snprintf (fw_name,sizeof (fw_name),"radeon/si58_mc.bin" ); +else +snprintf (fw_name,sizeof (fw_name),"radeon/%s_mc.bin" , new_chip_name); err =request_firmware (&rdev->mc_fw, fw_name, rdev->dev);if (err) {snprintf (fw_name,sizeof (fw_name),"radeon/%s_mc2.bin" , chip_name);
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1482338326-1470-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amdgpu/si: load special ucode for certain MC configs
Required for certain MC configs.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +9 -1
@@ -44,6 +44,7 @@ MODULE_FIRMWARE("radeon/tahiti_mc.bin");MODULE_FIRMWARE ("radeon/pitcairn_mc.bin" );MODULE_FIRMWARE ("radeon/verde_mc.bin" );MODULE_FIRMWARE ("radeon/oland_mc.bin" ); +MODULE_FIRMWARE ("radeon/si58_mc.bin" );#define MC_SEQ_MISC0__MT__MASK 0xf0000000#define MC_SEQ_MISC0__MT__GDDR1 0x10000000
@@ -113,6 +114,7 @@ static int gmc_v6_0_init_microcode(struct amdgpu_device *adev)const char *chip_name;char fw_name[30 ];int err; +bool is_58_fw = false;DRM_DEBUG ("\n" );
@@ -135,7 +137,13 @@ static int gmc_v6_0_init_microcode(struct amdgpu_device *adev)default :BUG (); } -snprintf (fw_name,sizeof (fw_name),"radeon/%s_mc.bin" , chip_name); +if (((RREG32 (mmMC_SEQ_MISC0) &0xff000000 ) >>24 ) ==0x58 ) + is_58_fw = true; + +if (is_58_fw) +snprintf (fw_name,sizeof (fw_name),"radeon/si58_mc.bin" ); +else +snprintf (fw_name,sizeof (fw_name),"radeon/%s_mc.bin" , chip_name); err =request_firmware (&adev->mc.fw, fw_name, adev->dev);if (err) goto out;
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx