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

Commit d60703ca authored by Ken Wang's avatar Ken Wang Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu: iceland use CI based MC IP 



commit 429c45deae6e57f1bb91bfb05b671063fb0cef60 upstream.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarKen Wang <Qingqing.Wang@amd.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 61d1fcfc

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

+9 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ static void gmc_v7_0_set_irq_funcs(struct amdgpu_device *adev); 


MODULE_FIRMWARE("radeon/bonaire_mc.bin");

MODULE_FIRMWARE("radeon/hawaii_mc.bin");

MODULE_FIRMWARE("amdgpu/topaz_mc.bin");



/**

 * gmc8_mc_wait_for_idle - wait for MC idle callback.
@@ -132,13 +133,20 @@ static int gmc_v7_0_init_microcode(struct amdgpu_device *adev) 
	case CHIP_HAWAII:

		chip_name = "hawaii";

		break;

	case CHIP_TOPAZ:

		chip_name = "topaz";

		break;

	case CHIP_KAVERI:

	case CHIP_KABINI:

		return 0;

	default: BUG();

	}



	if(adev->asic_type == CHIP_TOPAZ)

		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name);

	else

		snprintf(fw_name, sizeof(fw_name), "radeon/%s_mc.bin", chip_name);



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

	if (err)

		goto out;

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

+4 −3
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include "vi.h"

#include "vi_dpm.h"

#include "gmc_v8_0.h"

#include "gmc_v7_0.h"

#include "gfx_v8_0.h"

#include "sdma_v2_4.h"

#include "sdma_v3_0.h"
@@ -1128,10 +1129,10 @@ static const struct amdgpu_ip_block_version tonga_ip_blocks[] = 
	},

	{

		.type = AMD_IP_BLOCK_TYPE_GMC,

		.major = 8,

		.minor = 0,

		.major = 7,

		.minor = 4,

		.rev = 0,

		.funcs = &gmc_v8_0_ip_funcs,

		.funcs = &gmc_v7_0_ip_funcs,

	},

	{

		.type = AMD_IP_BLOCK_TYPE_IH,