Commit bf71bde4 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-5.14-2021-08-11' of... 

Merge tag 'amd-drm-fixes-5.14-2021-08-11' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-5.14-2021-08-11:

amdgpu:
- Yellow carp update
- RAS EEPROM fixes
- BACO/BOCO fixes
- Fix a memory leak in an error path
- Freesync fix
- VCN harvesting fix
- Display fixes

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210812022153.4005-1-alexander.deucher@amd.com
parents 1648740b 0cde63a8

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

+40 −0
Original line number Diff line number Diff line
@@ -468,6 +468,46 @@ bool amdgpu_atomfirmware_dynamic_boot_config_supported(struct amdgpu_device *ade 
	return (fw_cap & ATOM_FIRMWARE_CAP_DYNAMIC_BOOT_CFG_ENABLE) ? true : false;

}



/*

 * Helper function to query RAS EEPROM address

 *

 * @adev: amdgpu_device pointer

 *

 * Return true if vbios supports ras rom address reporting

 */

bool amdgpu_atomfirmware_ras_rom_addr(struct amdgpu_device *adev, uint8_t* i2c_address)

{

	struct amdgpu_mode_info *mode_info = &adev->mode_info;

	int index;

	u16 data_offset, size;

	union firmware_info *firmware_info;

	u8 frev, crev;



	if (i2c_address == NULL)

		return false;



	*i2c_address = 0;



	index = get_index_into_master_table(atom_master_list_of_data_tables_v2_1,

			firmwareinfo);



	if (amdgpu_atom_parse_data_header(adev->mode_info.atom_context,

				index, &size, &frev, &crev, &data_offset)) {

		/* support firmware_info 3.4 + */

		if ((frev == 3 && crev >=4) || (frev > 3)) {

			firmware_info = (union firmware_info *)

				(mode_info->atom_context->bios + data_offset);

			*i2c_address = firmware_info->v34.ras_rom_i2c_slave_addr;

		}

	}



	if (*i2c_address != 0)

		return true;



	return false;

}





union smu_info {

	struct atom_smu_info_v3_1 v31;

};

drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ int amdgpu_atomfirmware_get_clock_info(struct amdgpu_device *adev); 
int amdgpu_atomfirmware_get_gfx_info(struct amdgpu_device *adev);

bool amdgpu_atomfirmware_mem_ecc_supported(struct amdgpu_device *adev);

bool amdgpu_atomfirmware_sram_ecc_supported(struct amdgpu_device *adev);

bool amdgpu_atomfirmware_ras_rom_addr(struct amdgpu_device *adev, uint8_t* i2c_address);

bool amdgpu_atomfirmware_mem_training_supported(struct amdgpu_device *adev);

bool amdgpu_atomfirmware_dynamic_boot_config_supported(struct amdgpu_device *adev);

int amdgpu_atomfirmware_get_fw_reserved_fb_size(struct amdgpu_device *adev);

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

+9 −3
Original line number Diff line number Diff line
@@ -299,6 +299,9 @@ int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev) 
				  ip->major, ip->minor,

				  ip->revision);



			if (le16_to_cpu(ip->hw_id) == VCN_HWID)

				adev->vcn.num_vcn_inst++;



			for (k = 0; k < num_base_address; k++) {

				/*

				 * convert the endianness of base addresses in place,
@@ -385,7 +388,7 @@ void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev) 
{

	struct binary_header *bhdr;

	struct harvest_table *harvest_info;

	int i;

	int i, vcn_harvest_count = 0;



	bhdr = (struct binary_header *)adev->mman.discovery_bin;

	harvest_info = (struct harvest_table *)(adev->mman.discovery_bin +
@@ -397,8 +400,7 @@ void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev) 


		switch (le32_to_cpu(harvest_info->list[i].hw_id)) {

		case VCN_HWID:

			adev->harvest_ip_mask |= AMD_HARVEST_IP_VCN_MASK;

			adev->harvest_ip_mask |= AMD_HARVEST_IP_JPEG_MASK;

			vcn_harvest_count++;

			break;

		case DMU_HWID:

			adev->harvest_ip_mask |= AMD_HARVEST_IP_DMU_MASK;
@@ -407,6 +409,10 @@ void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev) 
			break;

		}

	}

	if (vcn_harvest_count == adev->vcn.num_vcn_inst) {

		adev->harvest_ip_mask |= AMD_HARVEST_IP_VCN_MASK;

		adev->harvest_ip_mask |= AMD_HARVEST_IP_JPEG_MASK;

	}

}



int amdgpu_discovery_get_gfx_info(struct amdgpu_device *adev)

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

+2 −0
Original line number Diff line number Diff line
@@ -1571,6 +1571,8 @@ static int amdgpu_pmops_runtime_suspend(struct device *dev) 
		pci_ignore_hotplug(pdev);

		pci_set_power_state(pdev, PCI_D3cold);

		drm_dev->switch_power_state = DRM_SWITCH_POWER_DYNAMIC_OFF;

	} else if (amdgpu_device_supports_boco(drm_dev)) {

		/* nothing to do */

	} else if (amdgpu_device_supports_baco(drm_dev)) {

		amdgpu_device_baco_enter(drm_dev);

	}

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

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "amdgpu_ras.h"

#include <linux/bits.h>

#include "atom.h"

#include "amdgpu_atomfirmware.h"



#define EEPROM_I2C_TARGET_ADDR_VEGA20		0xA0

#define EEPROM_I2C_TARGET_ADDR_ARCTURUS		0xA8
@@ -96,6 +97,9 @@ static bool __get_eeprom_i2c_addr(struct amdgpu_device *adev, 
	if (!i2c_addr)

		return false;



	if (amdgpu_atomfirmware_ras_rom_addr(adev, (uint8_t*)i2c_addr))

		return true;



	switch (adev->asic_type) {

	case CHIP_VEGA20:

		*i2c_addr = EEPROM_I2C_TARGET_ADDR_VEGA20;