Commit 8eaf2b1f authored by Alex Deucher's avatar Alex Deucher

drm/amdgpu: switch firmware path for SI parts

Use separate firmware path for amdgpu to avoid conflicts
with radeon on SI parts.
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ce206464
...@@ -44,30 +44,30 @@ static void gfx_v6_0_set_ring_funcs(struct amdgpu_device *adev); ...@@ -44,30 +44,30 @@ static void gfx_v6_0_set_ring_funcs(struct amdgpu_device *adev);
static void gfx_v6_0_set_irq_funcs(struct amdgpu_device *adev); static void gfx_v6_0_set_irq_funcs(struct amdgpu_device *adev);
static void gfx_v6_0_get_cu_info(struct amdgpu_device *adev); static void gfx_v6_0_get_cu_info(struct amdgpu_device *adev);
MODULE_FIRMWARE("radeon/tahiti_pfp.bin"); MODULE_FIRMWARE("amdgpu/tahiti_pfp.bin");
MODULE_FIRMWARE("radeon/tahiti_me.bin"); MODULE_FIRMWARE("amdgpu/tahiti_me.bin");
MODULE_FIRMWARE("radeon/tahiti_ce.bin"); MODULE_FIRMWARE("amdgpu/tahiti_ce.bin");
MODULE_FIRMWARE("radeon/tahiti_rlc.bin"); MODULE_FIRMWARE("amdgpu/tahiti_rlc.bin");
MODULE_FIRMWARE("radeon/pitcairn_pfp.bin"); MODULE_FIRMWARE("amdgpu/pitcairn_pfp.bin");
MODULE_FIRMWARE("radeon/pitcairn_me.bin"); MODULE_FIRMWARE("amdgpu/pitcairn_me.bin");
MODULE_FIRMWARE("radeon/pitcairn_ce.bin"); MODULE_FIRMWARE("amdgpu/pitcairn_ce.bin");
MODULE_FIRMWARE("radeon/pitcairn_rlc.bin"); MODULE_FIRMWARE("amdgpu/pitcairn_rlc.bin");
MODULE_FIRMWARE("radeon/verde_pfp.bin"); MODULE_FIRMWARE("amdgpu/verde_pfp.bin");
MODULE_FIRMWARE("radeon/verde_me.bin"); MODULE_FIRMWARE("amdgpu/verde_me.bin");
MODULE_FIRMWARE("radeon/verde_ce.bin"); MODULE_FIRMWARE("amdgpu/verde_ce.bin");
MODULE_FIRMWARE("radeon/verde_rlc.bin"); MODULE_FIRMWARE("amdgpu/verde_rlc.bin");
MODULE_FIRMWARE("radeon/oland_pfp.bin"); MODULE_FIRMWARE("amdgpu/oland_pfp.bin");
MODULE_FIRMWARE("radeon/oland_me.bin"); MODULE_FIRMWARE("amdgpu/oland_me.bin");
MODULE_FIRMWARE("radeon/oland_ce.bin"); MODULE_FIRMWARE("amdgpu/oland_ce.bin");
MODULE_FIRMWARE("radeon/oland_rlc.bin"); MODULE_FIRMWARE("amdgpu/oland_rlc.bin");
MODULE_FIRMWARE("radeon/hainan_pfp.bin"); MODULE_FIRMWARE("amdgpu/hainan_pfp.bin");
MODULE_FIRMWARE("radeon/hainan_me.bin"); MODULE_FIRMWARE("amdgpu/hainan_me.bin");
MODULE_FIRMWARE("radeon/hainan_ce.bin"); MODULE_FIRMWARE("amdgpu/hainan_ce.bin");
MODULE_FIRMWARE("radeon/hainan_rlc.bin"); MODULE_FIRMWARE("amdgpu/hainan_rlc.bin");
static u32 gfx_v6_0_get_csb_size(struct amdgpu_device *adev); static u32 gfx_v6_0_get_csb_size(struct amdgpu_device *adev);
static void gfx_v6_0_get_csb_buffer(struct amdgpu_device *adev, volatile u32 *buffer); static void gfx_v6_0_get_csb_buffer(struct amdgpu_device *adev, volatile u32 *buffer);
...@@ -335,7 +335,7 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev) ...@@ -335,7 +335,7 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev)
default: BUG(); default: BUG();
} }
snprintf(fw_name, sizeof(fw_name), "radeon/%s_pfp.bin", chip_name); snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_pfp.bin", chip_name);
err = request_firmware(&adev->gfx.pfp_fw, fw_name, adev->dev); err = request_firmware(&adev->gfx.pfp_fw, fw_name, adev->dev);
if (err) if (err)
goto out; goto out;
...@@ -346,7 +346,7 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev) ...@@ -346,7 +346,7 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev)
adev->gfx.pfp_fw_version = le32_to_cpu(cp_hdr->header.ucode_version); 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); adev->gfx.pfp_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version);
snprintf(fw_name, sizeof(fw_name), "radeon/%s_me.bin", chip_name); snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_me.bin", chip_name);
err = request_firmware(&adev->gfx.me_fw, fw_name, adev->dev); err = request_firmware(&adev->gfx.me_fw, fw_name, adev->dev);
if (err) if (err)
goto out; goto out;
...@@ -357,7 +357,7 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev) ...@@ -357,7 +357,7 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev)
adev->gfx.me_fw_version = le32_to_cpu(cp_hdr->header.ucode_version); 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); adev->gfx.me_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version);
snprintf(fw_name, sizeof(fw_name), "radeon/%s_ce.bin", chip_name); snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ce.bin", chip_name);
err = request_firmware(&adev->gfx.ce_fw, fw_name, adev->dev); err = request_firmware(&adev->gfx.ce_fw, fw_name, adev->dev);
if (err) if (err)
goto out; goto out;
...@@ -368,7 +368,7 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev) ...@@ -368,7 +368,7 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev)
adev->gfx.ce_fw_version = le32_to_cpu(cp_hdr->header.ucode_version); adev->gfx.ce_fw_version = le32_to_cpu(cp_hdr->header.ucode_version);
adev->gfx.ce_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version); adev->gfx.ce_feature_version = le32_to_cpu(cp_hdr->ucode_feature_version);
snprintf(fw_name, sizeof(fw_name), "radeon/%s_rlc.bin", chip_name); snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_rlc.bin", chip_name);
err = request_firmware(&adev->gfx.rlc_fw, fw_name, adev->dev); err = request_firmware(&adev->gfx.rlc_fw, fw_name, adev->dev);
if (err) if (err)
goto out; goto out;
......
...@@ -41,11 +41,11 @@ static void gmc_v6_0_set_gmc_funcs(struct amdgpu_device *adev); ...@@ -41,11 +41,11 @@ static void gmc_v6_0_set_gmc_funcs(struct amdgpu_device *adev);
static void gmc_v6_0_set_irq_funcs(struct amdgpu_device *adev); static void gmc_v6_0_set_irq_funcs(struct amdgpu_device *adev);
static int gmc_v6_0_wait_for_idle(void *handle); static int gmc_v6_0_wait_for_idle(void *handle);
MODULE_FIRMWARE("radeon/tahiti_mc.bin"); MODULE_FIRMWARE("amdgpu/tahiti_mc.bin");
MODULE_FIRMWARE("radeon/pitcairn_mc.bin"); MODULE_FIRMWARE("amdgpu/pitcairn_mc.bin");
MODULE_FIRMWARE("radeon/verde_mc.bin"); MODULE_FIRMWARE("amdgpu/verde_mc.bin");
MODULE_FIRMWARE("radeon/oland_mc.bin"); MODULE_FIRMWARE("amdgpu/oland_mc.bin");
MODULE_FIRMWARE("radeon/si58_mc.bin"); MODULE_FIRMWARE("amdgpu/si58_mc.bin");
#define MC_SEQ_MISC0__MT__MASK 0xf0000000 #define MC_SEQ_MISC0__MT__MASK 0xf0000000
#define MC_SEQ_MISC0__MT__GDDR1 0x10000000 #define MC_SEQ_MISC0__MT__GDDR1 0x10000000
...@@ -134,9 +134,9 @@ static int gmc_v6_0_init_microcode(struct amdgpu_device *adev) ...@@ -134,9 +134,9 @@ static int gmc_v6_0_init_microcode(struct amdgpu_device *adev)
is_58_fw = true; is_58_fw = true;
if (is_58_fw) if (is_58_fw)
snprintf(fw_name, sizeof(fw_name), "radeon/si58_mc.bin"); snprintf(fw_name, sizeof(fw_name), "amdgpu/si58_mc.bin");
else else
snprintf(fw_name, sizeof(fw_name), "radeon/%s_mc.bin", chip_name); snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name);
err = request_firmware(&adev->gmc.fw, fw_name, adev->dev); err = request_firmware(&adev->gmc.fw, fw_name, adev->dev);
if (err) if (err)
goto out; goto out;
......
...@@ -56,16 +56,16 @@ ...@@ -56,16 +56,16 @@
#define BIOS_SCRATCH_4 0x5cd #define BIOS_SCRATCH_4 0x5cd
MODULE_FIRMWARE("radeon/tahiti_smc.bin"); MODULE_FIRMWARE("amdgpu/tahiti_smc.bin");
MODULE_FIRMWARE("radeon/pitcairn_smc.bin"); MODULE_FIRMWARE("amdgpu/pitcairn_smc.bin");
MODULE_FIRMWARE("radeon/pitcairn_k_smc.bin"); MODULE_FIRMWARE("amdgpu/pitcairn_k_smc.bin");
MODULE_FIRMWARE("radeon/verde_smc.bin"); MODULE_FIRMWARE("amdgpu/verde_smc.bin");
MODULE_FIRMWARE("radeon/verde_k_smc.bin"); MODULE_FIRMWARE("amdgpu/verde_k_smc.bin");
MODULE_FIRMWARE("radeon/oland_smc.bin"); MODULE_FIRMWARE("amdgpu/oland_smc.bin");
MODULE_FIRMWARE("radeon/oland_k_smc.bin"); MODULE_FIRMWARE("amdgpu/oland_k_smc.bin");
MODULE_FIRMWARE("radeon/hainan_smc.bin"); MODULE_FIRMWARE("amdgpu/hainan_smc.bin");
MODULE_FIRMWARE("radeon/hainan_k_smc.bin"); MODULE_FIRMWARE("amdgpu/hainan_k_smc.bin");
MODULE_FIRMWARE("radeon/banks_k_2_smc.bin"); MODULE_FIRMWARE("amdgpu/banks_k_2_smc.bin");
static const struct amd_pm_funcs si_dpm_funcs; static const struct amd_pm_funcs si_dpm_funcs;
...@@ -7667,7 +7667,7 @@ static int si_dpm_init_microcode(struct amdgpu_device *adev) ...@@ -7667,7 +7667,7 @@ static int si_dpm_init_microcode(struct amdgpu_device *adev)
default: BUG(); default: BUG();
} }
snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name); snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_smc.bin", chip_name);
err = request_firmware(&adev->pm.fw, fw_name, adev->dev); err = request_firmware(&adev->pm.fw, fw_name, adev->dev);
if (err) if (err)
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment