Commit adf64e21 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd: Avoid reading the VBIOS part number twice 



The VBIOS part number is read both in amdgpu_atom_parse() as well
as in atom_get_vbios_pn() and stored twice in the `struct atom_context`
structure. Remove the first unnecessary read and move the `pr_info`
line from that read into the second.

v2: squash in unused variable removal

Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 18cf073f

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

+1 −1
Original line number Diff line number Diff line
@@ -1776,7 +1776,7 @@ static ssize_t amdgpu_atombios_get_vbios_version(struct device *dev, 
	struct amdgpu_device *adev = drm_to_adev(ddev);

	struct atom_context *ctx = adev->mode_info.atom_context;



	return sysfs_emit(buf, "%s\n", ctx->vbios_version);

	return sysfs_emit(buf, "%s\n", ctx->vbios_pn);

}



static DEVICE_ATTR(vbios_version, 0444, amdgpu_atombios_get_vbios_version,

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

+10 −10
Original line number Diff line number Diff line
@@ -60,10 +60,10 @@ static bool is_fru_eeprom_supported(struct amdgpu_device *adev, u32 *fru_addr) 
	switch (adev->asic_type) {

	case CHIP_VEGA20:

		/* D161 and D163 are the VG20 server SKUs */

		if (strnstr(atom_ctx->vbios_version, "D161",

			    sizeof(atom_ctx->vbios_version)) ||

		    strnstr(atom_ctx->vbios_version, "D163",

			    sizeof(atom_ctx->vbios_version))) {

		if (strnstr(atom_ctx->vbios_pn, "D161",

			    sizeof(atom_ctx->vbios_pn)) ||

		    strnstr(atom_ctx->vbios_pn, "D163",

			    sizeof(atom_ctx->vbios_pn))) {

			if (fru_addr)

				*fru_addr = FRU_EEPROM_MADDR_6;

			return true;
@@ -72,16 +72,16 @@ static bool is_fru_eeprom_supported(struct amdgpu_device *adev, u32 *fru_addr) 
		}

	case CHIP_ALDEBARAN:

		/* All Aldebaran SKUs have an FRU */

		if (!strnstr(atom_ctx->vbios_version, "D673",

			     sizeof(atom_ctx->vbios_version)))

		if (!strnstr(atom_ctx->vbios_pn, "D673",

			     sizeof(atom_ctx->vbios_pn)))

			if (fru_addr)

				*fru_addr = FRU_EEPROM_MADDR_6;

		return true;

	case CHIP_SIENNA_CICHLID:

		if (strnstr(atom_ctx->vbios_version, "D603",

			    sizeof(atom_ctx->vbios_version))) {

			if (strnstr(atom_ctx->vbios_version, "D603GLXE",

				    sizeof(atom_ctx->vbios_version))) {

		if (strnstr(atom_ctx->vbios_pn, "D603",

			    sizeof(atom_ctx->vbios_pn))) {

			if (strnstr(atom_ctx->vbios_pn, "D603GLXE",

				    sizeof(atom_ctx->vbios_pn))) {

				return false;

			} else {

				if (fru_addr)

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

+1 −1
Original line number Diff line number Diff line
@@ -1722,7 +1722,7 @@ static int amdgpu_debugfs_firmware_info_show(struct seq_file *m, void *unused) 
	seq_printf(m, "MES feature version: %u, firmware version: 0x%08x\n",

		   fw_info.feature, fw_info.ver);



	seq_printf(m, "VBIOS version: %s\n", ctx->vbios_version);

	seq_printf(m, "VBIOS version: %s\n", ctx->vbios_pn);



	return 0;

}

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

+4 −4
Original line number Diff line number Diff line
@@ -2442,10 +2442,10 @@ static void amdgpu_ras_get_quirks(struct amdgpu_device *adev) 
	if (!ctx)

		return;



	if (strnstr(ctx->vbios_version, "D16406",

		    sizeof(ctx->vbios_version)) ||

		strnstr(ctx->vbios_version, "D36002",

			sizeof(ctx->vbios_version)))

	if (strnstr(ctx->vbios_pn, "D16406",

		    sizeof(ctx->vbios_pn)) ||

		strnstr(ctx->vbios_pn, "D36002",

			sizeof(ctx->vbios_pn)))

		adev->ras_hw_enabled |= (1 << AMDGPU_RAS_BLOCK__GFX);

}

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

+4 −4
Original line number Diff line number Diff line
@@ -194,9 +194,9 @@ static bool __get_eeprom_i2c_addr(struct amdgpu_device *adev, 
		/* VEGA20 and ARCTURUS */

		if (adev->asic_type == CHIP_VEGA20)

			control->i2c_address = EEPROM_I2C_MADDR_0;

		else if (strnstr(atom_ctx->vbios_version,

		else if (strnstr(atom_ctx->vbios_pn,

				 "D342",

				 sizeof(atom_ctx->vbios_version)))

				 sizeof(atom_ctx->vbios_pn)))

			control->i2c_address = EEPROM_I2C_MADDR_0;

		else

			control->i2c_address = EEPROM_I2C_MADDR_4;
@@ -205,8 +205,8 @@ static bool __get_eeprom_i2c_addr(struct amdgpu_device *adev, 
		control->i2c_address = EEPROM_I2C_MADDR_0;

		return true;

	case IP_VERSION(13, 0, 2):

		if (strnstr(atom_ctx->vbios_version, "D673",

			    sizeof(atom_ctx->vbios_version)))

		if (strnstr(atom_ctx->vbios_pn, "D673",

			    sizeof(atom_ctx->vbios_pn)))

			control->i2c_address = EEPROM_I2C_MADDR_4;

		else

			control->i2c_address = EEPROM_I2C_MADDR_0;