drm/radeon: add support for new hainan variants
Subsystems (2)
PATCH 1/2 drm/radeon: add support for new hainan variants
New hainan parts require updated smc firmware.
Cc Sonny Jiang <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/radeon/si.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/radeon/si.c +9 -4
@@ -114,6 +114,7 @@ MODULE_FIRMWARE("radeon/hainan_mc.bin");MODULE_FIRMWARE ("radeon/hainan_rlc.bin" );MODULE_FIRMWARE ("radeon/hainan_smc.bin" );MODULE_FIRMWARE ("radeon/hainan_k_smc.bin" ); +MODULE_FIRMWARE ("radeon/banks_k_2_smc.bin" );MODULE_FIRMWARE ("radeon/si58_mc.bin" );
@@ -1653,6 +1654,7 @@ static int si_init_microcode(struct radeon_device *rdev)int new_fw =0 ;bool new_smc = false;bool si58_fw = false; +bool banks2_fw = false;DRM_DEBUG ("\n" );
@@ -1730,10 +1732,11 @@ static int si_init_microcode(struct radeon_device *rdev) ((rdev->pdev->device ==0x6660 ) || (rdev->pdev->device ==0x6663 ) || (rdev->pdev->device ==0x6665 ) || - (rdev->pdev->device == 0x6667))) || - ((rdev->pdev->revision ==0xc3 ) && - (rdev->pdev->device == 0x6665))) + (rdev->pdev->device == 0x6667)))) new_smc = true; + else if ((rdev->pdev->revision == 0xc3) && + (rdev->pdev->device == 0x6665)) + banks2_fw = true; new_chip_name ="hainan" ; pfp_req_size =SI_PFP_UCODE_SIZE *4 ; me_req_size =SI_PM4_UCODE_SIZE *4 ;
@@ -1886,7 +1889,9 @@ static int si_init_microcode(struct radeon_device *rdev) } } -if (new_smc) +if (banks2_fw) +snprintf (fw_name,sizeof (fw_name),"radeon/banks_k_2_smc.bin" ); +else if (new_smc)snprintf (fw_name,sizeof (fw_name),"radeon/%s_k_smc.bin" , new_chip_name);else snprintf (fw_name,sizeof (fw_name),"radeon/%s_smc.bin" , new_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): 1484683673-10336-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amdgpu: add support for new hainan variants
New hainan parts require updated smc firmware.
Cc Sonny Jiang <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/si_dpm.c +5 -3
@@ -64,6 +64,7 @@ MODULE_FIRMWARE("radeon/oland_smc.bin");MODULE_FIRMWARE ("radeon/oland_k_smc.bin" );MODULE_FIRMWARE ("radeon/hainan_smc.bin" );MODULE_FIRMWARE ("radeon/hainan_k_smc.bin" ); +MODULE_FIRMWARE ("radeon/banks_k_2_smc.bin" );union power_info {struct _ATOM_POWERPLAY_INFO info;
@@ -7701,10 +7702,11 @@ static int si_dpm_init_microcode(struct amdgpu_device *adev) ((adev->pdev->device ==0x6660 ) || (adev->pdev->device ==0x6663 ) || (adev->pdev->device ==0x6665 ) || - (adev->pdev->device == 0x6667))) || - ((adev->pdev->revision == 0xc3) && - (adev->pdev->device == 0x6665))) + (adev->pdev->device == 0x6667)))) chip_name = "hainan_k"; + else if ((adev->pdev->revision == 0xc3) && + (adev->pdev->device == 0x6665)) + chip_name ="banks_k_2" ; else chip_name ="hainan" ;break ;
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx