> -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf > Of Evan Quan > Sent: Tuesday, June 27, 2017 2:36 AM > To: amd-gfx at lists.freedesktop.org > Cc: Quan, Evan > Subject: [PATCH 2/2] drm/amdgpu: add ACG SMU firmware for other vega10 > variants > > Change-Id: Id15108d2dc192b2d6e80b07369cb9b01098687b2 > Signed-off-by: Evan Quan <evan.quan at amd.com> Series is: Reviewed-by: Alex Deucher <alexander.deucher at amd.com> > --- > 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(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c > index 45353e8..2f96964 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c > @@ -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"); > diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c > b/drivers/gpu/drm/amd/amdgpu/soc15.c > index 9210126..976e5dd 100644 > --- a/drivers/gpu/drm/amd/amdgpu/soc15.c > +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c > @@ -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 > diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > index c234029..698575d 100644 > --- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > +++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > @@ -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 > > _______________________________________________ > amd-gfx mailing list > amd-gfx at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
