drm/amdgpu/gfx10: add support for wks firmware loading (1e94b438) · Commits · 戴 / test

drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c

+16 −6

Original line number	Diff line number	Diff line
		@@ -70,6 +70,11 @@ MODULE_FIRMWARE("amdgpu/navi10_mec.bin");
		MODULE_FIRMWARE("amdgpu/navi10_mec2.bin");
		MODULE_FIRMWARE("amdgpu/navi10_rlc.bin");

		MODULE_FIRMWARE("amdgpu/navi14_ce_wks.bin");
		MODULE_FIRMWARE("amdgpu/navi14_pfp_wks.bin");
		MODULE_FIRMWARE("amdgpu/navi14_me_wks.bin");
		MODULE_FIRMWARE("amdgpu/navi14_mec_wks.bin");
		MODULE_FIRMWARE("amdgpu/navi14_mec2_wks.bin");
		MODULE_FIRMWARE("amdgpu/navi14_ce.bin");
		MODULE_FIRMWARE("amdgpu/navi14_pfp.bin");
		MODULE_FIRMWARE("amdgpu/navi14_me.bin");
		@@ -594,7 +599,8 @@ static void gfx_v10_0_check_gfxoff_flag(struct amdgpu_device *adev)
		static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
		{
		const char *chip_name;
		char fw_name[30];
		char fw_name[40];
		char wks[10];
		int err;
		struct amdgpu_firmware_info *info = NULL;
		const struct common_firmware_header *header = NULL;
		@@ -607,12 +613,16 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)

		DRM_DEBUG("\n");

		memset(wks, 0, sizeof(wks));
		switch (adev->asic_type) {
		case CHIP_NAVI10:
		chip_name = "navi10";
		break;
		case CHIP_NAVI14:
		chip_name = "navi14";
		if (!(adev->pdev->device == 0x7340 &&
		adev->pdev->revision != 0x00))
		snprintf(wks, sizeof(wks), "_wks");
		break;
		case CHIP_NAVI12:
		chip_name = "navi12";
		@@ -621,7 +631,7 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
		BUG();
		}

		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_pfp.bin", chip_name);
		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_pfp%s.bin", chip_name, wks);
		err = request_firmware(&adev->gfx.pfp_fw, fw_name, adev->dev);
		if (err)
		goto out;
		@@ -632,7 +642,7 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
		adev->gfx.pfp_fw_version = le32_to_cpu(cp_hdr->header.ucode_version);
		adev->gfx.pfp_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version);

		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_me.bin", chip_name);
		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_me%s.bin", chip_name, wks);
		err = request_firmware(&adev->gfx.me_fw, fw_name, adev->dev);
		if (err)
		goto out;
		@@ -643,7 +653,7 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
		adev->gfx.me_fw_version = le32_to_cpu(cp_hdr->header.ucode_version);
		adev->gfx.me_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version);

		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ce.bin", chip_name);
		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ce%s.bin", chip_name, wks);
		err = request_firmware(&adev->gfx.ce_fw, fw_name, adev->dev);
		if (err)
		goto out;
		@@ -708,7 +718,7 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
		if (adev->gfx.rlc.is_rlc_v2_1)
		gfx_v10_0_init_rlc_ext_microcode(adev);

		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec.bin", chip_name);
		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec%s.bin", chip_name, wks);
		err = request_firmware(&adev->gfx.mec_fw, fw_name, adev->dev);
		if (err)
		goto out;
		@@ -719,7 +729,7 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
		adev->gfx.mec_fw_version = le32_to_cpu(cp_hdr->header.ucode_version);
		adev->gfx.mec_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version);

		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec2.bin", chip_name);
		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec2%s.bin", chip_name, wks);
		err = request_firmware(&adev->gfx.mec2_fw, fw_name, adev->dev);
		if (!err) {
		err = amdgpu_ucode_validate(adev->gfx.mec2_fw);

Admin message