[PATCH 65/88] drm/amdgpu: switch to amdgpu folder for firmware files v2

From: Jammy Zhou Jammy.Zhou@amd.com

v2: keep using radeon folder for CIK

Signed-off-by: Jammy Zhou Jammy.Zhou@amd.com Reviewed-by: Christian König christian.koenig@amd.com --- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 4 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 +-- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 52 ++++++++++++++++---------------- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 6 ++-- drivers/gpu/drm/amd/amdgpu/iceland_dpm.c | 4 +-- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 ++--- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 12 ++++---- drivers/gpu/drm/amd/amdgpu/tonga_dpm.c | 4 +-- 8 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c index c03bce6..4b0be90 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c @@ -50,8 +50,8 @@ #define FIRMWARE_HAWAII "radeon/hawaii_uvd.bin" #define FIRMWARE_MULLINS "radeon/mullins_uvd.bin" #endif -#define FIRMWARE_TONGA "radeon/tonga_uvd.bin" -#define FIRMWARE_CARRIZO "radeon/carrizo_uvd.bin" +#define FIRMWARE_TONGA "amdgpu/tonga_uvd.bin" +#define FIRMWARE_CARRIZO "amdgpu/carrizo_uvd.bin"

/** * amdgpu_uvd_cs_ctx - Command submission parser context diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c index c65d93c..803ee60 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c @@ -46,8 +46,8 @@ #define FIRMWARE_HAWAII "radeon/hawaii_vce.bin" #define FIRMWARE_MULLINS "radeon/mullins_vce.bin" #endif -#define FIRMWARE_TONGA "radeon/tonga_vce.bin" -#define FIRMWARE_CARRIZO "radeon/carrizo_vce.bin" +#define FIRMWARE_TONGA "amdgpu/tonga_vce.bin" +#define FIRMWARE_CARRIZO "amdgpu/carrizo_vce.bin"

#ifdef CONFIG_DRM_AMDGPU_CIK MODULE_FIRMWARE(FIRMWARE_BONAIRE); diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c index 188a7ab..4597256 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c @@ -66,26 +66,26 @@ #define MACRO_TILE_ASPECT(x) ((x) << GB_MACROTILE_MODE0__MACRO_TILE_ASPECT__SHIFT) #define NUM_BANKS(x) ((x) << GB_MACROTILE_MODE0__NUM_BANKS__SHIFT)

-MODULE_FIRMWARE("radeon/carrizo_ce.bin"); -MODULE_FIRMWARE("radeon/carrizo_pfp.bin"); -MODULE_FIRMWARE("radeon/carrizo_me.bin"); -MODULE_FIRMWARE("radeon/carrizo_mec.bin"); -MODULE_FIRMWARE("radeon/carrizo_mec2.bin"); -MODULE_FIRMWARE("radeon/carrizo_rlc.bin"); - -MODULE_FIRMWARE("radeon/tonga_ce.bin"); -MODULE_FIRMWARE("radeon/tonga_pfp.bin"); -MODULE_FIRMWARE("radeon/tonga_me.bin"); -MODULE_FIRMWARE("radeon/tonga_mec.bin"); -MODULE_FIRMWARE("radeon/tonga_mec2.bin"); -MODULE_FIRMWARE("radeon/tonga_rlc.bin"); - -MODULE_FIRMWARE("radeon/topaz_ce.bin"); -MODULE_FIRMWARE("radeon/topaz_pfp.bin"); -MODULE_FIRMWARE("radeon/topaz_me.bin"); -MODULE_FIRMWARE("radeon/topaz_mec.bin"); -MODULE_FIRMWARE("radeon/topaz_mec2.bin"); -MODULE_FIRMWARE("radeon/topaz_rlc.bin"); +MODULE_FIRMWARE("amdgpu/carrizo_ce.bin"); +MODULE_FIRMWARE("amdgpu/carrizo_pfp.bin"); +MODULE_FIRMWARE("amdgpu/carrizo_me.bin"); +MODULE_FIRMWARE("amdgpu/carrizo_mec.bin"); +MODULE_FIRMWARE("amdgpu/carrizo_mec2.bin"); +MODULE_FIRMWARE("amdgpu/carrizo_rlc.bin"); + +MODULE_FIRMWARE("amdgpu/tonga_ce.bin"); +MODULE_FIRMWARE("amdgpu/tonga_pfp.bin"); +MODULE_FIRMWARE("amdgpu/tonga_me.bin"); +MODULE_FIRMWARE("amdgpu/tonga_mec.bin"); +MODULE_FIRMWARE("amdgpu/tonga_mec2.bin"); +MODULE_FIRMWARE("amdgpu/tonga_rlc.bin"); + +MODULE_FIRMWARE("amdgpu/topaz_ce.bin"); +MODULE_FIRMWARE("amdgpu/topaz_pfp.bin"); +MODULE_FIRMWARE("amdgpu/topaz_me.bin"); +MODULE_FIRMWARE("amdgpu/topaz_mec.bin"); +MODULE_FIRMWARE("amdgpu/topaz_mec2.bin"); +MODULE_FIRMWARE("amdgpu/topaz_rlc.bin");

static const struct amdgpu_gds_reg_offset amdgpu_gds_reg_offset[] = { @@ -597,7 +597,7 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev) 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; @@ -605,7 +605,7 @@ static int gfx_v8_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; @@ -613,7 +613,7 @@ static int gfx_v8_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; @@ -621,13 +621,13 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev) if (err) 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; err = amdgpu_ucode_validate(adev->gfx.rlc_fw);

- 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; @@ -635,7 +635,7 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev) if (err) goto out;

- 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) { err = amdgpu_ucode_validate(adev->gfx.mec2_fw); diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c index ac8cff8..7f6c52f 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c @@ -41,8 +41,8 @@ static void gmc_v8_0_set_gart_funcs(struct amdgpu_device *adev); static void gmc_v8_0_set_irq_funcs(struct amdgpu_device *adev);

-MODULE_FIRMWARE("radeon/topaz_mc.bin"); -MODULE_FIRMWARE("radeon/tonga_mc.bin"); +MODULE_FIRMWARE("amdgpu/topaz_mc.bin"); +MODULE_FIRMWARE("amdgpu/tonga_mc.bin");

static const u32 golden_settings_tonga_a11[] = { @@ -206,7 +206,7 @@ static int gmc_v8_0_init_microcode(struct amdgpu_device *adev) default: BUG(); }

- 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->mc.fw, fw_name, adev->dev); if (err) goto out; diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c b/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c index 8f5c54b..0688b88 100644 --- a/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c +++ b/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c @@ -26,7 +26,7 @@ #include "amdgpu.h" #include "iceland_smumgr.h"

-MODULE_FIRMWARE("radeon/topaz_smc.bin"); +MODULE_FIRMWARE("amdgpu/topaz_smc.bin");

static void iceland_dpm_set_funcs(struct amdgpu_device *adev);

@@ -39,7 +39,7 @@ static int iceland_dpm_early_init(struct amdgpu_device *adev)

static int iceland_dpm_init_microcode(struct amdgpu_device *adev) { - char fw_name[30] = "radeon/topaz_smc.bin"; + char fw_name[30] = "amdgpu/topaz_smc.bin"; int err;

err = request_firmware(&adev->pm.fw, fw_name, adev->dev); diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c index f1423a4..99b8b32 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c @@ -49,8 +49,8 @@ static void sdma_v2_4_set_buffer_funcs(struct amdgpu_device *adev); static void sdma_v2_4_set_vm_pte_funcs(struct amdgpu_device *adev); static void sdma_v2_4_set_irq_funcs(struct amdgpu_device *adev);

-MODULE_FIRMWARE("radeon/topaz_sdma.bin"); -MODULE_FIRMWARE("radeon/topaz_sdma1.bin"); +MODULE_FIRMWARE("amdgpu/topaz_sdma.bin"); +MODULE_FIRMWARE("amdgpu/topaz_sdma1.bin");

static const u32 sdma_offsets[SDMA_MAX_INSTANCE] = { @@ -133,9 +133,9 @@ static int sdma_v2_4_init_microcode(struct amdgpu_device *adev)

for (i = 0; i < SDMA_MAX_INSTANCE; 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[i].fw, fw_name, adev->dev); if (err) goto out; diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c index 7c4abff..86a5278 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c @@ -49,10 +49,10 @@ static void sdma_v3_0_set_buffer_funcs(struct amdgpu_device *adev); static void sdma_v3_0_set_vm_pte_funcs(struct amdgpu_device *adev); static void sdma_v3_0_set_irq_funcs(struct amdgpu_device *adev);

-MODULE_FIRMWARE("radeon/tonga_sdma.bin"); -MODULE_FIRMWARE("radeon/tonga_sdma1.bin"); -MODULE_FIRMWARE("radeon/carrizo_sdma.bin"); -MODULE_FIRMWARE("radeon/carrizo_sdma1.bin"); +MODULE_FIRMWARE("amdgpu/tonga_sdma.bin"); +MODULE_FIRMWARE("amdgpu/tonga_sdma1.bin"); +MODULE_FIRMWARE("amdgpu/carrizo_sdma.bin"); +MODULE_FIRMWARE("amdgpu/carrizo_sdma1.bin");

static const u32 sdma_offsets[SDMA_MAX_INSTANCE] = { @@ -174,9 +174,9 @@ static int sdma_v3_0_init_microcode(struct amdgpu_device *adev)

for (i = 0; i < SDMA_MAX_INSTANCE; 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[i].fw, fw_name, adev->dev); if (err) goto out; diff --git a/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c b/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c index 98bd707..cf97d49 100644 --- a/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c +++ b/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c @@ -26,7 +26,7 @@ #include "amdgpu.h" #include "tonga_smumgr.h"

-MODULE_FIRMWARE("radeon/tonga_smc.bin"); +MODULE_FIRMWARE("amdgpu/tonga_smc.bin");

static void tonga_dpm_set_funcs(struct amdgpu_device *adev);

@@ -39,7 +39,7 @@ static int tonga_dpm_early_init(struct amdgpu_device *adev)

static int tonga_dpm_init_microcode(struct amdgpu_device *adev) { - char fw_name[30] = "radeon/tonga_smc.bin"; + char fw_name[30] = "amdgpu/tonga_smc.bin"; int err;

err = request_firmware(&adev->pm.fw, fw_name, adev->dev);