From: "Zhang, Hawking" <Hawking.Zhang@amd.com>
To: "Sheng, Wenhui" <Wenhui.Sheng@amd.com>
Cc: "amd-gfx@lists.freedesktop.org" <amd-gfx@lists.freedesktop.org>
Subject: Re: [PATCH 4/4] drm/amdgpu: merge atombios init block
Date: Thu, 25 Jun 2020 00:32:44 +0000 [thread overview]
Message-ID: <C65444DC-8CE3-4973-82E1-645569067121@amd.com> (raw)
In-Reply-To: <20200624225232.7616-4-Wenhui.Sheng@amd.com>
Series is
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Regards,
Hawking
Sent from my iPhone
> On Jun 25, 2020, at 06:52, Sheng, Wenhui <Wenhui.Sheng@amd.com> wrote:
>
> From: Wenhui Sheng <Wenhui.Sheng@amd.com>
>
> 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@amd.com>
> ---
> 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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2020-06-25 0:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-24 22:52 [PATCH 1/4] drm/amdgpu: request init data in virt detection Wenhui.Sheng
2020-06-24 22:52 ` [PATCH 2/4] drm/amdgpu: move reg base init forward for soc15 Wenhui.Sheng
2020-06-24 22:52 ` [PATCH 3/4] drm/amdgpu: invoke req full access early enough Wenhui.Sheng
2020-06-24 22:52 ` [PATCH 4/4] drm/amdgpu: merge atombios init block Wenhui.Sheng
2020-06-25 0:32 ` Zhang, Hawking [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-06-24 14:40 [PATCH 1/4] drm/amdgpu: request init data in virt detection Wenhui.Sheng
2020-06-24 14:40 ` [PATCH 4/4] drm/amdgpu: merge atombios init block Wenhui.Sheng
2020-06-24 14:42 ` Zhang, Hawking
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=C65444DC-8CE3-4973-82E1-645569067121@amd.com \
--to=hawking.zhang@amd.com \
--cc=Wenhui.Sheng@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).