Index: dist/drm/radeon/radeon_cik.c =================================================================== RCS file: /cvsroot/src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.c,v retrieving revision 1.2 diff -p -u -r1.2 radeon_cik.c --- dist/drm/radeon/radeon_cik.c 14 Feb 2020 04:35:20 -0000 1.2 +++ dist/drm/radeon/radeon_cik.c 19 Feb 2020 06:24:02 -0000 @@ -2182,14 +2182,17 @@ static int cik_init_microcode(struct rad snprintf(fw_name, sizeof(fw_name), "radeon/%s_mec2.bin", new_chip_name); err = request_firmware(&rdev->mec2_fw, fw_name, rdev->dev); if (err) { - goto out; - } else { - err = radeon_ucode_validate(rdev->mec2_fw); + snprintf(fw_name, sizeof(fw_name), "radeon/%s_mec2.bin", chip_name); + err = request_firmware(&rdev->mec2_fw, fw_name, rdev->dev); if (err) { goto out; - } else { - new_fw++; } + } + err = radeon_ucode_validate(rdev->mec2_fw); + if (err) { + goto out; + } else { + new_fw++; } }