Skip to contentSkip to conversation

drm/amdgpu: switch firmware path for CIK parts

PATCH In review Alex Deucher 6 participants 8 messages Jul 2, 2018 – Jul 3, 2018 5 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 drm/amdgpu: switch firmware path for CIK parts

Use separate firmware path for amdgpu to avoid conflicts with radeon on CIK parts.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c |  8 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 10 ++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 10 ++---
 drivers/gpu/drm/amd/amdgpu/ci_dpm.c     | 10 ++---
 drivers/gpu/drm/amd/amdgpu/cik_sdma.c   | 24 +++++------
 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c   | 72 ++++++++++++++++-----------------
 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c   |  6 +--
 7 files changed, 70 insertions(+), 70 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +4 -4
index e950730f1933..693ec5ea4950 100644
@@ -314,17 +314,17 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
 					(adev->pdev->revision == 0x81) ||
 					(adev->pdev->device == 0x665f)) {
 					info->is_kicker = true;
-					strcpy(fw_name, "radeon/bonaire_k_smc.bin");
+					strcpy(fw_name, "amdgpu/bonaire_k_smc.bin");
 				} else {
-					strcpy(fw_name, "radeon/bonaire_smc.bin");
+					strcpy(fw_name, "amdgpu/bonaire_smc.bin");
 				}
 				break;
 			case CHIP_HAWAII:
 				if (adev->pdev->revision == 0x80) {
 					info->is_kicker = true;
-					strcpy(fw_name, "radeon/hawaii_k_smc.bin");
+					strcpy(fw_name, "amdgpu/hawaii_k_smc.bin");
 				} else {
-					strcpy(fw_name, "radeon/hawaii_smc.bin");
+					strcpy(fw_name, "amdgpu/hawaii_smc.bin");
 				}
 				break;
 			case CHIP_TOPAZ:
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +5 -5
index 0b46ea1c6290..3e70eb61a960 100644
@@ -53,11 +53,11 @@
 
 /* Firmware Names */
 #ifdef CONFIG_DRM_AMDGPU_CIK
-#define FIRMWARE_BONAIRE	"radeon/bonaire_uvd.bin"
-#define FIRMWARE_KABINI	"radeon/kabini_uvd.bin"
-#define FIRMWARE_KAVERI	"radeon/kaveri_uvd.bin"
-#define FIRMWARE_HAWAII	"radeon/hawaii_uvd.bin"
-#define FIRMWARE_MULLINS	"radeon/mullins_uvd.bin"
+#define FIRMWARE_BONAIRE	"amdgpu/bonaire_uvd.bin"
+#define FIRMWARE_KABINI	"amdgpu/kabini_uvd.bin"
+#define FIRMWARE_KAVERI	"amdgpu/kaveri_uvd.bin"
+#define FIRMWARE_HAWAII	"amdgpu/hawaii_uvd.bin"
+#define FIRMWARE_MULLINS	"amdgpu/mullins_uvd.bin"
 #endif
 #define FIRMWARE_TONGA		"amdgpu/tonga_uvd.bin"
 #define FIRMWARE_CARRIZO	"amdgpu/carrizo_uvd.bin"
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +5 -5
index b0dcdfd85f5b..6ae1ad7e83b3 100644
@@ -40,11 +40,11 @@
 
 /* Firmware Names */
 #ifdef CONFIG_DRM_AMDGPU_CIK
-#define FIRMWARE_BONAIRE	"radeon/bonaire_vce.bin"
-#define FIRMWARE_KABINI	"radeon/kabini_vce.bin"
-#define FIRMWARE_KAVERI	"radeon/kaveri_vce.bin"
-#define FIRMWARE_HAWAII	"radeon/hawaii_vce.bin"
-#define FIRMWARE_MULLINS	"radeon/mullins_vce.bin"
+#define FIRMWARE_BONAIRE	"amdgpu/bonaire_vce.bin"
+#define FIRMWARE_KABINI	"amdgpu/kabini_vce.bin"
+#define FIRMWARE_KAVERI	"amdgpu/kaveri_vce.bin"
+#define FIRMWARE_HAWAII	"amdgpu/hawaii_vce.bin"
+#define FIRMWARE_MULLINS	"amdgpu/mullins_vce.bin"
 #endif
 #define FIRMWARE_TONGA		"amdgpu/tonga_vce.bin"
 #define FIRMWARE_CARRIZO	"amdgpu/carrizo_vce.bin"
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +5 -5
index 079a5fc9b593..d2469453dca2 100644
@@ -49,10 +49,10 @@
 #include "gmc/gmc_7_1_d.h"
 #include "gmc/gmc_7_1_sh_mask.h"
 
-MODULE_FIRMWARE("radeon/bonaire_smc.bin");
-MODULE_FIRMWARE("radeon/bonaire_k_smc.bin");
-MODULE_FIRMWARE("radeon/hawaii_smc.bin");
-MODULE_FIRMWARE("radeon/hawaii_k_smc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_smc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_k_smc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_smc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_k_smc.bin");
 
 #define MC_CG_ARB_FREQ_F0           0x0a
 #define MC_CG_ARB_FREQ_F1           0x0b
@@ -5815,7 +5815,7 @@ static int ci_dpm_init_microcode(struct amdgpu_device *adev)
 	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);
 	if (err)
 		goto out;
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +12 -12
index dbd553a8d584..d0fa2aac2388 100644
@@ -54,16 +54,16 @@ static void cik_sdma_set_buffer_funcs(struct amdgpu_device *adev);
 static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev);
 static int cik_sdma_soft_reset(void *handle);
 
-MODULE_FIRMWARE("radeon/bonaire_sdma.bin");
-MODULE_FIRMWARE("radeon/bonaire_sdma1.bin");
-MODULE_FIRMWARE("radeon/hawaii_sdma.bin");
-MODULE_FIRMWARE("radeon/hawaii_sdma1.bin");
-MODULE_FIRMWARE("radeon/kaveri_sdma.bin");
-MODULE_FIRMWARE("radeon/kaveri_sdma1.bin");
-MODULE_FIRMWARE("radeon/kabini_sdma.bin");
-MODULE_FIRMWARE("radeon/kabini_sdma1.bin");
-MODULE_FIRMWARE("radeon/mullins_sdma.bin");
-MODULE_FIRMWARE("radeon/mullins_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_sdma.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_sdma.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_sdma.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/kabini_sdma.bin");
+MODULE_FIRMWARE("amdgpu/kabini_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/mullins_sdma.bin");
+MODULE_FIRMWARE("amdgpu/mullins_sdma1.bin");
 
 u32 amdgpu_cik_gpu_check_soft_reset(struct amdgpu_device *adev);
 
@@ -132,9 +132,9 @@ static int cik_sdma_init_microcode(struct amdgpu_device *adev)
 
 	for (i = 0; i < adev->sdma.num_instances; i++) {
 		if (i == 0)
-			snprintf(fw_name, sizeof(fw_name), "radeon/%s_sdma.bin", chip_name);
+			snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma.bin", chip_name);
 		else
-			snprintf(fw_name, sizeof(fw_name), "radeon/%s_sdma1.bin", chip_name);
+			snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma1.bin", chip_name);
 		err = request_firmware(&adev->sdma.instance[i].fw, fw_name, adev->dev);
 		if (err)
 			goto out;
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +36 -36

114 lines not on this page · raw message

drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +3 -3
index 7147bfe25a23..2c2b93d4d63b 100644
@@ -47,8 +47,8 @@ static void gmc_v7_0_set_gmc_funcs(struct amdgpu_device *adev);
 static void gmc_v7_0_set_irq_funcs(struct amdgpu_device *adev);
 static int gmc_v7_0_wait_for_idle(void *handle);
 
-MODULE_FIRMWARE("radeon/bonaire_mc.bin");
-MODULE_FIRMWARE("radeon/hawaii_mc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_mc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_mc.bin");
 MODULE_FIRMWARE("amdgpu/topaz_mc.bin");
 
 static const u32 golden_settings_iceland_a11[] =
@@ -150,7 +150,7 @@ static int gmc_v7_0_init_microcode(struct amdgpu_device *adev)
 	if (adev->asic_type == CHIP_TOPAZ)
 		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name);
 	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);
 	if (err)
Signature · 6 lines
2.13.6

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 20180702193629.2604-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org

#2 lore raw

PATCH 2/2 drm/amdgpu: switch firmware path for SI parts

Use separate firmware path for amdgpu to avoid conflicts with radeon on SI parts.

---
 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 56 +++++++++++++++++------------------
 drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 14 ++++-----
 drivers/gpu/drm/amd/amdgpu/si_dpm.c   | 22 +++++++-------
 3 files changed, 46 insertions(+), 46 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +28 -28
index cd6bf291a853..de184a886057 100644
@@ -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_get_cu_info(struct amdgpu_device *adev);
 
-MODULE_FIRMWARE("radeon/tahiti_pfp.bin");
-MODULE_FIRMWARE("radeon/tahiti_me.bin");
-MODULE_FIRMWARE("radeon/tahiti_ce.bin");
-MODULE_FIRMWARE("radeon/tahiti_rlc.bin");
-
-MODULE_FIRMWARE("radeon/pitcairn_pfp.bin");
-MODULE_FIRMWARE("radeon/pitcairn_me.bin");
-MODULE_FIRMWARE("radeon/pitcairn_ce.bin");
-MODULE_FIRMWARE("radeon/pitcairn_rlc.bin");
-
-MODULE_FIRMWARE("radeon/verde_pfp.bin");
-MODULE_FIRMWARE("radeon/verde_me.bin");
-MODULE_FIRMWARE("radeon/verde_ce.bin");
-MODULE_FIRMWARE("radeon/verde_rlc.bin");
-
-MODULE_FIRMWARE("radeon/oland_pfp.bin");
-MODULE_FIRMWARE("radeon/oland_me.bin");
-MODULE_FIRMWARE("radeon/oland_ce.bin");
-MODULE_FIRMWARE("radeon/oland_rlc.bin");
-
-MODULE_FIRMWARE("radeon/hainan_pfp.bin");
-MODULE_FIRMWARE("radeon/hainan_me.bin");
-MODULE_FIRMWARE("radeon/hainan_ce.bin");
-MODULE_FIRMWARE("radeon/hainan_rlc.bin");
+MODULE_FIRMWARE("amdgpu/tahiti_pfp.bin");
+MODULE_FIRMWARE("amdgpu/tahiti_me.bin");
+MODULE_FIRMWARE("amdgpu/tahiti_ce.bin");
+MODULE_FIRMWARE("amdgpu/tahiti_rlc.bin");
+
+MODULE_FIRMWARE("amdgpu/pitcairn_pfp.bin");
+MODULE_FIRMWARE("amdgpu/pitcairn_me.bin");
+MODULE_FIRMWARE("amdgpu/pitcairn_ce.bin");
+MODULE_FIRMWARE("amdgpu/pitcairn_rlc.bin");
+
+MODULE_FIRMWARE("amdgpu/verde_pfp.bin");
+MODULE_FIRMWARE("amdgpu/verde_me.bin");
+MODULE_FIRMWARE("amdgpu/verde_ce.bin");
+MODULE_FIRMWARE("amdgpu/verde_rlc.bin");
+
+MODULE_FIRMWARE("amdgpu/oland_pfp.bin");
+MODULE_FIRMWARE("amdgpu/oland_me.bin");
+MODULE_FIRMWARE("amdgpu/oland_ce.bin");
+MODULE_FIRMWARE("amdgpu/oland_rlc.bin");
+
+MODULE_FIRMWARE("amdgpu/hainan_pfp.bin");
+MODULE_FIRMWARE("amdgpu/hainan_me.bin");
+MODULE_FIRMWARE("amdgpu/hainan_ce.bin");
+MODULE_FIRMWARE("amdgpu/hainan_rlc.bin");
 
 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);
@@ -335,7 +335,7 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev)
 	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);
 	if (err)
 		goto out;
@@ -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_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);
 	if (err)
 		goto out;
@@ -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_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);
 	if (err)
 		goto out;
@@ -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_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);
 	if (err)
 		goto out;
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +7 -7
index 79f9ac29019b..75317f283c69 100644
@@ -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 int gmc_v6_0_wait_for_idle(void *handle);
 
-MODULE_FIRMWARE("radeon/tahiti_mc.bin");
-MODULE_FIRMWARE("radeon/pitcairn_mc.bin");
-MODULE_FIRMWARE("radeon/verde_mc.bin");
-MODULE_FIRMWARE("radeon/oland_mc.bin");
-MODULE_FIRMWARE("radeon/si58_mc.bin");
+MODULE_FIRMWARE("amdgpu/tahiti_mc.bin");
+MODULE_FIRMWARE("amdgpu/pitcairn_mc.bin");
+MODULE_FIRMWARE("amdgpu/verde_mc.bin");
+MODULE_FIRMWARE("amdgpu/oland_mc.bin");
+MODULE_FIRMWARE("amdgpu/si58_mc.bin");
 
 #define MC_SEQ_MISC0__MT__MASK   0xf0000000
 #define MC_SEQ_MISC0__MT__GDDR1  0x10000000
@@ -134,9 +134,9 @@ static int gmc_v6_0_init_microcode(struct amdgpu_device *adev)
 		is_58_fw = true;
 
 	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
-		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);
 	if (err)
 		goto out;
drivers/gpu/drm/amd/amdgpu/si_dpm.c +11 -11
index b2585622aa6a..db327b412562 100644
@@ -56,16 +56,16 @@
 
 #define BIOS_SCRATCH_4                                    0x5cd
 
-MODULE_FIRMWARE("radeon/tahiti_smc.bin");
-MODULE_FIRMWARE("radeon/pitcairn_smc.bin");
-MODULE_FIRMWARE("radeon/pitcairn_k_smc.bin");
-MODULE_FIRMWARE("radeon/verde_smc.bin");
-MODULE_FIRMWARE("radeon/verde_k_smc.bin");
-MODULE_FIRMWARE("radeon/oland_smc.bin");
-MODULE_FIRMWARE("radeon/oland_k_smc.bin");
-MODULE_FIRMWARE("radeon/hainan_smc.bin");
-MODULE_FIRMWARE("radeon/hainan_k_smc.bin");
-MODULE_FIRMWARE("radeon/banks_k_2_smc.bin");
+MODULE_FIRMWARE("amdgpu/tahiti_smc.bin");
+MODULE_FIRMWARE("amdgpu/pitcairn_smc.bin");
+MODULE_FIRMWARE("amdgpu/pitcairn_k_smc.bin");
+MODULE_FIRMWARE("amdgpu/verde_smc.bin");
+MODULE_FIRMWARE("amdgpu/verde_k_smc.bin");
+MODULE_FIRMWARE("amdgpu/oland_smc.bin");
+MODULE_FIRMWARE("amdgpu/oland_k_smc.bin");
+MODULE_FIRMWARE("amdgpu/hainan_smc.bin");
+MODULE_FIRMWARE("amdgpu/hainan_k_smc.bin");
+MODULE_FIRMWARE("amdgpu/banks_k_2_smc.bin");
 
 static const struct amd_pm_funcs si_dpm_funcs;
 
@@ -7666,7 +7666,7 @@ static int si_dpm_init_microcode(struct amdgpu_device *adev)
 	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);
 	if (err)
 		goto out;
Signature · 6 lines
2.13.6

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#3 lore raw
In reply to a message not in the archive
Quoted 3 lines · Alex Deucher

Use separate firmware path for amdgpu to avoid conflicts with radeon on CIK parts.

Won't that cause a chicken and egg problem, new kernel with old firmware package will
suddenly start failing, or do we not really care since in theory we don't suppose amdgpu
on those parts yet?

Seems like we'd want to fallback to the old paths if possible.

Dave.

Quoted 302 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c |  8 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 10 ++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 10 ++---
 drivers/gpu/drm/amd/amdgpu/ci_dpm.c     | 10 ++---
 drivers/gpu/drm/amd/amdgpu/cik_sdma.c   | 24 +++++------
 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c   | 72 ++++++++++++++++-----------------
 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c   |  6 +--
 7 files changed, 70 insertions(+), 70 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +4 -4
index e950730f1933..693ec5ea4950 100644
@@ -314,17 +314,17 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
                                        (adev->pdev->revision == 0x81) ||
                                        (adev->pdev->device == 0x665f)) {
                                        info->is_kicker = true;
-                                       strcpy(fw_name, "radeon/bonaire_k_smc.bin");
+                                       strcpy(fw_name, "amdgpu/bonaire_k_smc.bin");
                                } else {
-                                       strcpy(fw_name, "radeon/bonaire_smc.bin");
+                                       strcpy(fw_name, "amdgpu/bonaire_smc.bin");
                                }
                                break;
                        case CHIP_HAWAII:
                                if (adev->pdev->revision == 0x80) {
                                        info->is_kicker = true;
-                                       strcpy(fw_name, "radeon/hawaii_k_smc.bin");
+                                       strcpy(fw_name, "amdgpu/hawaii_k_smc.bin");
                                } else {
-                                       strcpy(fw_name, "radeon/hawaii_smc.bin");
+                                       strcpy(fw_name, "amdgpu/hawaii_smc.bin");
                                }
                                break;
                        case CHIP_TOPAZ:
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +5 -5
index 0b46ea1c6290..3e70eb61a960 100644
@@ -53,11 +53,11 @@
 
 /* Firmware Names */
 #ifdef CONFIG_DRM_AMDGPU_CIK
-#define FIRMWARE_BONAIRE       "radeon/bonaire_uvd.bin"
-#define FIRMWARE_KABINI        "radeon/kabini_uvd.bin"
-#define FIRMWARE_KAVERI        "radeon/kaveri_uvd.bin"
-#define FIRMWARE_HAWAII        "radeon/hawaii_uvd.bin"
-#define FIRMWARE_MULLINS       "radeon/mullins_uvd.bin"
+#define FIRMWARE_BONAIRE       "amdgpu/bonaire_uvd.bin"
+#define FIRMWARE_KABINI        "amdgpu/kabini_uvd.bin"
+#define FIRMWARE_KAVERI        "amdgpu/kaveri_uvd.bin"
+#define FIRMWARE_HAWAII        "amdgpu/hawaii_uvd.bin"
+#define FIRMWARE_MULLINS       "amdgpu/mullins_uvd.bin"
 #endif
 #define FIRMWARE_TONGA         "amdgpu/tonga_uvd.bin"
 #define FIRMWARE_CARRIZO       "amdgpu/carrizo_uvd.bin"
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +5 -5
index b0dcdfd85f5b..6ae1ad7e83b3 100644
@@ -40,11 +40,11 @@
 
 /* Firmware Names */
 #ifdef CONFIG_DRM_AMDGPU_CIK
-#define FIRMWARE_BONAIRE       "radeon/bonaire_vce.bin"
-#define FIRMWARE_KABINI        "radeon/kabini_vce.bin"
-#define FIRMWARE_KAVERI        "radeon/kaveri_vce.bin"
-#define FIRMWARE_HAWAII        "radeon/hawaii_vce.bin"
-#define FIRMWARE_MULLINS       "radeon/mullins_vce.bin"
+#define FIRMWARE_BONAIRE       "amdgpu/bonaire_vce.bin"
+#define FIRMWARE_KABINI        "amdgpu/kabini_vce.bin"
+#define FIRMWARE_KAVERI        "amdgpu/kaveri_vce.bin"
+#define FIRMWARE_HAWAII        "amdgpu/hawaii_vce.bin"
+#define FIRMWARE_MULLINS       "amdgpu/mullins_vce.bin"
 #endif
 #define FIRMWARE_TONGA         "amdgpu/tonga_vce.bin"
 #define FIRMWARE_CARRIZO       "amdgpu/carrizo_vce.bin"
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +5 -5
index 079a5fc9b593..d2469453dca2 100644
@@ -49,10 +49,10 @@
 #include "gmc/gmc_7_1_d.h"
 #include "gmc/gmc_7_1_sh_mask.h"
 
-MODULE_FIRMWARE("radeon/bonaire_smc.bin");
-MODULE_FIRMWARE("radeon/bonaire_k_smc.bin");
-MODULE_FIRMWARE("radeon/hawaii_smc.bin");
-MODULE_FIRMWARE("radeon/hawaii_k_smc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_smc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_k_smc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_smc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_k_smc.bin");
 
 #define MC_CG_ARB_FREQ_F0           0x0a
 #define MC_CG_ARB_FREQ_F1           0x0b
@@ -5815,7 +5815,7 @@ static int ci_dpm_init_microcode(struct amdgpu_device *adev)
        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);
        if (err)
                goto out;
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +12 -12
index dbd553a8d584..d0fa2aac2388 100644
@@ -54,16 +54,16 @@ static void cik_sdma_set_buffer_funcs(struct amdgpu_device *adev);
 static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev);
 static int cik_sdma_soft_reset(void *handle);
 
-MODULE_FIRMWARE("radeon/bonaire_sdma.bin");
-MODULE_FIRMWARE("radeon/bonaire_sdma1.bin");
-MODULE_FIRMWARE("radeon/hawaii_sdma.bin");
-MODULE_FIRMWARE("radeon/hawaii_sdma1.bin");
-MODULE_FIRMWARE("radeon/kaveri_sdma.bin");
-MODULE_FIRMWARE("radeon/kaveri_sdma1.bin");
-MODULE_FIRMWARE("radeon/kabini_sdma.bin");
-MODULE_FIRMWARE("radeon/kabini_sdma1.bin");
-MODULE_FIRMWARE("radeon/mullins_sdma.bin");
-MODULE_FIRMWARE("radeon/mullins_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_sdma.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_sdma.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_sdma.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/kabini_sdma.bin");
+MODULE_FIRMWARE("amdgpu/kabini_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/mullins_sdma.bin");
+MODULE_FIRMWARE("amdgpu/mullins_sdma1.bin");
 
 u32 amdgpu_cik_gpu_check_soft_reset(struct amdgpu_device *adev);
 
@@ -132,9 +132,9 @@ static int cik_sdma_init_microcode(struct amdgpu_device *adev)
 
        for (i = 0; i < adev->sdma.num_instances; i++) {
                if (i == 0)
-                       snprintf(fw_name, sizeof(fw_name), "radeon/%s_sdma.bin", chip_name);
+                       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma.bin", chip_name);
                else
-                       snprintf(fw_name, sizeof(fw_name), "radeon/%s_sdma1.bin", chip_name);
+                       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma1.bin", chip_name);
                err = request_firmware(&adev->sdma.instance[i].fw, fw_name, adev->dev);
                if (err)
                        goto out;
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +36 -36
index 42b6144c1fd5..95452c5a9df6 100644
@@ -57,36 +57,36 @@ static void gfx_v7_0_set_ring_funcs(struct amdgpu_device *adev);
 static void gfx_v7_0_set_irq_funcs(struct amdgpu_device *adev);
 static void gfx_v7_0_set_gds_init(struct amdgpu_device *adev);
 
-MODULE_FIRMWARE("radeon/bonaire_pfp.bin");
-MODULE_FIRMWARE("radeon/bonaire_me.bin");
-MODULE_FIRMWARE("radeon/bonaire_ce.bin");
-MODULE_FIRMWARE("radeon/bonaire_rlc.bin");
-MODULE_FIRMWARE("radeon/bonaire_mec.bin");
-
-MODULE_FIRMWARE("radeon/hawaii_pfp.bin");
-MODULE_FIRMWARE("radeon/hawaii_me.bin");
-MODULE_FIRMWARE("radeon/hawaii_ce.bin");
-MODULE_FIRMWARE("radeon/hawaii_rlc.bin");
-MODULE_FIRMWARE("radeon/hawaii_mec.bin");
-
-MODULE_FIRMWARE("radeon/kaveri_pfp.bin");
-MODULE_FIRMWARE("radeon/kaveri_me.bin");
-MODULE_FIRMWARE("radeon/kaveri_ce.bin");
-MODULE_FIRMWARE("radeon/kaveri_rlc.bin");
-MODULE_FIRMWARE("radeon/kaveri_mec.bin");
-MODULE_FIRMWARE("radeon/kaveri_mec2.bin");
-
-MODULE_FIRMWARE("radeon/kabini_pfp.bin");
-MODULE_FIRMWARE("radeon/kabini_me.bin");
-MODULE_FIRMWARE("radeon/kabini_ce.bin");
-MODULE_FIRMWARE("radeon/kabini_rlc.bin");
-MODULE_FIRMWARE("radeon/kabini_mec.bin");
-
-MODULE_FIRMWARE("radeon/mullins_pfp.bin");
-MODULE_FIRMWARE("radeon/mullins_me.bin");
-MODULE_FIRMWARE("radeon/mullins_ce.bin");
-MODULE_FIRMWARE("radeon/mullins_rlc.bin");
-MODULE_FIRMWARE("radeon/mullins_mec.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_pfp.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_me.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_ce.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_rlc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_mec.bin");
+
+MODULE_FIRMWARE("amdgpu/hawaii_pfp.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_me.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_ce.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_rlc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_mec.bin");
+
+MODULE_FIRMWARE("amdgpu/kaveri_pfp.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_me.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_ce.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_rlc.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_mec.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_mec2.bin");
+
+MODULE_FIRMWARE("amdgpu/kabini_pfp.bin");
+MODULE_FIRMWARE("amdgpu/kabini_me.bin");
+MODULE_FIRMWARE("amdgpu/kabini_ce.bin");
+MODULE_FIRMWARE("amdgpu/kabini_rlc.bin");
+MODULE_FIRMWARE("amdgpu/kabini_mec.bin");
+
+MODULE_FIRMWARE("amdgpu/mullins_pfp.bin");
+MODULE_FIRMWARE("amdgpu/mullins_me.bin");
+MODULE_FIRMWARE("amdgpu/mullins_ce.bin");
+MODULE_FIRMWARE("amdgpu/mullins_rlc.bin");
+MODULE_FIRMWARE("amdgpu/mullins_mec.bin");
 
 static const struct amdgpu_gds_reg_offset amdgpu_gds_reg_offset[] =
 {
@@ -925,7 +925,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
        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);
        if (err)
                goto out;
@@ -933,7 +933,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
        if (err)
                goto out;
 
-       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);
        if (err)
                goto out;
@@ -941,7 +941,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
        if (err)
                goto out;
 
-       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);
        if (err)
                goto out;
@@ -949,7 +949,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
        if (err)
                goto out;
 
-       snprintf(fw_name, sizeof(fw_name), "radeon/%s_mec.bin", chip_name);
+       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec.bin", chip_name);
        err = request_firmware(&adev->gfx.mec_fw, fw_name, adev->dev);
        if (err)
                goto out;
@@ -958,7 +958,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
                goto out;
 
        if (adev->asic_type == CHIP_KAVERI) {
-               snprintf(fw_name, sizeof(fw_name), "radeon/%s_mec2.bin", chip_name);
+               snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec2.bin", chip_name);
                err = request_firmware(&adev->gfx.mec2_fw, fw_name, adev->dev);
                if (err)
                        goto out;
@@ -967,7 +967,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
                        goto out;
        }
 
-       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);
        if (err)
                goto out;
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +3 -4
index 7147bfe25a23..2c2b93d4d63b 100644
@@ -47,8 +47,8 @@ static void gmc_v7_0_set_gmc_funcs(struct amdgpu_device *adev);
 static void gmc_v7_0_set_irq_funcs(struct amdgpu_device *adev);
 static int gmc_v7_0_wait_for_idle(void *handle);
 
-MODULE_FIRMWARE("radeon/bonaire_mc.bin");
-MODULE_FIRMWARE("radeon/hawaii_mc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_mc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_mc.bin");
 MODULE_FIRMWARE("amdgpu/topaz_mc.bin");
 
 static const u32 golden_settings_iceland_a11[] =
@@ -150,7 +150,7 @@ static int gmc_v7_0_init_microcode(struct amdgpu_device *adev)
        if (adev->asic_type == CHIP_TOPAZ)
                snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name);
        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);
        if (err)
--

2.13.6

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CAPM=9txyR9s1Ceh=WGefsdBfR+rRxPLMycP_uuqkfTh+xpxsDg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#5 lore raw
Quoted 5 lines · Dave Airlie
Quoted 3 lines · Alex Deucher

Use separate firmware path for amdgpu to avoid conflicts with radeon on CIK parts.

Quoted 7 lines

Won't that cause a chicken and egg problem, new kernel with old firmware package will
suddenly start failing, or do we not really care since in theory we don't suppose amdgpu
on those parts yet?

Seems like we'd want to fallback to the old paths if possible.

I guess we could fall back, but in most cases the firmware loader will have to timeout first and then most users will assume it's broken anyway. radeon is still the default with most distros, so I don't think it's super critical.

Alex

Quoted 305 lines

Dave.

Quoted 302 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c |  8 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 10 ++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 10 ++---
 drivers/gpu/drm/amd/amdgpu/ci_dpm.c     | 10 ++---
 drivers/gpu/drm/amd/amdgpu/cik_sdma.c   | 24 +++++------
 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c   | 72 ++++++++++++++++-----------------
 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c   |  6 +--
 7 files changed, 70 insertions(+), 70 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +4 -4
index e950730f1933..693ec5ea4950 100644
@@ -314,17 +314,17 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
                                        (adev->pdev->revision == 0x81) ||
                                        (adev->pdev->device == 0x665f)) {
                                        info->is_kicker = true;
-                                       strcpy(fw_name, "radeon/bonaire_k_smc.bin");
+                                       strcpy(fw_name, "amdgpu/bonaire_k_smc.bin");
                                } else {
-                                       strcpy(fw_name, "radeon/bonaire_smc.bin");
+                                       strcpy(fw_name, "amdgpu/bonaire_smc.bin");
                                }
                                break;
                        case CHIP_HAWAII:
                                if (adev->pdev->revision == 0x80) {
                                        info->is_kicker = true;
-                                       strcpy(fw_name, "radeon/hawaii_k_smc.bin");
+                                       strcpy(fw_name, "amdgpu/hawaii_k_smc.bin");
                                } else {
-                                       strcpy(fw_name, "radeon/hawaii_smc.bin");
+                                       strcpy(fw_name, "amdgpu/hawaii_smc.bin");
                                }
                                break;
                        case CHIP_TOPAZ:
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +5 -5
index 0b46ea1c6290..3e70eb61a960 100644
@@ -53,11 +53,11 @@
 
 /* Firmware Names */
 #ifdef CONFIG_DRM_AMDGPU_CIK
-#define FIRMWARE_BONAIRE       "radeon/bonaire_uvd.bin"
-#define FIRMWARE_KABINI        "radeon/kabini_uvd.bin"
-#define FIRMWARE_KAVERI        "radeon/kaveri_uvd.bin"
-#define FIRMWARE_HAWAII        "radeon/hawaii_uvd.bin"
-#define FIRMWARE_MULLINS       "radeon/mullins_uvd.bin"
+#define FIRMWARE_BONAIRE       "amdgpu/bonaire_uvd.bin"
+#define FIRMWARE_KABINI        "amdgpu/kabini_uvd.bin"
+#define FIRMWARE_KAVERI        "amdgpu/kaveri_uvd.bin"
+#define FIRMWARE_HAWAII        "amdgpu/hawaii_uvd.bin"
+#define FIRMWARE_MULLINS       "amdgpu/mullins_uvd.bin"
 #endif
 #define FIRMWARE_TONGA         "amdgpu/tonga_uvd.bin"
 #define FIRMWARE_CARRIZO       "amdgpu/carrizo_uvd.bin"
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +5 -5
index b0dcdfd85f5b..6ae1ad7e83b3 100644
@@ -40,11 +40,11 @@
 
 /* Firmware Names */
 #ifdef CONFIG_DRM_AMDGPU_CIK
-#define FIRMWARE_BONAIRE       "radeon/bonaire_vce.bin"
-#define FIRMWARE_KABINI        "radeon/kabini_vce.bin"
-#define FIRMWARE_KAVERI        "radeon/kaveri_vce.bin"
-#define FIRMWARE_HAWAII        "radeon/hawaii_vce.bin"
-#define FIRMWARE_MULLINS       "radeon/mullins_vce.bin"
+#define FIRMWARE_BONAIRE       "amdgpu/bonaire_vce.bin"
+#define FIRMWARE_KABINI        "amdgpu/kabini_vce.bin"
+#define FIRMWARE_KAVERI        "amdgpu/kaveri_vce.bin"
+#define FIRMWARE_HAWAII        "amdgpu/hawaii_vce.bin"
+#define FIRMWARE_MULLINS       "amdgpu/mullins_vce.bin"
 #endif
 #define FIRMWARE_TONGA         "amdgpu/tonga_vce.bin"
 #define FIRMWARE_CARRIZO       "amdgpu/carrizo_vce.bin"
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +5 -5
index 079a5fc9b593..d2469453dca2 100644
@@ -49,10 +49,10 @@
 #include "gmc/gmc_7_1_d.h"
 #include "gmc/gmc_7_1_sh_mask.h"
 
-MODULE_FIRMWARE("radeon/bonaire_smc.bin");
-MODULE_FIRMWARE("radeon/bonaire_k_smc.bin");
-MODULE_FIRMWARE("radeon/hawaii_smc.bin");
-MODULE_FIRMWARE("radeon/hawaii_k_smc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_smc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_k_smc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_smc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_k_smc.bin");
 
 #define MC_CG_ARB_FREQ_F0           0x0a
 #define MC_CG_ARB_FREQ_F1           0x0b
@@ -5815,7 +5815,7 @@ static int ci_dpm_init_microcode(struct amdgpu_device *adev)
        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);
        if (err)
                goto out;
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +12 -12
index dbd553a8d584..d0fa2aac2388 100644
@@ -54,16 +54,16 @@ static void cik_sdma_set_buffer_funcs(struct amdgpu_device *adev);
 static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev);
 static int cik_sdma_soft_reset(void *handle);
 
-MODULE_FIRMWARE("radeon/bonaire_sdma.bin");
-MODULE_FIRMWARE("radeon/bonaire_sdma1.bin");
-MODULE_FIRMWARE("radeon/hawaii_sdma.bin");
-MODULE_FIRMWARE("radeon/hawaii_sdma1.bin");
-MODULE_FIRMWARE("radeon/kaveri_sdma.bin");
-MODULE_FIRMWARE("radeon/kaveri_sdma1.bin");
-MODULE_FIRMWARE("radeon/kabini_sdma.bin");
-MODULE_FIRMWARE("radeon/kabini_sdma1.bin");
-MODULE_FIRMWARE("radeon/mullins_sdma.bin");
-MODULE_FIRMWARE("radeon/mullins_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_sdma.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_sdma.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_sdma.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/kabini_sdma.bin");
+MODULE_FIRMWARE("amdgpu/kabini_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/mullins_sdma.bin");
+MODULE_FIRMWARE("amdgpu/mullins_sdma1.bin");
 
 u32 amdgpu_cik_gpu_check_soft_reset(struct amdgpu_device *adev);
 
@@ -132,9 +132,9 @@ static int cik_sdma_init_microcode(struct amdgpu_device *adev)
 
        for (i = 0; i < adev->sdma.num_instances; i++) {
                if (i == 0)
-                       snprintf(fw_name, sizeof(fw_name), "radeon/%s_sdma.bin", chip_name);
+                       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma.bin", chip_name);
                else
-                       snprintf(fw_name, sizeof(fw_name), "radeon/%s_sdma1.bin", chip_name);
+                       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma1.bin", chip_name);
                err = request_firmware(&adev->sdma.instance[i].fw, fw_name, adev->dev);
                if (err)
                        goto out;
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +36 -36
index 42b6144c1fd5..95452c5a9df6 100644
@@ -57,36 +57,36 @@ static void gfx_v7_0_set_ring_funcs(struct amdgpu_device *adev);
 static void gfx_v7_0_set_irq_funcs(struct amdgpu_device *adev);
 static void gfx_v7_0_set_gds_init(struct amdgpu_device *adev);
 
-MODULE_FIRMWARE("radeon/bonaire_pfp.bin");
-MODULE_FIRMWARE("radeon/bonaire_me.bin");
-MODULE_FIRMWARE("radeon/bonaire_ce.bin");
-MODULE_FIRMWARE("radeon/bonaire_rlc.bin");
-MODULE_FIRMWARE("radeon/bonaire_mec.bin");
-
-MODULE_FIRMWARE("radeon/hawaii_pfp.bin");
-MODULE_FIRMWARE("radeon/hawaii_me.bin");
-MODULE_FIRMWARE("radeon/hawaii_ce.bin");
-MODULE_FIRMWARE("radeon/hawaii_rlc.bin");
-MODULE_FIRMWARE("radeon/hawaii_mec.bin");
-
-MODULE_FIRMWARE("radeon/kaveri_pfp.bin");
-MODULE_FIRMWARE("radeon/kaveri_me.bin");
-MODULE_FIRMWARE("radeon/kaveri_ce.bin");
-MODULE_FIRMWARE("radeon/kaveri_rlc.bin");
-MODULE_FIRMWARE("radeon/kaveri_mec.bin");
-MODULE_FIRMWARE("radeon/kaveri_mec2.bin");
-
-MODULE_FIRMWARE("radeon/kabini_pfp.bin");
-MODULE_FIRMWARE("radeon/kabini_me.bin");
-MODULE_FIRMWARE("radeon/kabini_ce.bin");
-MODULE_FIRMWARE("radeon/kabini_rlc.bin");
-MODULE_FIRMWARE("radeon/kabini_mec.bin");
-
-MODULE_FIRMWARE("radeon/mullins_pfp.bin");
-MODULE_FIRMWARE("radeon/mullins_me.bin");
-MODULE_FIRMWARE("radeon/mullins_ce.bin");
-MODULE_FIRMWARE("radeon/mullins_rlc.bin");
-MODULE_FIRMWARE("radeon/mullins_mec.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_pfp.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_me.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_ce.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_rlc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_mec.bin");
+
+MODULE_FIRMWARE("amdgpu/hawaii_pfp.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_me.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_ce.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_rlc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_mec.bin");
+
+MODULE_FIRMWARE("amdgpu/kaveri_pfp.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_me.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_ce.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_rlc.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_mec.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_mec2.bin");
+
+MODULE_FIRMWARE("amdgpu/kabini_pfp.bin");
+MODULE_FIRMWARE("amdgpu/kabini_me.bin");
+MODULE_FIRMWARE("amdgpu/kabini_ce.bin");
+MODULE_FIRMWARE("amdgpu/kabini_rlc.bin");
+MODULE_FIRMWARE("amdgpu/kabini_mec.bin");
+
+MODULE_FIRMWARE("amdgpu/mullins_pfp.bin");
+MODULE_FIRMWARE("amdgpu/mullins_me.bin");
+MODULE_FIRMWARE("amdgpu/mullins_ce.bin");
+MODULE_FIRMWARE("amdgpu/mullins_rlc.bin");
+MODULE_FIRMWARE("amdgpu/mullins_mec.bin");
 
 static const struct amdgpu_gds_reg_offset amdgpu_gds_reg_offset[] =
 {
@@ -925,7 +925,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
        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);
        if (err)
                goto out;
@@ -933,7 +933,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
        if (err)
                goto out;
 
-       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);
        if (err)
                goto out;
@@ -941,7 +941,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
        if (err)
                goto out;
 
-       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);
        if (err)
                goto out;
@@ -949,7 +949,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
        if (err)
                goto out;
 
-       snprintf(fw_name, sizeof(fw_name), "radeon/%s_mec.bin", chip_name);
+       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec.bin", chip_name);
        err = request_firmware(&adev->gfx.mec_fw, fw_name, adev->dev);
        if (err)
                goto out;
@@ -958,7 +958,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
                goto out;
 
        if (adev->asic_type == CHIP_KAVERI) {
-               snprintf(fw_name, sizeof(fw_name), "radeon/%s_mec2.bin", chip_name);
+               snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec2.bin", chip_name);
                err = request_firmware(&adev->gfx.mec2_fw, fw_name, adev->dev);
                if (err)
                        goto out;
@@ -967,7 +967,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
                        goto out;
        }
 
-       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);
        if (err)
                goto out;
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +3 -4
index 7147bfe25a23..2c2b93d4d63b 100644
@@ -47,8 +47,8 @@ static void gmc_v7_0_set_gmc_funcs(struct amdgpu_device *adev);
 static void gmc_v7_0_set_irq_funcs(struct amdgpu_device *adev);
 static int gmc_v7_0_wait_for_idle(void *handle);
 
-MODULE_FIRMWARE("radeon/bonaire_mc.bin");
-MODULE_FIRMWARE("radeon/hawaii_mc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_mc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_mc.bin");
 MODULE_FIRMWARE("amdgpu/topaz_mc.bin");
 
 static const u32 golden_settings_iceland_a11[] =
@@ -150,7 +150,7 @@ static int gmc_v7_0_init_microcode(struct amdgpu_device *adev)
        if (adev->asic_type == CHIP_TOPAZ)
                snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name);
        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);
        if (err)
--

2.13.6

Quoted 4 lines
Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CADnq5_PvzDsxmusYKDjCGom2KdUshUNQx+FqX7os-uG-YPkP+w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#7 lore raw

Yes, agree, radeon driver uses radeon path, amdgpu uses amdgpu path, which makes sense to me.

The series is Reviewed-by: Chunming Zhou <[email protected]>

Regards,
David Zhou

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Alex Deucher
Sent: Tuesday, July 03, 2018 4:32 AM
To: Dave Airlie <[email protected]>
Cc: Deucher, Alexander <[email protected]>; amd-gfx mailing list <[email protected]>
Subject: Re: [PATCH 1/2] drm/amdgpu: switch firmware path for CIK parts

Quoted 10 lines · Dave Airlie
Quoted 3 lines · Alex Deucher

Use separate firmware path for amdgpu to avoid conflicts with radeon on CIK parts.

Won't that cause a chicken and egg problem, new kernel with old firmware package will suddenly start failing, or do we not really care since in theory we don't suppose amdgpu on those parts yet?

Seems like we'd want to fallback to the old paths if possible.

I guess we could fall back, but in most cases the firmware loader will have to timeout first and then most users will assume it's broken anyway. radeon is still the default with most distros, so I don't think it's super critical.

Alex

Quoted 329 lines

Dave.

Quoted 326 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c |  8 ++--  
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 10 ++---  
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 10 ++---
 drivers/gpu/drm/amd/amdgpu/ci_dpm.c     | 10 ++---
 drivers/gpu/drm/amd/amdgpu/cik_sdma.c   | 24 +++++------
 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c   | 72 ++++++++++++++++-----------------
 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c   |  6 +--
 7 files changed, 70 insertions(+), 70 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +8 -4
index e950730f1933..693ec5ea4950 100644
@@ -314,17 +314,17 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
                                        (adev->pdev->revision == 0x81) ||
                                        (adev->pdev->device == 0x665f)) {
                                        info->is_kicker = true;
-                                       strcpy(fw_name, "radeon/bonaire_k_smc.bin");
+                                       strcpy(fw_name, 
+ "amdgpu/bonaire_k_smc.bin");
                                } else {
-                                       strcpy(fw_name, "radeon/bonaire_smc.bin");
+                                       strcpy(fw_name, 
+ "amdgpu/bonaire_smc.bin");
                                }
                                break;
                        case CHIP_HAWAII:
                                if (adev->pdev->revision == 0x80) {
                                        info->is_kicker = true;
-                                       strcpy(fw_name, "radeon/hawaii_k_smc.bin");
+                                       strcpy(fw_name, 
+ "amdgpu/hawaii_k_smc.bin");
                                } else {
-                                       strcpy(fw_name, "radeon/hawaii_smc.bin");
+                                       strcpy(fw_name, 
+ "amdgpu/hawaii_smc.bin");
                                }
                                break;
                        case CHIP_TOPAZ:
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +5 -5
index 0b46ea1c6290..3e70eb61a960 100644
@@ -53,11 +53,11 @@
 
 /* Firmware Names */
 #ifdef CONFIG_DRM_AMDGPU_CIK
-#define FIRMWARE_BONAIRE       "radeon/bonaire_uvd.bin"
-#define FIRMWARE_KABINI        "radeon/kabini_uvd.bin"
-#define FIRMWARE_KAVERI        "radeon/kaveri_uvd.bin"
-#define FIRMWARE_HAWAII        "radeon/hawaii_uvd.bin"
-#define FIRMWARE_MULLINS       "radeon/mullins_uvd.bin"
+#define FIRMWARE_BONAIRE       "amdgpu/bonaire_uvd.bin"
+#define FIRMWARE_KABINI        "amdgpu/kabini_uvd.bin"
+#define FIRMWARE_KAVERI        "amdgpu/kaveri_uvd.bin"
+#define FIRMWARE_HAWAII        "amdgpu/hawaii_uvd.bin"
+#define FIRMWARE_MULLINS       "amdgpu/mullins_uvd.bin"
 #endif
 #define FIRMWARE_TONGA         "amdgpu/tonga_uvd.bin"
 #define FIRMWARE_CARRIZO       "amdgpu/carrizo_uvd.bin"
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +5 -5
index b0dcdfd85f5b..6ae1ad7e83b3 100644
@@ -40,11 +40,11 @@
 
 /* Firmware Names */
 #ifdef CONFIG_DRM_AMDGPU_CIK
-#define FIRMWARE_BONAIRE       "radeon/bonaire_vce.bin"
-#define FIRMWARE_KABINI        "radeon/kabini_vce.bin"
-#define FIRMWARE_KAVERI        "radeon/kaveri_vce.bin"
-#define FIRMWARE_HAWAII        "radeon/hawaii_vce.bin"
-#define FIRMWARE_MULLINS       "radeon/mullins_vce.bin"
+#define FIRMWARE_BONAIRE       "amdgpu/bonaire_vce.bin"
+#define FIRMWARE_KABINI        "amdgpu/kabini_vce.bin"
+#define FIRMWARE_KAVERI        "amdgpu/kaveri_vce.bin"
+#define FIRMWARE_HAWAII        "amdgpu/hawaii_vce.bin"
+#define FIRMWARE_MULLINS       "amdgpu/mullins_vce.bin"
 #endif
 #define FIRMWARE_TONGA         "amdgpu/tonga_vce.bin"
 #define FIRMWARE_CARRIZO       "amdgpu/carrizo_vce.bin"
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +6 -5
index 079a5fc9b593..d2469453dca2 100644
@@ -49,10 +49,10 @@
 #include "gmc/gmc_7_1_d.h"
 #include "gmc/gmc_7_1_sh_mask.h"
 
-MODULE_FIRMWARE("radeon/bonaire_smc.bin");
-MODULE_FIRMWARE("radeon/bonaire_k_smc.bin");
-MODULE_FIRMWARE("radeon/hawaii_smc.bin");
-MODULE_FIRMWARE("radeon/hawaii_k_smc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_smc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_k_smc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_smc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_k_smc.bin");
 
 #define MC_CG_ARB_FREQ_F0           0x0a
 #define MC_CG_ARB_FREQ_F1           0x0b
@@ -5815,7 +5815,7 @@ static int ci_dpm_init_microcode(struct amdgpu_device *adev)
        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);
        if (err)
                goto out;
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +0 -0
index dbd553a8d584..d0fa2aac2388 100644
@@ -54,16 +54,16 @@ static void cik_sdma_set_buffer_funcs(struct 

amdgpu_device *adev); static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev); static int cik_sdma_soft_reset(void *handle);

drivers/gpu/drm/amd/amdgpu/cik_sdma.c +14 -12
-MODULE_FIRMWARE("radeon/bonaire_sdma.bin");
-MODULE_FIRMWARE("radeon/bonaire_sdma1.bin");
-MODULE_FIRMWARE("radeon/hawaii_sdma.bin");
-MODULE_FIRMWARE("radeon/hawaii_sdma1.bin");
-MODULE_FIRMWARE("radeon/kaveri_sdma.bin");
-MODULE_FIRMWARE("radeon/kaveri_sdma1.bin");
-MODULE_FIRMWARE("radeon/kabini_sdma.bin");
-MODULE_FIRMWARE("radeon/kabini_sdma1.bin");
-MODULE_FIRMWARE("radeon/mullins_sdma.bin");
-MODULE_FIRMWARE("radeon/mullins_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_sdma.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_sdma.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_sdma.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/kabini_sdma.bin");
+MODULE_FIRMWARE("amdgpu/kabini_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/mullins_sdma.bin");
+MODULE_FIRMWARE("amdgpu/mullins_sdma1.bin");
 
 u32 amdgpu_cik_gpu_check_soft_reset(struct amdgpu_device *adev);
@@ -132,9 +132,9 @@ static int cik_sdma_init_microcode(struct 
 amdgpu_device *adev)
 
        for (i = 0; i < adev->sdma.num_instances; i++) {
                if (i == 0)
-                       snprintf(fw_name, sizeof(fw_name), "radeon/%s_sdma.bin", chip_name);
+                       snprintf(fw_name, sizeof(fw_name), 
+ "amdgpu/%s_sdma.bin", chip_name);
                else
-                       snprintf(fw_name, sizeof(fw_name), "radeon/%s_sdma1.bin", chip_name);
+                       snprintf(fw_name, sizeof(fw_name), 
+ "amdgpu/%s_sdma1.bin", chip_name);
                err = request_firmware(&adev->sdma.instance[i].fw, fw_name, adev->dev);
                if (err)
                        goto out;
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +0 -0
index 42b6144c1fd5..95452c5a9df6 100644
@@ -57,36 +57,36 @@ static void gfx_v7_0_set_ring_funcs(struct 

amdgpu_device *adev); static void gfx_v7_0_set_irq_funcs(struct amdgpu_device *adev); static void gfx_v7_0_set_gds_init(struct amdgpu_device *adev);

drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +30 -30
-MODULE_FIRMWARE("radeon/bonaire_pfp.bin");
-MODULE_FIRMWARE("radeon/bonaire_me.bin");
-MODULE_FIRMWARE("radeon/bonaire_ce.bin");
-MODULE_FIRMWARE("radeon/bonaire_rlc.bin");
-MODULE_FIRMWARE("radeon/bonaire_mec.bin");
-
-MODULE_FIRMWARE("radeon/hawaii_pfp.bin");
-MODULE_FIRMWARE("radeon/hawaii_me.bin");
-MODULE_FIRMWARE("radeon/hawaii_ce.bin");
-MODULE_FIRMWARE("radeon/hawaii_rlc.bin");
-MODULE_FIRMWARE("radeon/hawaii_mec.bin");
-
-MODULE_FIRMWARE("radeon/kaveri_pfp.bin");
-MODULE_FIRMWARE("radeon/kaveri_me.bin");
-MODULE_FIRMWARE("radeon/kaveri_ce.bin");
-MODULE_FIRMWARE("radeon/kaveri_rlc.bin");
-MODULE_FIRMWARE("radeon/kaveri_mec.bin");
-MODULE_FIRMWARE("radeon/kaveri_mec2.bin");
-
-MODULE_FIRMWARE("radeon/kabini_pfp.bin");
-MODULE_FIRMWARE("radeon/kabini_me.bin");
-MODULE_FIRMWARE("radeon/kabini_ce.bin");
-MODULE_FIRMWARE("radeon/kabini_rlc.bin");
-MODULE_FIRMWARE("radeon/kabini_mec.bin");
-
-MODULE_FIRMWARE("radeon/mullins_pfp.bin");
-MODULE_FIRMWARE("radeon/mullins_me.bin");
-MODULE_FIRMWARE("radeon/mullins_ce.bin");
-MODULE_FIRMWARE("radeon/mullins_rlc.bin");
-MODULE_FIRMWARE("radeon/mullins_mec.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_pfp.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_me.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_ce.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_rlc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_mec.bin");
+
+MODULE_FIRMWARE("amdgpu/hawaii_pfp.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_me.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_ce.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_rlc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_mec.bin");
+
+MODULE_FIRMWARE("amdgpu/kaveri_pfp.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_me.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_ce.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_rlc.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_mec.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_mec2.bin");
+
+MODULE_FIRMWARE("amdgpu/kabini_pfp.bin");
+MODULE_FIRMWARE("amdgpu/kabini_me.bin");
+MODULE_FIRMWARE("amdgpu/kabini_ce.bin");
+MODULE_FIRMWARE("amdgpu/kabini_rlc.bin");
+MODULE_FIRMWARE("amdgpu/kabini_mec.bin");
+
+MODULE_FIRMWARE("amdgpu/mullins_pfp.bin");
+MODULE_FIRMWARE("amdgpu/mullins_me.bin");
+MODULE_FIRMWARE("amdgpu/mullins_ce.bin");
+MODULE_FIRMWARE("amdgpu/mullins_rlc.bin");
+MODULE_FIRMWARE("amdgpu/mullins_mec.bin");
 
 static const struct amdgpu_gds_reg_offset amdgpu_gds_reg_offset[] =  

{ @@ -925,7 +925,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)

        default: BUG();
        }
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +12 -6
-       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);
        if (err)
                goto out;
@@ -933,7 +933,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
        if (err)
                goto out;
 
-       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);
        if (err)
                goto out;
@@ -941,7 +941,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
        if (err)
                goto out;
 
-       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);
        if (err)
                goto out;
@@ -949,7 +949,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
        if (err)
                goto out;
 
-       snprintf(fw_name, sizeof(fw_name), "radeon/%s_mec.bin", chip_name);
+       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec.bin", 
+ chip_name);
        err = request_firmware(&adev->gfx.mec_fw, fw_name, adev->dev);
        if (err)
                goto out;
@@ -958,7 +958,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
                goto out;
 
        if (adev->asic_type == CHIP_KAVERI) {
-               snprintf(fw_name, sizeof(fw_name), "radeon/%s_mec2.bin", chip_name);
+               snprintf(fw_name, sizeof(fw_name), 
+ "amdgpu/%s_mec2.bin", chip_name);
                err = request_firmware(&adev->gfx.mec2_fw, fw_name, adev->dev);
                if (err)
                        goto out;
@@ -967,7 +967,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
                        goto out;
        }
 
-       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);
        if (err)
                goto out;
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +0 -0
index 7147bfe25a23..2c2b93d4d63b 100644
@@ -47,8 +47,8 @@ static void gmc_v7_0_set_gmc_funcs(struct 

amdgpu_device *adev); static void gmc_v7_0_set_irq_funcs(struct amdgpu_device *adev); static int gmc_v7_0_wait_for_idle(void *handle);

drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +2 -2
-MODULE_FIRMWARE("radeon/bonaire_mc.bin");
-MODULE_FIRMWARE("radeon/hawaii_mc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_mc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_mc.bin");
 MODULE_FIRMWARE("amdgpu/topaz_mc.bin");
 
 static const u32 golden_settings_iceland_a11[] = @@ -150,7 +150,7 @@ 

static int gmc_v7_0_init_microcode(struct amdgpu_device *adev)

        if (adev->asic_type == CHIP_TOPAZ)
                snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name);
        else
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +2 -2
-               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);
        if (err)
--

2.13.6

Quoted 4 lines
Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): SN1PR12MB05101C29AEBC9362B37731ACB4420-z7L1TMIYDg5tVDmkcP8tDwdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

#9 lore raw

Yeah, not 100% sure if that doesn't result in any problems in practice.

But I agree that this risk of breaking things is minimal and if that breaks the ones to blame are really our firmware guys because they created not backward compatible firmware changes.

So this step is really necessary no matter how you put it (either you break amdgpu or you break radeon, and radeon is used by more people).

Series is Reviewed-by: Christian König <[email protected]>.

Regards,
Christian.

Am 03.07.2018 um 03:39 schrieb Zhou, David(ChunMing):

Quoted 356 lines

Yes, agree, radeon driver uses radeon path, amdgpu uses amdgpu path, which makes sense to me.

The series is Reviewed-by: Chunming Zhou <[email protected]>

Regards,
David Zhou

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Alex Deucher
Sent: Tuesday, July 03, 2018 4:32 AM
To: Dave Airlie <[email protected]>
Cc: Deucher, Alexander <[email protected]>; amd-gfx mailing list <[email protected]>
Subject: Re: [PATCH 1/2] drm/amdgpu: switch firmware path for CIK parts

Quoted 9 lines · Dave Airlie
Quoted 3 lines · Alex Deucher

Use separate firmware path for amdgpu to avoid conflicts with radeon on CIK parts.

Won't that cause a chicken and egg problem, new kernel with old firmware package will suddenly start failing, or do we not really care since in theory we don't suppose amdgpu on those parts yet?

Seems like we'd want to fallback to the old paths if possible.

I guess we could fall back, but in most cases the firmware loader will have to timeout first and then most users will assume it's broken anyway. radeon is still the default with most distros, so I don't think it's super critical.

Alex

Quoted 328 lines

Dave.

Quoted 326 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c |  8 ++--
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 10 ++---
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 10 ++---
  drivers/gpu/drm/amd/amdgpu/ci_dpm.c     | 10 ++---
  drivers/gpu/drm/amd/amdgpu/cik_sdma.c   | 24 +++++------
  drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c   | 72 ++++++++++++++++-----------------
  drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c   |  6 +--
  7 files changed, 70 insertions(+), 70 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +8 -4
index e950730f1933..693ec5ea4950 100644
@@ -314,17 +314,17 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
                                         (adev->pdev->revision == 0x81) ||
                                         (adev->pdev->device == 0x665f)) {
                                         info->is_kicker = true;
-                                       strcpy(fw_name, "radeon/bonaire_k_smc.bin");
+                                       strcpy(fw_name,
+ "amdgpu/bonaire_k_smc.bin");
                                 } else {
-                                       strcpy(fw_name, "radeon/bonaire_smc.bin");
+                                       strcpy(fw_name,
+ "amdgpu/bonaire_smc.bin");
                                 }
                                 break;
                         case CHIP_HAWAII:
                                 if (adev->pdev->revision == 0x80) {
                                         info->is_kicker = true;
-                                       strcpy(fw_name, "radeon/hawaii_k_smc.bin");
+                                       strcpy(fw_name,
+ "amdgpu/hawaii_k_smc.bin");
                                 } else {
-                                       strcpy(fw_name, "radeon/hawaii_smc.bin");
+                                       strcpy(fw_name,
+ "amdgpu/hawaii_smc.bin");
                                 }
                                 break;
                         case CHIP_TOPAZ:
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +5 -5
index 0b46ea1c6290..3e70eb61a960 100644
@@ -53,11 +53,11 @@
 
  /* Firmware Names */
  #ifdef CONFIG_DRM_AMDGPU_CIK
-#define FIRMWARE_BONAIRE       "radeon/bonaire_uvd.bin"
-#define FIRMWARE_KABINI        "radeon/kabini_uvd.bin"
-#define FIRMWARE_KAVERI        "radeon/kaveri_uvd.bin"
-#define FIRMWARE_HAWAII        "radeon/hawaii_uvd.bin"
-#define FIRMWARE_MULLINS       "radeon/mullins_uvd.bin"
+#define FIRMWARE_BONAIRE       "amdgpu/bonaire_uvd.bin"
+#define FIRMWARE_KABINI        "amdgpu/kabini_uvd.bin"
+#define FIRMWARE_KAVERI        "amdgpu/kaveri_uvd.bin"
+#define FIRMWARE_HAWAII        "amdgpu/hawaii_uvd.bin"
+#define FIRMWARE_MULLINS       "amdgpu/mullins_uvd.bin"
  #endif
  #define FIRMWARE_TONGA         "amdgpu/tonga_uvd.bin"
  #define FIRMWARE_CARRIZO       "amdgpu/carrizo_uvd.bin"
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +5 -5
index b0dcdfd85f5b..6ae1ad7e83b3 100644
@@ -40,11 +40,11 @@
 
  /* Firmware Names */
  #ifdef CONFIG_DRM_AMDGPU_CIK
-#define FIRMWARE_BONAIRE       "radeon/bonaire_vce.bin"
-#define FIRMWARE_KABINI        "radeon/kabini_vce.bin"
-#define FIRMWARE_KAVERI        "radeon/kaveri_vce.bin"
-#define FIRMWARE_HAWAII        "radeon/hawaii_vce.bin"
-#define FIRMWARE_MULLINS       "radeon/mullins_vce.bin"
+#define FIRMWARE_BONAIRE       "amdgpu/bonaire_vce.bin"
+#define FIRMWARE_KABINI        "amdgpu/kabini_vce.bin"
+#define FIRMWARE_KAVERI        "amdgpu/kaveri_vce.bin"
+#define FIRMWARE_HAWAII        "amdgpu/hawaii_vce.bin"
+#define FIRMWARE_MULLINS       "amdgpu/mullins_vce.bin"
  #endif
  #define FIRMWARE_TONGA         "amdgpu/tonga_vce.bin"
  #define FIRMWARE_CARRIZO       "amdgpu/carrizo_vce.bin"
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +6 -5
index 079a5fc9b593..d2469453dca2 100644
@@ -49,10 +49,10 @@
  #include "gmc/gmc_7_1_d.h"
  #include "gmc/gmc_7_1_sh_mask.h"
 
-MODULE_FIRMWARE("radeon/bonaire_smc.bin");
-MODULE_FIRMWARE("radeon/bonaire_k_smc.bin");
-MODULE_FIRMWARE("radeon/hawaii_smc.bin");
-MODULE_FIRMWARE("radeon/hawaii_k_smc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_smc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_k_smc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_smc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_k_smc.bin");
 
  #define MC_CG_ARB_FREQ_F0           0x0a
  #define MC_CG_ARB_FREQ_F1           0x0b
@@ -5815,7 +5815,7 @@ static int ci_dpm_init_microcode(struct amdgpu_device *adev)
         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);
         if (err)
                 goto out;
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +0 -0
index dbd553a8d584..d0fa2aac2388 100644
@@ -54,16 +54,16 @@ static void cik_sdma_set_buffer_funcs(struct

amdgpu_device *adev); static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev); static int cik_sdma_soft_reset(void *handle);

drivers/gpu/drm/amd/amdgpu/cik_sdma.c +14 -12
-MODULE_FIRMWARE("radeon/bonaire_sdma.bin");
-MODULE_FIRMWARE("radeon/bonaire_sdma1.bin");
-MODULE_FIRMWARE("radeon/hawaii_sdma.bin");
-MODULE_FIRMWARE("radeon/hawaii_sdma1.bin");
-MODULE_FIRMWARE("radeon/kaveri_sdma.bin");
-MODULE_FIRMWARE("radeon/kaveri_sdma1.bin");
-MODULE_FIRMWARE("radeon/kabini_sdma.bin");
-MODULE_FIRMWARE("radeon/kabini_sdma1.bin");
-MODULE_FIRMWARE("radeon/mullins_sdma.bin");
-MODULE_FIRMWARE("radeon/mullins_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_sdma.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_sdma.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_sdma.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/kabini_sdma.bin");
+MODULE_FIRMWARE("amdgpu/kabini_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/mullins_sdma.bin");
+MODULE_FIRMWARE("amdgpu/mullins_sdma1.bin");
 
  u32 amdgpu_cik_gpu_check_soft_reset(struct amdgpu_device *adev);
@@ -132,9 +132,9 @@ static int cik_sdma_init_microcode(struct
 amdgpu_device *adev)
 
         for (i = 0; i < adev->sdma.num_instances; i++) {
                 if (i == 0)
-                       snprintf(fw_name, sizeof(fw_name), "radeon/%s_sdma.bin", chip_name);
+                       snprintf(fw_name, sizeof(fw_name),
+ "amdgpu/%s_sdma.bin", chip_name);
                 else
-                       snprintf(fw_name, sizeof(fw_name), "radeon/%s_sdma1.bin", chip_name);
+                       snprintf(fw_name, sizeof(fw_name),
+ "amdgpu/%s_sdma1.bin", chip_name);
                 err = request_firmware(&adev->sdma.instance[i].fw, fw_name, adev->dev);
                 if (err)
                         goto out;
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +0 -0
index 42b6144c1fd5..95452c5a9df6 100644
@@ -57,36 +57,36 @@ static void gfx_v7_0_set_ring_funcs(struct

amdgpu_device *adev); static void gfx_v7_0_set_irq_funcs(struct amdgpu_device *adev); static void gfx_v7_0_set_gds_init(struct amdgpu_device *adev);

drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +30 -30
-MODULE_FIRMWARE("radeon/bonaire_pfp.bin");
-MODULE_FIRMWARE("radeon/bonaire_me.bin");
-MODULE_FIRMWARE("radeon/bonaire_ce.bin");
-MODULE_FIRMWARE("radeon/bonaire_rlc.bin");
-MODULE_FIRMWARE("radeon/bonaire_mec.bin");
-
-MODULE_FIRMWARE("radeon/hawaii_pfp.bin");
-MODULE_FIRMWARE("radeon/hawaii_me.bin");
-MODULE_FIRMWARE("radeon/hawaii_ce.bin");
-MODULE_FIRMWARE("radeon/hawaii_rlc.bin");
-MODULE_FIRMWARE("radeon/hawaii_mec.bin");
-
-MODULE_FIRMWARE("radeon/kaveri_pfp.bin");
-MODULE_FIRMWARE("radeon/kaveri_me.bin");
-MODULE_FIRMWARE("radeon/kaveri_ce.bin");
-MODULE_FIRMWARE("radeon/kaveri_rlc.bin");
-MODULE_FIRMWARE("radeon/kaveri_mec.bin");
-MODULE_FIRMWARE("radeon/kaveri_mec2.bin");
-
-MODULE_FIRMWARE("radeon/kabini_pfp.bin");
-MODULE_FIRMWARE("radeon/kabini_me.bin");
-MODULE_FIRMWARE("radeon/kabini_ce.bin");
-MODULE_FIRMWARE("radeon/kabini_rlc.bin");
-MODULE_FIRMWARE("radeon/kabini_mec.bin");
-
-MODULE_FIRMWARE("radeon/mullins_pfp.bin");
-MODULE_FIRMWARE("radeon/mullins_me.bin");
-MODULE_FIRMWARE("radeon/mullins_ce.bin");
-MODULE_FIRMWARE("radeon/mullins_rlc.bin");
-MODULE_FIRMWARE("radeon/mullins_mec.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_pfp.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_me.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_ce.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_rlc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_mec.bin");
+
+MODULE_FIRMWARE("amdgpu/hawaii_pfp.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_me.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_ce.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_rlc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_mec.bin");
+
+MODULE_FIRMWARE("amdgpu/kaveri_pfp.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_me.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_ce.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_rlc.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_mec.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_mec2.bin");
+
+MODULE_FIRMWARE("amdgpu/kabini_pfp.bin");
+MODULE_FIRMWARE("amdgpu/kabini_me.bin");
+MODULE_FIRMWARE("amdgpu/kabini_ce.bin");
+MODULE_FIRMWARE("amdgpu/kabini_rlc.bin");
+MODULE_FIRMWARE("amdgpu/kabini_mec.bin");
+
+MODULE_FIRMWARE("amdgpu/mullins_pfp.bin");
+MODULE_FIRMWARE("amdgpu/mullins_me.bin");
+MODULE_FIRMWARE("amdgpu/mullins_ce.bin");
+MODULE_FIRMWARE("amdgpu/mullins_rlc.bin");
+MODULE_FIRMWARE("amdgpu/mullins_mec.bin");
 
  static const struct amdgpu_gds_reg_offset amdgpu_gds_reg_offset[] =

{ @@ -925,7 +925,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)

         default: BUG();
         }
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +12 -6
-       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);
         if (err)
                 goto out;
@@ -933,7 +933,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
         if (err)
                 goto out;
 
-       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);
         if (err)
                 goto out;
@@ -941,7 +941,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
         if (err)
                 goto out;
 
-       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);
         if (err)
                 goto out;
@@ -949,7 +949,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
         if (err)
                 goto out;
 
-       snprintf(fw_name, sizeof(fw_name), "radeon/%s_mec.bin", chip_name);
+       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec.bin",
+ chip_name);
         err = request_firmware(&adev->gfx.mec_fw, fw_name, adev->dev);
         if (err)
                 goto out;
@@ -958,7 +958,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
                 goto out;
 
         if (adev->asic_type == CHIP_KAVERI) {
-               snprintf(fw_name, sizeof(fw_name), "radeon/%s_mec2.bin", chip_name);
+               snprintf(fw_name, sizeof(fw_name),
+ "amdgpu/%s_mec2.bin", chip_name);
                 err = request_firmware(&adev->gfx.mec2_fw, fw_name, adev->dev);
                 if (err)
                         goto out;
@@ -967,7 +967,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
                         goto out;
         }
 
-       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);
         if (err)
                 goto out;
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +0 -0
index 7147bfe25a23..2c2b93d4d63b 100644
@@ -47,8 +47,8 @@ static void gmc_v7_0_set_gmc_funcs(struct

amdgpu_device *adev); static void gmc_v7_0_set_irq_funcs(struct amdgpu_device *adev); static int gmc_v7_0_wait_for_idle(void *handle);

drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +2 -2
-MODULE_FIRMWARE("radeon/bonaire_mc.bin");
-MODULE_FIRMWARE("radeon/hawaii_mc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_mc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_mc.bin");
  MODULE_FIRMWARE("amdgpu/topaz_mc.bin");
 
  static const u32 golden_settings_iceland_a11[] = @@ -150,7 +150,7 @@

static int gmc_v7_0_init_microcode(struct amdgpu_device *adev)

         if (adev->asic_type == CHIP_TOPAZ)
                 snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name);
         else
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +2 -2
-               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);
         if (err)
--

2.13.6

Quoted 12 lines
Quoted 4 lines
Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#10 lore raw
In reply to a message not in the archive
Quoted 2 lines · Alex Deucher

Use separate firmware path for amdgpu to avoid conflicts with radeon on CIK parts.

Does that means firmware will be separated from radeon driver regardless of whether they are same? In another word, amdgpu/CIK-fw is likely to be identical to radeon/CIK-fw.

Jerry

Quoted 293 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c |  8 ++--
  drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 10 ++---
  drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 10 ++---
  drivers/gpu/drm/amd/amdgpu/ci_dpm.c     | 10 ++---
  drivers/gpu/drm/amd/amdgpu/cik_sdma.c   | 24 +++++------
  drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c   | 72 ++++++++++++++++-----------------
  drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c   |  6 +--
  7 files changed, 70 insertions(+), 70 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +4 -4
index e950730f1933..693ec5ea4950 100644
@@ -314,17 +314,17 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
  					(adev->pdev->revision == 0x81) ||
  					(adev->pdev->device == 0x665f)) {
  					info->is_kicker = true;
-					strcpy(fw_name, "radeon/bonaire_k_smc.bin");
+					strcpy(fw_name, "amdgpu/bonaire_k_smc.bin");
  				} else {
-					strcpy(fw_name, "radeon/bonaire_smc.bin");
+					strcpy(fw_name, "amdgpu/bonaire_smc.bin");
  				}
  				break;
  			case CHIP_HAWAII:
  				if (adev->pdev->revision == 0x80) {
  					info->is_kicker = true;
-					strcpy(fw_name, "radeon/hawaii_k_smc.bin");
+					strcpy(fw_name, "amdgpu/hawaii_k_smc.bin");
  				} else {
-					strcpy(fw_name, "radeon/hawaii_smc.bin");
+					strcpy(fw_name, "amdgpu/hawaii_smc.bin");
  				}
  				break;
  			case CHIP_TOPAZ:
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +5 -5
index 0b46ea1c6290..3e70eb61a960 100644
@@ -53,11 +53,11 @@
 
  /* Firmware Names */
  #ifdef CONFIG_DRM_AMDGPU_CIK
-#define FIRMWARE_BONAIRE	"radeon/bonaire_uvd.bin"
-#define FIRMWARE_KABINI	"radeon/kabini_uvd.bin"
-#define FIRMWARE_KAVERI	"radeon/kaveri_uvd.bin"
-#define FIRMWARE_HAWAII	"radeon/hawaii_uvd.bin"
-#define FIRMWARE_MULLINS	"radeon/mullins_uvd.bin"
+#define FIRMWARE_BONAIRE	"amdgpu/bonaire_uvd.bin"
+#define FIRMWARE_KABINI	"amdgpu/kabini_uvd.bin"
+#define FIRMWARE_KAVERI	"amdgpu/kaveri_uvd.bin"
+#define FIRMWARE_HAWAII	"amdgpu/hawaii_uvd.bin"
+#define FIRMWARE_MULLINS	"amdgpu/mullins_uvd.bin"
  #endif
  #define FIRMWARE_TONGA		"amdgpu/tonga_uvd.bin"
  #define FIRMWARE_CARRIZO	"amdgpu/carrizo_uvd.bin"
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +5 -5
index b0dcdfd85f5b..6ae1ad7e83b3 100644
@@ -40,11 +40,11 @@
 
  /* Firmware Names */
  #ifdef CONFIG_DRM_AMDGPU_CIK
-#define FIRMWARE_BONAIRE	"radeon/bonaire_vce.bin"
-#define FIRMWARE_KABINI	"radeon/kabini_vce.bin"
-#define FIRMWARE_KAVERI	"radeon/kaveri_vce.bin"
-#define FIRMWARE_HAWAII	"radeon/hawaii_vce.bin"
-#define FIRMWARE_MULLINS	"radeon/mullins_vce.bin"
+#define FIRMWARE_BONAIRE	"amdgpu/bonaire_vce.bin"
+#define FIRMWARE_KABINI	"amdgpu/kabini_vce.bin"
+#define FIRMWARE_KAVERI	"amdgpu/kaveri_vce.bin"
+#define FIRMWARE_HAWAII	"amdgpu/hawaii_vce.bin"
+#define FIRMWARE_MULLINS	"amdgpu/mullins_vce.bin"
  #endif
  #define FIRMWARE_TONGA		"amdgpu/tonga_vce.bin"
  #define FIRMWARE_CARRIZO	"amdgpu/carrizo_vce.bin"
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +5 -5
index 079a5fc9b593..d2469453dca2 100644
@@ -49,10 +49,10 @@
  #include "gmc/gmc_7_1_d.h"
  #include "gmc/gmc_7_1_sh_mask.h"
 
-MODULE_FIRMWARE("radeon/bonaire_smc.bin");
-MODULE_FIRMWARE("radeon/bonaire_k_smc.bin");
-MODULE_FIRMWARE("radeon/hawaii_smc.bin");
-MODULE_FIRMWARE("radeon/hawaii_k_smc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_smc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_k_smc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_smc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_k_smc.bin");
 
  #define MC_CG_ARB_FREQ_F0           0x0a
  #define MC_CG_ARB_FREQ_F1           0x0b
@@ -5815,7 +5815,7 @@ static int ci_dpm_init_microcode(struct amdgpu_device *adev)
  	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);
  	if (err)
  		goto out;
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +12 -12
index dbd553a8d584..d0fa2aac2388 100644
@@ -54,16 +54,16 @@ static void cik_sdma_set_buffer_funcs(struct amdgpu_device *adev);
  static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev);
  static int cik_sdma_soft_reset(void *handle);
 
-MODULE_FIRMWARE("radeon/bonaire_sdma.bin");
-MODULE_FIRMWARE("radeon/bonaire_sdma1.bin");
-MODULE_FIRMWARE("radeon/hawaii_sdma.bin");
-MODULE_FIRMWARE("radeon/hawaii_sdma1.bin");
-MODULE_FIRMWARE("radeon/kaveri_sdma.bin");
-MODULE_FIRMWARE("radeon/kaveri_sdma1.bin");
-MODULE_FIRMWARE("radeon/kabini_sdma.bin");
-MODULE_FIRMWARE("radeon/kabini_sdma1.bin");
-MODULE_FIRMWARE("radeon/mullins_sdma.bin");
-MODULE_FIRMWARE("radeon/mullins_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_sdma.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_sdma.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_sdma.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/kabini_sdma.bin");
+MODULE_FIRMWARE("amdgpu/kabini_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/mullins_sdma.bin");
+MODULE_FIRMWARE("amdgpu/mullins_sdma1.bin");
 
  u32 amdgpu_cik_gpu_check_soft_reset(struct amdgpu_device *adev);
 
@@ -132,9 +132,9 @@ static int cik_sdma_init_microcode(struct amdgpu_device *adev)
 
  	for (i = 0; i < adev->sdma.num_instances; i++) {
  		if (i == 0)
-			snprintf(fw_name, sizeof(fw_name), "radeon/%s_sdma.bin", chip_name);
+			snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma.bin", chip_name);
  		else
-			snprintf(fw_name, sizeof(fw_name), "radeon/%s_sdma1.bin", chip_name);
+			snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma1.bin", chip_name);
  		err = request_firmware(&adev->sdma.instance[i].fw, fw_name, adev->dev);
  		if (err)
  			goto out;
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +36 -36
index 42b6144c1fd5..95452c5a9df6 100644
@@ -57,36 +57,36 @@ static void gfx_v7_0_set_ring_funcs(struct amdgpu_device *adev);
  static void gfx_v7_0_set_irq_funcs(struct amdgpu_device *adev);
  static void gfx_v7_0_set_gds_init(struct amdgpu_device *adev);
 
-MODULE_FIRMWARE("radeon/bonaire_pfp.bin");
-MODULE_FIRMWARE("radeon/bonaire_me.bin");
-MODULE_FIRMWARE("radeon/bonaire_ce.bin");
-MODULE_FIRMWARE("radeon/bonaire_rlc.bin");
-MODULE_FIRMWARE("radeon/bonaire_mec.bin");
-
-MODULE_FIRMWARE("radeon/hawaii_pfp.bin");
-MODULE_FIRMWARE("radeon/hawaii_me.bin");
-MODULE_FIRMWARE("radeon/hawaii_ce.bin");
-MODULE_FIRMWARE("radeon/hawaii_rlc.bin");
-MODULE_FIRMWARE("radeon/hawaii_mec.bin");
-
-MODULE_FIRMWARE("radeon/kaveri_pfp.bin");
-MODULE_FIRMWARE("radeon/kaveri_me.bin");
-MODULE_FIRMWARE("radeon/kaveri_ce.bin");
-MODULE_FIRMWARE("radeon/kaveri_rlc.bin");
-MODULE_FIRMWARE("radeon/kaveri_mec.bin");
-MODULE_FIRMWARE("radeon/kaveri_mec2.bin");
-
-MODULE_FIRMWARE("radeon/kabini_pfp.bin");
-MODULE_FIRMWARE("radeon/kabini_me.bin");
-MODULE_FIRMWARE("radeon/kabini_ce.bin");
-MODULE_FIRMWARE("radeon/kabini_rlc.bin");
-MODULE_FIRMWARE("radeon/kabini_mec.bin");
-
-MODULE_FIRMWARE("radeon/mullins_pfp.bin");
-MODULE_FIRMWARE("radeon/mullins_me.bin");
-MODULE_FIRMWARE("radeon/mullins_ce.bin");
-MODULE_FIRMWARE("radeon/mullins_rlc.bin");
-MODULE_FIRMWARE("radeon/mullins_mec.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_pfp.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_me.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_ce.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_rlc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_mec.bin");
+
+MODULE_FIRMWARE("amdgpu/hawaii_pfp.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_me.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_ce.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_rlc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_mec.bin");
+
+MODULE_FIRMWARE("amdgpu/kaveri_pfp.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_me.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_ce.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_rlc.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_mec.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_mec2.bin");
+
+MODULE_FIRMWARE("amdgpu/kabini_pfp.bin");
+MODULE_FIRMWARE("amdgpu/kabini_me.bin");
+MODULE_FIRMWARE("amdgpu/kabini_ce.bin");
+MODULE_FIRMWARE("amdgpu/kabini_rlc.bin");
+MODULE_FIRMWARE("amdgpu/kabini_mec.bin");
+
+MODULE_FIRMWARE("amdgpu/mullins_pfp.bin");
+MODULE_FIRMWARE("amdgpu/mullins_me.bin");
+MODULE_FIRMWARE("amdgpu/mullins_ce.bin");
+MODULE_FIRMWARE("amdgpu/mullins_rlc.bin");
+MODULE_FIRMWARE("amdgpu/mullins_mec.bin");
 
  static const struct amdgpu_gds_reg_offset amdgpu_gds_reg_offset[] =
  {
@@ -925,7 +925,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
  	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);
  	if (err)
  		goto out;
@@ -933,7 +933,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
  	if (err)
  		goto out;
 
-	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);
  	if (err)
  		goto out;
@@ -941,7 +941,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
  	if (err)
  		goto out;
 
-	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);
  	if (err)
  		goto out;
@@ -949,7 +949,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
  	if (err)
  		goto out;
 
-	snprintf(fw_name, sizeof(fw_name), "radeon/%s_mec.bin", chip_name);
+	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec.bin", chip_name);
  	err = request_firmware(&adev->gfx.mec_fw, fw_name, adev->dev);
  	if (err)
  		goto out;
@@ -958,7 +958,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
  		goto out;
 
  	if (adev->asic_type == CHIP_KAVERI) {
-		snprintf(fw_name, sizeof(fw_name), "radeon/%s_mec2.bin", chip_name);
+		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec2.bin", chip_name);
  		err = request_firmware(&adev->gfx.mec2_fw, fw_name, adev->dev);
  		if (err)
  			goto out;
@@ -967,7 +967,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
  			goto out;
  	}
 
-	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);
  	if (err)
  		goto out;
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +2 -2
index 7147bfe25a23..2c2b93d4d63b 100644
@@ -47,8 +47,8 @@ static void gmc_v7_0_set_gmc_funcs(struct amdgpu_device *adev);
  static void gmc_v7_0_set_irq_funcs(struct amdgpu_device *adev);
  static int gmc_v7_0_wait_for_idle(void *handle);
 
-MODULE_FIRMWARE("radeon/bonaire_mc.bin");
-MODULE_FIRMWARE("radeon/hawaii_mc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_mc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_mc.bin");
  MODULE_FIRMWARE("amdgpu/topaz_mc.bin");
 
  static const u32 golden_settings_iceland_a11[] =

drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c static int gmc_v7_0_init_microcode(struct amdgpu_device *adev) · line 156

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +1 -1
@@ -150,7 +150,7 @@ static int gmc_v7_0_init_microcode(struct amdgpu_device *adev)
  	if (adev->asic_type == CHIP_TOPAZ)
  		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name);
  	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);
  	if (err)

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): [email protected]

#12 lore raw

The patch sounds reasonable.

My concern is : should the patches need to coordinate with the change of installation script (or maybe the FW .deb package)which install relative FW to amdgpu patch?

Thanks
JimQu

________________________________________
发件人: amd-gfx <[email protected]> 代表 Zhang, Jerry (Junwei) <[email protected]> 发送时间: 2018年7月3日 10:05:37
收件人: Alex Deucher; [email protected]
抄送: Deucher, Alexander
主题: Re: [PATCH 1/2] drm/amdgpu: switch firmware path for CIK parts

Quoted 2 lines · Alex Deucher

Use separate firmware path for amdgpu to avoid conflicts with radeon on CIK parts.

Does that means firmware will be separated from radeon driver regardless of whether they are same? In another word, amdgpu/CIK-fw is likely to be identical to radeon/CIK-fw.

Jerry

Quoted 293 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c |  8 ++--
  drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 10 ++---
  drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 10 ++---
  drivers/gpu/drm/amd/amdgpu/ci_dpm.c     | 10 ++---
  drivers/gpu/drm/amd/amdgpu/cik_sdma.c   | 24 +++++------
  drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c   | 72 ++++++++++++++++-----------------
  drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c   |  6 +--
  7 files changed, 70 insertions(+), 70 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +4 -4
index e950730f1933..693ec5ea4950 100644
@@ -314,17 +314,17 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
                                      (adev->pdev->revision == 0x81) ||
                                      (adev->pdev->device == 0x665f)) {
                                      info->is_kicker = true;
-                                     strcpy(fw_name, "radeon/bonaire_k_smc.bin");
+                                     strcpy(fw_name, "amdgpu/bonaire_k_smc.bin");
                              } else {
-                                     strcpy(fw_name, "radeon/bonaire_smc.bin");
+                                     strcpy(fw_name, "amdgpu/bonaire_smc.bin");
                              }
                              break;
                      case CHIP_HAWAII:
                              if (adev->pdev->revision == 0x80) {
                                      info->is_kicker = true;
-                                     strcpy(fw_name, "radeon/hawaii_k_smc.bin");
+                                     strcpy(fw_name, "amdgpu/hawaii_k_smc.bin");
                              } else {
-                                     strcpy(fw_name, "radeon/hawaii_smc.bin");
+                                     strcpy(fw_name, "amdgpu/hawaii_smc.bin");
                              }
                              break;
                      case CHIP_TOPAZ:
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +5 -5
index 0b46ea1c6290..3e70eb61a960 100644
@@ -53,11 +53,11 @@
 
  /* Firmware Names */
  #ifdef CONFIG_DRM_AMDGPU_CIK
-#define FIRMWARE_BONAIRE     "radeon/bonaire_uvd.bin"
-#define FIRMWARE_KABINI      "radeon/kabini_uvd.bin"
-#define FIRMWARE_KAVERI      "radeon/kaveri_uvd.bin"
-#define FIRMWARE_HAWAII      "radeon/hawaii_uvd.bin"
-#define FIRMWARE_MULLINS     "radeon/mullins_uvd.bin"
+#define FIRMWARE_BONAIRE     "amdgpu/bonaire_uvd.bin"
+#define FIRMWARE_KABINI      "amdgpu/kabini_uvd.bin"
+#define FIRMWARE_KAVERI      "amdgpu/kaveri_uvd.bin"
+#define FIRMWARE_HAWAII      "amdgpu/hawaii_uvd.bin"
+#define FIRMWARE_MULLINS     "amdgpu/mullins_uvd.bin"
  #endif
  #define FIRMWARE_TONGA              "amdgpu/tonga_uvd.bin"
  #define FIRMWARE_CARRIZO    "amdgpu/carrizo_uvd.bin"
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +5 -5
index b0dcdfd85f5b..6ae1ad7e83b3 100644
@@ -40,11 +40,11 @@
 
  /* Firmware Names */
  #ifdef CONFIG_DRM_AMDGPU_CIK
-#define FIRMWARE_BONAIRE     "radeon/bonaire_vce.bin"
-#define FIRMWARE_KABINI      "radeon/kabini_vce.bin"
-#define FIRMWARE_KAVERI      "radeon/kaveri_vce.bin"
-#define FIRMWARE_HAWAII      "radeon/hawaii_vce.bin"
-#define FIRMWARE_MULLINS     "radeon/mullins_vce.bin"
+#define FIRMWARE_BONAIRE     "amdgpu/bonaire_vce.bin"
+#define FIRMWARE_KABINI      "amdgpu/kabini_vce.bin"
+#define FIRMWARE_KAVERI      "amdgpu/kaveri_vce.bin"
+#define FIRMWARE_HAWAII      "amdgpu/hawaii_vce.bin"
+#define FIRMWARE_MULLINS     "amdgpu/mullins_vce.bin"
  #endif
  #define FIRMWARE_TONGA              "amdgpu/tonga_vce.bin"
  #define FIRMWARE_CARRIZO    "amdgpu/carrizo_vce.bin"
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +5 -5
index 079a5fc9b593..d2469453dca2 100644
@@ -49,10 +49,10 @@
  #include "gmc/gmc_7_1_d.h"
  #include "gmc/gmc_7_1_sh_mask.h"
 
-MODULE_FIRMWARE("radeon/bonaire_smc.bin");
-MODULE_FIRMWARE("radeon/bonaire_k_smc.bin");
-MODULE_FIRMWARE("radeon/hawaii_smc.bin");
-MODULE_FIRMWARE("radeon/hawaii_k_smc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_smc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_k_smc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_smc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_k_smc.bin");
 
  #define MC_CG_ARB_FREQ_F0           0x0a
  #define MC_CG_ARB_FREQ_F1           0x0b
@@ -5815,7 +5815,7 @@ static int ci_dpm_init_microcode(struct amdgpu_device *adev)
      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);
      if (err)
              goto out;
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +12 -12
index dbd553a8d584..d0fa2aac2388 100644
@@ -54,16 +54,16 @@ static void cik_sdma_set_buffer_funcs(struct amdgpu_device *adev);
  static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev);
  static int cik_sdma_soft_reset(void *handle);
 
-MODULE_FIRMWARE("radeon/bonaire_sdma.bin");
-MODULE_FIRMWARE("radeon/bonaire_sdma1.bin");
-MODULE_FIRMWARE("radeon/hawaii_sdma.bin");
-MODULE_FIRMWARE("radeon/hawaii_sdma1.bin");
-MODULE_FIRMWARE("radeon/kaveri_sdma.bin");
-MODULE_FIRMWARE("radeon/kaveri_sdma1.bin");
-MODULE_FIRMWARE("radeon/kabini_sdma.bin");
-MODULE_FIRMWARE("radeon/kabini_sdma1.bin");
-MODULE_FIRMWARE("radeon/mullins_sdma.bin");
-MODULE_FIRMWARE("radeon/mullins_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_sdma.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_sdma.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_sdma.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/kabini_sdma.bin");
+MODULE_FIRMWARE("amdgpu/kabini_sdma1.bin");
+MODULE_FIRMWARE("amdgpu/mullins_sdma.bin");
+MODULE_FIRMWARE("amdgpu/mullins_sdma1.bin");
 
  u32 amdgpu_cik_gpu_check_soft_reset(struct amdgpu_device *adev);
 
@@ -132,9 +132,9 @@ static int cik_sdma_init_microcode(struct amdgpu_device *adev)
 
      for (i = 0; i < adev->sdma.num_instances; i++) {
              if (i == 0)
-                     snprintf(fw_name, sizeof(fw_name), "radeon/%s_sdma.bin", chip_name);
+                     snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma.bin", chip_name);
              else
-                     snprintf(fw_name, sizeof(fw_name), "radeon/%s_sdma1.bin", chip_name);
+                     snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma1.bin", chip_name);
              err = request_firmware(&adev->sdma.instance[i].fw, fw_name, adev->dev);
              if (err)
                      goto out;
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +36 -36
index 42b6144c1fd5..95452c5a9df6 100644
@@ -57,36 +57,36 @@ static void gfx_v7_0_set_ring_funcs(struct amdgpu_device *adev);
  static void gfx_v7_0_set_irq_funcs(struct amdgpu_device *adev);
  static void gfx_v7_0_set_gds_init(struct amdgpu_device *adev);
 
-MODULE_FIRMWARE("radeon/bonaire_pfp.bin");
-MODULE_FIRMWARE("radeon/bonaire_me.bin");
-MODULE_FIRMWARE("radeon/bonaire_ce.bin");
-MODULE_FIRMWARE("radeon/bonaire_rlc.bin");
-MODULE_FIRMWARE("radeon/bonaire_mec.bin");
-
-MODULE_FIRMWARE("radeon/hawaii_pfp.bin");
-MODULE_FIRMWARE("radeon/hawaii_me.bin");
-MODULE_FIRMWARE("radeon/hawaii_ce.bin");
-MODULE_FIRMWARE("radeon/hawaii_rlc.bin");
-MODULE_FIRMWARE("radeon/hawaii_mec.bin");
-
-MODULE_FIRMWARE("radeon/kaveri_pfp.bin");
-MODULE_FIRMWARE("radeon/kaveri_me.bin");
-MODULE_FIRMWARE("radeon/kaveri_ce.bin");
-MODULE_FIRMWARE("radeon/kaveri_rlc.bin");
-MODULE_FIRMWARE("radeon/kaveri_mec.bin");
-MODULE_FIRMWARE("radeon/kaveri_mec2.bin");
-
-MODULE_FIRMWARE("radeon/kabini_pfp.bin");
-MODULE_FIRMWARE("radeon/kabini_me.bin");
-MODULE_FIRMWARE("radeon/kabini_ce.bin");
-MODULE_FIRMWARE("radeon/kabini_rlc.bin");
-MODULE_FIRMWARE("radeon/kabini_mec.bin");
-
-MODULE_FIRMWARE("radeon/mullins_pfp.bin");
-MODULE_FIRMWARE("radeon/mullins_me.bin");
-MODULE_FIRMWARE("radeon/mullins_ce.bin");
-MODULE_FIRMWARE("radeon/mullins_rlc.bin");
-MODULE_FIRMWARE("radeon/mullins_mec.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_pfp.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_me.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_ce.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_rlc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_mec.bin");
+
+MODULE_FIRMWARE("amdgpu/hawaii_pfp.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_me.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_ce.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_rlc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_mec.bin");
+
+MODULE_FIRMWARE("amdgpu/kaveri_pfp.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_me.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_ce.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_rlc.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_mec.bin");
+MODULE_FIRMWARE("amdgpu/kaveri_mec2.bin");
+
+MODULE_FIRMWARE("amdgpu/kabini_pfp.bin");
+MODULE_FIRMWARE("amdgpu/kabini_me.bin");
+MODULE_FIRMWARE("amdgpu/kabini_ce.bin");
+MODULE_FIRMWARE("amdgpu/kabini_rlc.bin");
+MODULE_FIRMWARE("amdgpu/kabini_mec.bin");
+
+MODULE_FIRMWARE("amdgpu/mullins_pfp.bin");
+MODULE_FIRMWARE("amdgpu/mullins_me.bin");
+MODULE_FIRMWARE("amdgpu/mullins_ce.bin");
+MODULE_FIRMWARE("amdgpu/mullins_rlc.bin");
+MODULE_FIRMWARE("amdgpu/mullins_mec.bin");
 
  static const struct amdgpu_gds_reg_offset amdgpu_gds_reg_offset[] =
  {
@@ -925,7 +925,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
      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);
      if (err)
              goto out;
@@ -933,7 +933,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
      if (err)
              goto out;
 
-     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);
      if (err)
              goto out;
@@ -941,7 +941,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
      if (err)
              goto out;
 
-     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);
      if (err)
              goto out;
@@ -949,7 +949,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
      if (err)
              goto out;
 
-     snprintf(fw_name, sizeof(fw_name), "radeon/%s_mec.bin", chip_name);
+     snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec.bin", chip_name);
      err = request_firmware(&adev->gfx.mec_fw, fw_name, adev->dev);
      if (err)
              goto out;
@@ -958,7 +958,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
              goto out;
 
      if (adev->asic_type == CHIP_KAVERI) {
-             snprintf(fw_name, sizeof(fw_name), "radeon/%s_mec2.bin", chip_name);
+             snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec2.bin", chip_name);
              err = request_firmware(&adev->gfx.mec2_fw, fw_name, adev->dev);
              if (err)
                      goto out;
@@ -967,7 +967,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
                      goto out;
      }
 
-     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);
      if (err)
              goto out;
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +2 -2
index 7147bfe25a23..2c2b93d4d63b 100644
@@ -47,8 +47,8 @@ static void gmc_v7_0_set_gmc_funcs(struct amdgpu_device *adev);
  static void gmc_v7_0_set_irq_funcs(struct amdgpu_device *adev);
  static int gmc_v7_0_wait_for_idle(void *handle);
 
-MODULE_FIRMWARE("radeon/bonaire_mc.bin");
-MODULE_FIRMWARE("radeon/hawaii_mc.bin");
+MODULE_FIRMWARE("amdgpu/bonaire_mc.bin");
+MODULE_FIRMWARE("amdgpu/hawaii_mc.bin");
  MODULE_FIRMWARE("amdgpu/topaz_mc.bin");
 
  static const u32 golden_settings_iceland_a11[] =

drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c static int gmc_v7_0_init_microcode(struct amdgpu_device *adev) · line 156

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +1 -1
@@ -150,7 +150,7 @@ static int gmc_v7_0_init_microcode(struct amdgpu_device *adev)
      if (adev->asic_type == CHIP_TOPAZ)
              snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name);
      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);
      if (err)

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx