[AMD Official Use Only - Internal Distribution Only] Series Reviewed-by: Emily Deng <[email protected]>
>-----Original Message----- >From: amd-gfx <[email protected]> On Behalf Of Monk Liu >Sent: Wednesday, March 25, 2020 11:59 AM >To: [email protected] >Cc: Liu, Monk <[email protected]> >Subject: [PATCH 7/7] drm/amdgpu: postpone entering fullaccess mode > >if host support new handshake we only need to enter fullaccess_mode in >ip_init() >part, otherwise we need to do it before reading vbios (becuase host prepares >vbios for VF only after received REQ_GPU_INIT event under legacy handshake) > >Signed-off-by: Monk Liu <[email protected]> >--- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > >diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >index 724ad84..b61161a 100644 >--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >@@ -1814,10 +1814,14 @@ static int amdgpu_device_ip_early_init(struct >amdgpu_device *adev) > return r; > } > } >+ } > >+ /* we need to send REQ_GPU here for legacy handshaker otherwise the >vbios >+ * will not be prepared by host for this VF */ >+ if (amdgpu_sriov_vf(adev) && adev->virt.req_init_data_ver < 1) { > r = amdgpu_virt_request_full_gpu(adev, true); > if (r) >- return -EAGAIN; >+ return r; > } > > adev->pm.pp_feature = amdgpu_pp_feature_mask; @@ -1977,6 >+1981,12 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) > if (r) > return r; > >+ if (amdgpu_sriov_vf(adev) && adev->virt.req_init_data_ver > 0) { >+ r = amdgpu_virt_request_full_gpu(adev, true); >+ if (r) >+ return -EAGAIN; >+ } >+ > for (i = 0; i < adev->num_ip_blocks; i++) { > if (!adev->ip_blocks[i].status.valid) > continue; >-- >2.7.4 > >_______________________________________________ >amd-gfx mailing list >[email protected] >https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.free >desktop.org%2Fmailman%2Flistinfo%2Famd- >gfx&data=02%7C01%7CEmily.Deng%40amd.com%7C800016a97d6d499de >adb08d7d070d87f%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C6 >37207055405387207&sdata=J0nRbxV4lfqMe3XLszU7gIGpnookLgz9DaRJ4P >WHRhg%3D&reserved=0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
