drm/amdgpu: add ACG SMU firmware for other vega10 variants
Subsystems (2)
PATCH 2/2 drm/amdgpu: add ACG SMU firmware for other vega10 variants
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 8 +++++++- drivers/gpu/drm/amd/amdgpu/soc15.c | 2 -- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +7 -1
@@ -719,7 +719,13 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,strcpy (fw_name,"amdgpu/polaris12_smc.bin" );break ;case CHIP_VEGA10 : -strcpy (fw_name,"amdgpu/vega10_smc.bin" ); +if ((adev->pdev->device ==0x687f ) && + ((adev->pdev->revision ==0xc0 ) || + (adev->pdev->revision ==0xc1 ) || + (adev->pdev->revision ==0xc3 ))) +strcpy (fw_name,"amdgpu/vega10_acg_smc.bin" ); +else +strcpy (fw_name,"amdgpu/vega10_smc.bin" );break ;default :DRM_ERROR ("SMC firmware not supported\n" );
drivers/gpu/drm/amd/amdgpu/soc15.c +0 -2
@@ -62,8 +62,6 @@#include "dce_virtual.h" #include "mxgpu_ai.h" -MODULE_FIRMWARE ("amdgpu/vega10_smc.bin" ); -#define mmFabricConfigAccessControl 0x0410#define mmFabricConfigAccessControl_BASE_IDX 0#define mmFabricConfigAccessControl_DEFAULT 0x00000000
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +2 -1
@@ -42,7 +42,8 @@ MODULE_FIRMWARE("amdgpu/polaris11_smc.bin");MODULE_FIRMWARE ("amdgpu/polaris11_smc_sk.bin" );MODULE_FIRMWARE ("amdgpu/polaris11_k_smc.bin" );MODULE_FIRMWARE ("amdgpu/polaris12_smc.bin" ); - +MODULE_FIRMWARE ("amdgpu/vega10_smc.bin" ); +MODULE_FIRMWARE ("amdgpu/vega10_acg_smc.bin" );int smum_early_init (struct pp_instance *handle) {
Signature · 6 lines
2.7.4 _______________________________________________ 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): 1498545331-6432-1-git-send-email-evan.quan-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 11 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Evan Quan
Sent: Tuesday, June 27, 2017 2:36 AM
To: [email protected]
Cc: Quan, Evan
Subject: [PATCH 2/2] drm/amdgpu: add ACG SMU firmware for other vega10 variantsChange-Id Id15108d2dc192b2d6e80b07369cb9b01098687b2Signed-off-by Evan Quan <[email protected]>
Series is:
Quoted 67 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 8 +++++++- drivers/gpu/drm/amd/amdgpu/soc15.c | 2 -- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +5
-1@@ -719,7 +719,13 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,strcpy (fw_name,"amdgpu/polaris12_smc.bin" );break ;case CHIP_VEGA10 : -strcpy (fw_name, "amdgpu/vega10_smc.bin"); +if ((adev->pdev->device ==0x687f ) && + ((adev->pdev->revision ==0xc0 ) || + (adev->pdev->revision ==0xc1 ) || + (adev->pdev->revision ==0xc3 ))) + strcpy(fw_name,"amdgpu/vega10_acg_smc.bin");
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +2
-0+else + strcpy(fw_name,"amdgpu/vega10_smc.bin");
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +0
-0break ;default : DRM_ERROR("SMC firmware notsupported\n");
drivers/gpu/drm/amd/amdgpu/soc15.c +0
-2@@ -62,8 +62,6 @@#include "dce_virtual.h" #include "mxgpu_ai.h" -MODULE_FIRMWARE ("amdgpu/vega10_smc.bin" ); -#define mmFabricConfigAccessControl
0x0410
#definemmFabricConfigAccessControl_BASE_IDX
0
#definemmFabricConfigAccessControl_DEFAULT0x00000000drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +2
-2@@ -42,7 +42,8 @@ MODULE_FIRMWARE("amdgpu/polaris11_smc.bin");MODULE_FIRMWARE ("amdgpu/polaris11_smc_sk.bin" );MODULE_FIRMWARE ("amdgpu/polaris11_k_smc.bin" );MODULE_FIRMWARE ("amdgpu/polaris12_smc.bin" ); - +MODULE_FIRMWARE ("amdgpu/vega10_smc.bin" ); +MODULE_FIRMWARE ("amdgpu/vega10_acg_smc.bin" );int smum_early_init (struct pp_instance *handle) { --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx