On 2016年12月23日 09:48, Junwei Zhang wrote:
Change-Id: I8b08dcb352f20f277cbad1ffdad900118ec8a384 Signed-off-by: Junwei Zhang <jerry.zh...@amd.com>
Reviewed-by: Chunming Zhou <david1.z...@amd.com>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 5 +---- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c index f13497a..d0e8710 100755 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c @@ -845,10 +845,7 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, strcpy(fw_name, "amdgpu/polaris10_smc_sk.bin"); break; case CHIP_POLARIS12: - if (type == CGS_UCODE_ID_SMU) - strcpy(fw_name, "amdgpu/polaris12_smc.bin"); - else if (type == CGS_UCODE_ID_SMU_SK) - strcpy(fw_name, "amdgpu/polaris12_smc_sk.bin"); + strcpy(fw_name, "amdgpu/polaris12_smc.bin"); break; default: DRM_ERROR("SMC firmware not supported\n"); diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c index 1412f30..45737cd 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c @@ -40,7 +40,6 @@ MODULE_FIRMWARE("amdgpu/polaris10_smc_sk.bin"); MODULE_FIRMWARE("amdgpu/polaris11_smc.bin"); MODULE_FIRMWARE("amdgpu/polaris11_smc_sk.bin"); MODULE_FIRMWARE("amdgpu/polaris12_smc.bin"); -MODULE_FIRMWARE("amdgpu/polaris12_smc_sk.bin");int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle){
_______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
