From: Alex Deucher <alexdeucher@gmail.com>
To: Oak Zeng <Oak.Zeng@amd.com>
Cc: Feifei Xu <feifei.xu@amd.com>,
"Kuehling, Felix" <Felix.Kuehling@amd.com>,
Leo Liu <leo.liu@amd.com>,
amd-gfx list <amd-gfx@lists.freedesktop.org>,
Hawking Zhang <hawking.zhang@amd.com>
Subject: Re: [PATCH 2/3] drm/amdgpu: Fix a printing message
Date: Wed, 14 Jul 2021 11:48:23 -0400 [thread overview]
Message-ID: <CADnq5_PE+K2eTtA7-RZqKuqc+8QhEm-v55Mbe8XdbhWeLevEwA@mail.gmail.com> (raw)
In-Reply-To: <1626276343-3552-3-git-send-email-Oak.Zeng@amd.com>
On Wed, Jul 14, 2021 at 11:25 AM Oak Zeng <Oak.Zeng@amd.com> wrote:
>
> The printing message "PSP loading VCN firmware" is mis-leading because
> people might think driver is loading VCN firmware. Actually when this
> message is printed, driver is just preparing some VCN ucode, not loading
> VCN firmware yet. The actual VCN firmware loading will be in the PSP block
> hw_init. Fix the printing message
>
> Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> index 284bb42..1f8e902 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> @@ -119,7 +119,7 @@ static int vcn_v1_0_sw_init(void *handle)
> adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw;
> adev->firmware.fw_size +=
> ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);
> - DRM_INFO("PSP loading VCN firmware\n");
> + DRM_INFO("VCN 1.0: Will use PSP to load VCN firmware\n");
> }
>
> r = amdgpu_vcn_resume(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> index 8af567c..ebe4f2b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> @@ -122,7 +122,7 @@ static int vcn_v2_0_sw_init(void *handle)
> adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw;
> adev->firmware.fw_size +=
> ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);
> - DRM_INFO("PSP loading VCN firmware\n");
> + DRM_INFO("VCN 2.0: Will use PSP to load VCN firmware\n");
While you are here, switch to dev_info() so we get the device
information in the output (in case we have multiple GPUs in a system).
Alex
> }
>
> r = amdgpu_vcn_resume(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> index 888b17d..5741504 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> @@ -152,7 +152,7 @@ static int vcn_v2_5_sw_init(void *handle)
> adev->firmware.fw_size +=
> ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);
> }
> - DRM_INFO("PSP loading VCN firmware\n");
> + DRM_INFO("VCN 2.5: Will use PSP to load VCN firmware\n");
> }
>
> r = amdgpu_vcn_resume(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> index c3580de..b81eae3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> @@ -158,7 +158,7 @@ static int vcn_v3_0_sw_init(void *handle)
> adev->firmware.fw_size +=
> ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);
> }
> - DRM_INFO("PSP loading VCN firmware\n");
> + DRM_INFO("VCN 3.0: Will use PSP to load VCN firmware\n");
> }
>
> r = amdgpu_vcn_resume(adev);
> --
> 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2021-07-14 15:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-14 15:25 [PATCH 0/3] MISC fixes Oak Zeng
2021-07-14 15:25 ` [PATCH 1/3] drm/amdkfd: Disallow debugfs to hang hws when GPU is resetting Oak Zeng
2021-07-14 16:04 ` Felix Kuehling
2021-07-14 15:25 ` [PATCH 2/3] drm/amdgpu: Fix a printing message Oak Zeng
2021-07-14 15:28 ` Christian König
2021-07-14 15:48 ` Alex Deucher [this message]
2021-07-15 2:51 ` Chen, Jiansong (Simon)
2021-07-15 2:54 ` Deucher, Alexander
2021-07-15 2:56 ` Chen, Jiansong (Simon)
2021-07-14 15:25 ` [PATCH 3/3] drm/amdgpu: Change a few function names Oak Zeng
2021-07-14 15:50 ` Alex Deucher
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=CADnq5_PE+K2eTtA7-RZqKuqc+8QhEm-v55Mbe8XdbhWeLevEwA@mail.gmail.com \
--to=alexdeucher@gmail.com \
--cc=Felix.Kuehling@amd.com \
--cc=Oak.Zeng@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=feifei.xu@amd.com \
--cc=hawking.zhang@amd.com \
--cc=leo.liu@amd.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.