Commit 9ca1f474 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-5.8-2020-05-27' of git://people.freedesktop.org/~agd5f/linux into drm-next 



amd-drm-next-5.8-2020-05-27:

amdgpu:
- SRIOV fixes
- RAS fixes
- VCN 2.5 DPG (Dynamic PowerGating) fixes
- FP16 updates for display
- CTF cleanups
- Display fixes
- Fix pcie bw sysfs handling
- Enable resizeable BAR support for gmc 10.x
- GFXOFF fixes for Raven
- PM sysfs handling fixes

amdkfd:
- Fix a race condition
- Warning fixes

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200527231219.3930-1-alexander.deucher@amd.com
parents 5afeb97a 185082b6

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

+2 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ extern int amdgpu_gpu_recovery; 
extern int amdgpu_emu_mode;

extern uint amdgpu_smu_memory_pool_size;

extern uint amdgpu_dc_feature_mask;

extern uint amdgpu_dc_debug_mask;

extern uint amdgpu_dm_abm_level;

extern struct amdgpu_mgpu_info mgpu_info;

extern int amdgpu_ras_enable;
@@ -738,6 +739,7 @@ struct amdgpu_device { 
	uint32_t			rev_id;

	uint32_t			external_rev_id;

	unsigned long			flags;

	unsigned long			apu_flags;

	int				usec_timeout;

	const struct amdgpu_asic_funcs	*asic_funcs;

	bool				shutdown;

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

+3 −3
Original line number Diff line number Diff line
@@ -1302,15 +1302,15 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( 
		return -EBUSY;

	}



	/* No more MMU notifiers */

	amdgpu_mn_unregister(mem->bo);



	/* Make sure restore workers don't access the BO any more */

	bo_list_entry = &mem->validate_list;

	mutex_lock(&process_info->lock);

	list_del(&bo_list_entry->head);

	mutex_unlock(&process_info->lock);



	/* No more MMU notifiers */

	amdgpu_mn_unregister(mem->bo);



	ret = reserve_bo_and_cond_vms(mem, NULL, BO_VM_ALL, &ctx);

	if (unlikely(ret))

		return ret;

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

+9 −10
Original line number Diff line number Diff line
@@ -1567,9 +1567,9 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev) 
		chip_name = "vega12";

		break;

	case CHIP_RAVEN:

		if (adev->rev_id >= 8)

		if (adev->apu_flags & AMD_APU_IS_RAVEN2)

			chip_name = "raven2";

		else if (adev->pdev->device == 0x15d8)

		else if (adev->apu_flags & AMD_APU_IS_PICASSO)

			chip_name = "picasso";

		else

			chip_name = "raven";
@@ -1617,8 +1617,10 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev) 
			(const struct gpu_info_firmware_v1_0 *)(adev->firmware.gpu_info_fw->data +

								le32_to_cpu(hdr->header.ucode_array_offset_bytes));



		if (amdgpu_discovery && adev->asic_type >= CHIP_NAVI10)

		if (amdgpu_discovery && adev->asic_type >= CHIP_NAVI10) {

			amdgpu_discovery_get_gfx_info(adev);

			goto parse_soc_bounding_box;

		}



		adev->gfx.config.max_shader_engines = le32_to_cpu(gpu_info_fw->gc_num_se);

		adev->gfx.config.max_cu_per_sh = le32_to_cpu(gpu_info_fw->gc_num_cu_per_sh);
@@ -1764,13 +1766,6 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) 
		return -EINVAL;

	}



	r = amdgpu_device_parse_gpu_info_fw(adev);

	if (r)

		return r;



	if (amdgpu_discovery && adev->asic_type >= CHIP_NAVI10)

		amdgpu_discovery_get_gfx_info(adev);



	amdgpu_amdkfd_device_probe(adev);



	if (amdgpu_sriov_vf(adev)) {
@@ -1825,6 +1820,10 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) 
		}

		/* get the vbios after the asic_funcs are set up */

		if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_COMMON) {

			r = amdgpu_device_parse_gpu_info_fw(adev);

			if (r)

				return r;



			/* skip vbios handling for new handshake */

			if (amdgpu_sriov_vf(adev) && adev->virt.req_init_data_ver == 1)

				continue;

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

+2 −1
Original line number Diff line number Diff line
@@ -523,7 +523,8 @@ uint32_t amdgpu_display_supported_domains(struct amdgpu_device *adev, 
			break;

		case CHIP_RAVEN:

			/* enable S/G on PCO and RV2 */

			if (adev->rev_id >= 0x8 || adev->pdev->device == 0x15d8)

			if ((adev->apu_flags & AMD_APU_IS_RAVEN2) ||

			    (adev->apu_flags & AMD_APU_IS_PICASSO))

				domain |= AMDGPU_GEM_DOMAIN_GTT;

			break;

		default:

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

+1 −0
Original line number Diff line number Diff line
@@ -450,6 +450,7 @@ struct amdgpu_pm { 


	/* Used for I2C access to various EEPROMs on relevant ASICs */

	struct i2c_adapter smu_i2c;

	struct list_head	pm_attr_list;

};



#define R600_SSTU_DFLT                               0

CRA Git | Maintained and supported by SUSTech CRA and CCSE