Series is
Reviewed-by: Hawking Zhang <Hawking.Zhang@xxxxxxx>
Regards,
Hawking
Sent from my iPhone
> On Jun 25, 2020, at 06:52, Sheng, Wenhui <Wenhui.Sheng@xxxxxxx> wrote:
>
> From: Wenhui Sheng <Wenhui.Sheng@xxxxxxx>
>
> After we move request full access before set
> ip blocks, we can merge atombios init block
> of SRIOV and baremetal together.
>
> Signed-off-by: Wenhui Sheng <Wenhui.Sheng@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 23 +---------------------
> 1 file changed, 1 insertion(+), 22 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 138ace9c28d6..f40bc6b5be82 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -1723,26 +1723,9 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)
> amdgpu_device_enable_virtual_display(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) {
> - amdgpu_atombios_fini(adev);
> + if (r)
> return r;
> - }
> }
>
> switch (adev->asic_type) {
> @@ -1855,10 +1838,6 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)
> if (r)
> return r;
>
> - /* 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;
> --
> 2.17.1
>
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
