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

Commit 8878d854 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: drop topaz support from gmc8 module 



topaz is actually gmc7.

Reviewed-by: default avatarKen Wang <Qingqing.Wang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 72b459c8

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

+1 −27
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
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("amdgpu/topaz_mc.bin");

MODULE_FIRMWARE("amdgpu/tonga_mc.bin");



static const u32 golden_settings_tonga_a11[] =
@@ -74,19 +73,6 @@ static const u32 fiji_mgcg_cgcg_init[] = 
	mmMC_MEM_POWER_LS, 0xffffffff, 0x00000104

};



static const u32 golden_settings_iceland_a11[] =

{

	mmVM_PRT_APERTURE0_LOW_ADDR, 0x0fffffff, 0x0fffffff,

	mmVM_PRT_APERTURE1_LOW_ADDR, 0x0fffffff, 0x0fffffff,

	mmVM_PRT_APERTURE2_LOW_ADDR, 0x0fffffff, 0x0fffffff,

	mmVM_PRT_APERTURE3_LOW_ADDR, 0x0fffffff, 0x0fffffff

};



static const u32 iceland_mgcg_cgcg_init[] =

{

	mmMC_MEM_POWER_LS, 0xffffffff, 0x00000104

};



static const u32 cz_mgcg_cgcg_init[] =

{

	mmMC_MEM_POWER_LS, 0xffffffff, 0x00000104
@@ -101,14 +87,6 @@ static const u32 stoney_mgcg_cgcg_init[] = 
static void gmc_v8_0_init_golden_registers(struct amdgpu_device *adev)

{

	switch (adev->asic_type) {

	case CHIP_TOPAZ:

		amdgpu_program_register_sequence(adev,

						 iceland_mgcg_cgcg_init,

						 (const u32)ARRAY_SIZE(iceland_mgcg_cgcg_init));

		amdgpu_program_register_sequence(adev,

						 golden_settings_iceland_a11,

						 (const u32)ARRAY_SIZE(golden_settings_iceland_a11));

		break;

	case CHIP_FIJI:

		amdgpu_program_register_sequence(adev,

						 fiji_mgcg_cgcg_init,
@@ -228,9 +206,6 @@ static int gmc_v8_0_init_microcode(struct amdgpu_device *adev) 
	DRM_DEBUG("\n");



	switch (adev->asic_type) {

	case CHIP_TOPAZ:

		chip_name = "topaz";

		break;

	case CHIP_TONGA:

		chip_name = "tonga";

		break;
@@ -1004,8 +979,7 @@ static int gmc_v8_0_hw_init(void *handle) 


	gmc_v8_0_mc_program(adev);



	if ((adev->asic_type == CHIP_TOPAZ) ||

	    (adev->asic_type == CHIP_TONGA)) {

	if (adev->asic_type == CHIP_TONGA) {

		r = gmc_v8_0_mc_load_microcode(adev);

		if (r) {

			DRM_ERROR("Failed to load MC firmware!\n");