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

Commit 39bdb328 authored by Alex Deucher's avatar Alex Deucher Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu/gmc8: update MC firmware for polaris 



commit a81a7c9c9ea3042ab02d66ac35def74abf091c15 upstream.

Some variants require different MC firmware images.

Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2abdfe24

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

+24 −5
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ MODULE_FIRMWARE("amdgpu/tonga_mc.bin"); 
MODULE_FIRMWARE("amdgpu/polaris11_mc.bin");

MODULE_FIRMWARE("amdgpu/polaris10_mc.bin");

MODULE_FIRMWARE("amdgpu/polaris12_mc.bin");

MODULE_FIRMWARE("amdgpu/polaris11_k_mc.bin");

MODULE_FIRMWARE("amdgpu/polaris10_k_mc.bin");

MODULE_FIRMWARE("amdgpu/polaris12_k_mc.bin");



static const u32 golden_settings_tonga_a11[] =
@@ -224,22 +226,39 @@ static int gmc_v8_0_init_microcode(struct amdgpu_device *adev) 
		chip_name = "tonga";

		break;

	case CHIP_POLARIS11:

		if (((adev->pdev->device == 0x67ef) &&

		     ((adev->pdev->revision == 0xe0) ||

		      (adev->pdev->revision == 0xe5))) ||

		    ((adev->pdev->device == 0x67ff) &&

		     ((adev->pdev->revision == 0xcf) ||

		      (adev->pdev->revision == 0xef) ||

		      (adev->pdev->revision == 0xff))))

			chip_name = "polaris11_k";

		else if ((adev->pdev->device == 0x67ef) &&

			 (adev->pdev->revision == 0xe2))

			chip_name = "polaris11_k";

		else

			chip_name = "polaris11";

		break;

	case CHIP_POLARIS10:

		if ((adev->pdev->device == 0x67df) &&

		    ((adev->pdev->revision == 0xe1) ||

		     (adev->pdev->revision == 0xf7)))

			chip_name = "polaris10_k";

		else

			chip_name = "polaris10";

		break;

	case CHIP_POLARIS12:

		chip_name = "polaris12";

		if (((adev->pdev->device == 0x6987) &&

		     ((adev->pdev->revision == 0xc0) ||

		      (adev->pdev->revision == 0xc3))) ||

		    ((adev->pdev->device == 0x6981) &&

		     ((adev->pdev->revision == 0x00) ||

		      (adev->pdev->revision == 0x01) ||

		      (adev->pdev->revision == 0x10)))) {

		      (adev->pdev->revision == 0x10))))

			chip_name = "polaris12_k";

		}

		else

			chip_name = "polaris12";

		break;

	case CHIP_FIJI:

	case CHIP_CARRIZO: