Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c65444fe authored by Jammy Zhou's avatar Jammy Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: switch to amdgpu folder for firmware files v2 



v2: keep using radeon folder for CIK

Signed-off-by: default avatarJammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
parent 4b095304

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

+2 −2
Original line number Diff line number Diff line
@@ -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

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

+2 −2
Original line number Diff line number Diff line
@@ -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);

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

+26 −26
Original line number Diff line number Diff line
@@ -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);

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

+3 −3
Original line number Diff line number Diff line
@@ -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;

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

+2 −2
Original line number Diff line number Diff line
@@ -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);