Commit 861c7fde authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: load different smc firmware on some SI variants 



The power tables on some variants require different firmware.
This may fix stability issues on some newer SI parts.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2254c219

drivers/gpu/drm/radeon/si.c

+44 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ MODULE_FIRMWARE("radeon/tahiti_ce.bin"); 
MODULE_FIRMWARE("radeon/tahiti_mc.bin");

MODULE_FIRMWARE("radeon/tahiti_rlc.bin");

MODULE_FIRMWARE("radeon/tahiti_smc.bin");

MODULE_FIRMWARE("radeon/tahiti_k_smc.bin");



MODULE_FIRMWARE("radeon/PITCAIRN_pfp.bin");

MODULE_FIRMWARE("radeon/PITCAIRN_me.bin");
@@ -65,6 +66,7 @@ MODULE_FIRMWARE("radeon/pitcairn_ce.bin"); 
MODULE_FIRMWARE("radeon/pitcairn_mc.bin");

MODULE_FIRMWARE("radeon/pitcairn_rlc.bin");

MODULE_FIRMWARE("radeon/pitcairn_smc.bin");

MODULE_FIRMWARE("radeon/pitcairn_k_smc.bin");



MODULE_FIRMWARE("radeon/VERDE_pfp.bin");

MODULE_FIRMWARE("radeon/VERDE_me.bin");
@@ -80,6 +82,7 @@ MODULE_FIRMWARE("radeon/verde_ce.bin"); 
MODULE_FIRMWARE("radeon/verde_mc.bin");

MODULE_FIRMWARE("radeon/verde_rlc.bin");

MODULE_FIRMWARE("radeon/verde_smc.bin");

MODULE_FIRMWARE("radeon/verde_k_smc.bin");



MODULE_FIRMWARE("radeon/OLAND_pfp.bin");

MODULE_FIRMWARE("radeon/OLAND_me.bin");
@@ -95,6 +98,7 @@ MODULE_FIRMWARE("radeon/oland_ce.bin"); 
MODULE_FIRMWARE("radeon/oland_mc.bin");

MODULE_FIRMWARE("radeon/oland_rlc.bin");

MODULE_FIRMWARE("radeon/oland_smc.bin");

MODULE_FIRMWARE("radeon/oland_k_smc.bin");



MODULE_FIRMWARE("radeon/HAINAN_pfp.bin");

MODULE_FIRMWARE("radeon/HAINAN_me.bin");
@@ -110,6 +114,7 @@ MODULE_FIRMWARE("radeon/hainan_ce.bin"); 
MODULE_FIRMWARE("radeon/hainan_mc.bin");

MODULE_FIRMWARE("radeon/hainan_rlc.bin");

MODULE_FIRMWARE("radeon/hainan_smc.bin");

MODULE_FIRMWARE("radeon/hainan_k_smc.bin");



static u32 si_get_cu_active_bitmap(struct radeon_device *rdev, u32 se, u32 sh);

static void si_pcie_gen3_enable(struct radeon_device *rdev);
@@ -1653,12 +1658,16 @@ static int si_init_microcode(struct radeon_device *rdev) 
	char fw_name[30];

	int err;

	int new_fw = 0;

	bool new_smc = false;



	DRM_DEBUG("\n");



	switch (rdev->family) {

	case CHIP_TAHITI:

		chip_name = "TAHITI";

		/* XXX: figure out which Tahitis need the new ucode */

		if (0)

			new_smc = true;

		new_chip_name = "tahiti";

		pfp_req_size = SI_PFP_UCODE_SIZE * 4;

		me_req_size = SI_PM4_UCODE_SIZE * 4;
@@ -1670,6 +1679,13 @@ static int si_init_microcode(struct radeon_device *rdev) 
		break;

	case CHIP_PITCAIRN:

		chip_name = "PITCAIRN";

		if ((rdev->pdev->revision == 0x81) ||

		    (rdev->pdev->device == 0x6810) ||

		    (rdev->pdev->device == 0x6811) ||

		    (rdev->pdev->device == 0x6816) ||

		    (rdev->pdev->device == 0x6817) ||

		    (rdev->pdev->device == 0x6806))

			new_smc = true;

		new_chip_name = "pitcairn";

		pfp_req_size = SI_PFP_UCODE_SIZE * 4;

		me_req_size = SI_PM4_UCODE_SIZE * 4;
@@ -1681,6 +1697,16 @@ static int si_init_microcode(struct radeon_device *rdev) 
		break;

	case CHIP_VERDE:

		chip_name = "VERDE";

		if ((rdev->pdev->revision == 0x81) ||

		    (rdev->pdev->revision == 0x83) ||

		    (rdev->pdev->revision == 0x87) ||

		    (rdev->pdev->device == 0x6820) ||

		    (rdev->pdev->device == 0x6821) ||

		    (rdev->pdev->device == 0x6822) ||

		    (rdev->pdev->device == 0x6823) ||

		    (rdev->pdev->device == 0x682A) ||

		    (rdev->pdev->device == 0x682B))

			new_smc = true;

		new_chip_name = "verde";

		pfp_req_size = SI_PFP_UCODE_SIZE * 4;

		me_req_size = SI_PM4_UCODE_SIZE * 4;
@@ -1692,6 +1718,13 @@ static int si_init_microcode(struct radeon_device *rdev) 
		break;

	case CHIP_OLAND:

		chip_name = "OLAND";

		if ((rdev->pdev->revision == 0xC7) ||

		    (rdev->pdev->revision == 0x80) ||

		    (rdev->pdev->revision == 0x81) ||

		    (rdev->pdev->revision == 0x83) ||

		    (rdev->pdev->device == 0x6604) ||

		    (rdev->pdev->device == 0x6605))

			new_smc = true;

		new_chip_name = "oland";

		pfp_req_size = SI_PFP_UCODE_SIZE * 4;

		me_req_size = SI_PM4_UCODE_SIZE * 4;
@@ -1702,6 +1735,13 @@ static int si_init_microcode(struct radeon_device *rdev) 
		break;

	case CHIP_HAINAN:

		chip_name = "HAINAN";

		if ((rdev->pdev->revision == 0x81) ||

		    (rdev->pdev->revision == 0x83) ||

		    (rdev->pdev->revision == 0xC3) ||

		    (rdev->pdev->device == 0x6664) ||

		    (rdev->pdev->device == 0x6665) ||

		    (rdev->pdev->device == 0x6667))

			new_smc = true;

		new_chip_name = "hainan";

		pfp_req_size = SI_PFP_UCODE_SIZE * 4;

		me_req_size = SI_PM4_UCODE_SIZE * 4;
@@ -1847,6 +1887,9 @@ static int si_init_microcode(struct radeon_device *rdev) 
		}

	}



	if (new_smc)

		snprintf(fw_name, sizeof(fw_name), "radeon/%s_k_smc.bin", new_chip_name);

	else

		snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", new_chip_name);

	err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);

	if (err) {