Commit 122078de authored by Monk Liu's avatar Monk Liu Committed by Alex Deucher
Browse files

drm/amdgpu: equip new req_init_data handshake 



by this new handshake host side can prepare vbios/ip-discovery
and pf&vf exchange data upon recieving this request without
stopping world switch.

this way the world switch is less impacted by VF's exclusive mode
request

Signed-off-by: default avatarMonk Liu <Monk.Liu@amd.com>
Reviewed-by: default avatarEmily Deng <Emily.Deng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ff1f03a7

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

+19 −0
Original line number Diff line number Diff line
@@ -1798,6 +1798,21 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) 
	amdgpu_amdkfd_device_probe(adev);



	if (amdgpu_sriov_vf(adev)) {

		/* handle vbios stuff prior full access mode for new handshake */

		if (adev->virt.req_init_data_ver == 1) {

			if (!amdgpu_get_bios(adev)) {

				DRM_ERROR("failed to get vbios\n");

				return -EINVAL;

			}



			r = amdgpu_atombios_init(adev);

			if (r) {

				dev_err(adev->dev, "amdgpu_atombios_init failed\n");

				amdgpu_vf_error_put(adev, AMDGIM_ERROR_VF_ATOMBIOS_INIT_FAIL, 0, 0);

				return r;

			}

		}



		r = amdgpu_virt_request_full_gpu(adev, true);

		if (r)

			return -EAGAIN;
@@ -1830,6 +1845,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) {

			/* skip vbios handling for new handshake */

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

				continue;



			/* Read BIOS */

			if (!amdgpu_get_bios(adev))

				return -EINVAL;

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

+9 −6
Original line number Diff line number Diff line
@@ -457,16 +457,19 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) 
{

	int r;



	/* Set IP register base before any HW register access */

	r = nv_reg_base_init(adev);

	if (r)

		return r;



	adev->nbio.funcs = &nbio_v2_3_funcs;

	adev->nbio.hdp_flush_reg = &nbio_v2_3_hdp_flush_reg;



	if (amdgpu_sriov_vf(adev))

	if (amdgpu_sriov_vf(adev)) {

		adev->virt.ops = &xgpu_nv_virt_ops;

		/* try send GPU_INIT_DATA request to host */

		amdgpu_virt_request_init_data(adev);

	}



	/* Set IP register base before any HW register access */

	r = nv_reg_base_init(adev);

	if (r)

		return r;



	switch (adev->asic_type) {

	case CHIP_NAVI10:

CRA Git | Maintained and supported by SUSTech CRA and CCSE