[PATCH 2/3] drm/amdgpu: Fix a printing message

[Alex Deucher]

On Wed, Jul 14, 2021 at 11:25 AM Oak Zeng <Oak.Zeng at 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 at 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 at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx