Commit a6bcffa5 authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: Add smu v13_0_14 ip block 



Add smu v13_0_14 ip block support

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarLe Ma <Le.Ma@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1dbd59f3

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

+3 −1
Original line number Diff line number Diff line
@@ -892,7 +892,9 @@ DEFINE_DEBUGFS_ATTRIBUTE(aca_debug_mode_fops, NULL, amdgpu_aca_smu_debug_mode_se 
void amdgpu_aca_smu_debugfs_init(struct amdgpu_device *adev, struct dentry *root)

{

#if defined(CONFIG_DEBUG_FS)

	if (!root || adev->ip_versions[MP1_HWIP][0] != IP_VERSION(13, 0, 6))

	if (!root ||

	    (adev->ip_versions[MP1_HWIP][0] != IP_VERSION(13, 0, 6) &&

	     adev->ip_versions[MP1_HWIP][0] != IP_VERSION(13, 0, 14)))

		return;



	debugfs_create_file("aca_debug_mode", 0200, root, adev, &aca_debug_mode_fops);

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

+1 −0
Original line number Diff line number Diff line
@@ -1910,6 +1910,7 @@ static int amdgpu_discovery_set_smu_ip_blocks(struct amdgpu_device *adev) 
	case IP_VERSION(13, 0, 8):

	case IP_VERSION(13, 0, 10):

	case IP_VERSION(13, 0, 11):

	case IP_VERSION(13, 0, 14):

		amdgpu_device_ip_block_add(adev, &smu_v13_0_ip_block);

		break;

	case IP_VERSION(14, 0, 0):

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

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ static bool is_fru_eeprom_supported(struct amdgpu_device *adev, u32 *fru_addr) 
				*fru_addr = FRU_EEPROM_MADDR_6;

		return true;

	case IP_VERSION(13, 0, 6):

	case IP_VERSION(13, 0, 14):

			if (fru_addr)

				*fru_addr = FRU_EEPROM_MADDR_8;

			return true;

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

+3 −1
Original line number Diff line number Diff line
@@ -609,7 +609,9 @@ DEFINE_DEBUGFS_ATTRIBUTE(mca_debug_mode_fops, NULL, amdgpu_mca_smu_debug_mode_se 
void amdgpu_mca_smu_debugfs_init(struct amdgpu_device *adev, struct dentry *root)

{

#if defined(CONFIG_DEBUG_FS)

	if (!root || amdgpu_ip_version(adev, MP1_HWIP, 0) != IP_VERSION(13, 0, 6))

	if (!root ||

	    (amdgpu_ip_version(adev, MP1_HWIP, 0) != IP_VERSION(13, 0, 6) &&

	     amdgpu_ip_version(adev, MP1_HWIP, 0) != IP_VERSION(13, 0, 14)))

		return;



	debugfs_create_file("mca_debug_mode", 0200, root, adev, &mca_debug_mode_fops);

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

+2 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ static bool __is_ras_eeprom_supported(struct amdgpu_device *adev) 
	case IP_VERSION(13, 0, 10):

		return true;

	case IP_VERSION(13, 0, 6):

	case IP_VERSION(13, 0, 14):

		return (adev->gmc.is_app_apu) ? false : true;

	default:

		return false;
@@ -222,6 +223,7 @@ static bool __get_eeprom_i2c_addr(struct amdgpu_device *adev, 
		return true;

	case IP_VERSION(13, 0, 6):

	case IP_VERSION(13, 0, 10):

	case IP_VERSION(13, 0, 14):

		control->i2c_address = EEPROM_I2C_MADDR_4;

		return true;

	default: