RE: [PATCH] drm/amdgpu: drop some kernel messages in VCN code
[AMD Official Use Only - AMD Internal Distribution Only]
Acked-by: Leo Liu
> -Original Message-
> From: Wu, David
> Sent: Thursday, May 30, 2024 10:59 AM
> To: amd-gfx@lists.freedesktop.org; Koenig, Christian
>
> Cc: Deucher, Alexander ; Liu, Leo
> ; Jiang, Sonny ; Dong, Ruijing
>
> Subject: [PATCH] drm/amdgpu: drop some kernel messages in VCN code
>
> Similar to commit 15681da214b where some kernel log messages are dropped.
> With this commit, more log messages in older version of VCN/JPEG code are
> dropped.
>
> Signed-off-by: David (Ming Qiang) Wu
> ---
> drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 1 -
> drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 8 +---
> drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 3 ---
> drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 10 +-
> drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 3 ---
> drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 2 --
> drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 5 -
> drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c| 14 ++
> drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c| 14 +++---
> drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c| 11 ++-
> drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c| 16 +++-
> drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c| 14 ++
> drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 10 ++
> drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 10 +-
> 14 files changed, 17 insertions(+), 104 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c
> b/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c
> index 77595e9622da..71f43a5c7f72 100644
> --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c
> @@ -581,7 +581,6 @@ static const struct amdgpu_ring_funcs
> jpeg_v1_0_decode_ring_vm_funcs = { static void
> jpeg_v1_0_set_dec_ring_funcs(struct amdgpu_device *adev) {
> adev->jpeg.inst->ring_dec->funcs =
> _v1_0_decode_ring_vm_funcs;
> - DRM_INFO("JPEG decode is enabled in VM mode\n");
> }
>
> static const struct amdgpu_irq_src_funcs jpeg_v1_0_irq_funcs = { diff --git
> a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c
> b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c
> index ef3e42f6b841..99adf3625657 100644
> --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c
> @@ -131,16 +131,11 @@ static int jpeg_v2_0_hw_init(void *handle) {
> struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> struct amdgpu_ring *ring = adev->jpeg.inst->ring_dec;
> - int r;
>
> adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
> (adev->doorbell_index.vcn.vcn_ring0_1 << 1), 0);
>
> - r = amdgpu_ring_test_helper(ring);
> - if (!r)
> - DRM_INFO("JPEG decode initialized successfully.\n");
> -
> - return r;
> + return amdgpu_ring_test_helper(ring);
> }
>
> /**
> @@ -795,7 +790,6 @@ static const struct amdgpu_ring_funcs
> jpeg_v2_0_dec_ring_vm_funcs = { static void
> jpeg_v2_0_set_dec_ring_funcs(struct amdgpu_device *adev) {
> adev->jpeg.inst->ring_dec->funcs = _v2_0_dec_ring_vm_funcs;
> - DRM_INFO("JPEG decode is enabled in VM mode\n");
> }
>
> static const struct amdgpu_irq_src_funcs jpeg_v2_0_irq_funcs = { diff --git
> a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
> b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
> index afeaf3c64e27..d8ef95c847c2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
> +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
> @@ -196,8 +196,6 @@ static int jpeg_v2_5_hw_init(void *handle)
> return r;
> }
>
> - DRM_INFO("JPEG decode initialized successfully.\n");
> -
> return 0;
> }
>
> @@ -728,7 +726,6 @@ static void jpeg_v2_5_set_dec_ring_funcs(struct
> amdgpu_device *adev)
> else /* CHIP_ALDEBARAN */
> adev->jpeg.inst[i].ring_dec->funcs =
> _v2_6_dec_ring_vm_funcs;
> adev->jpeg.inst[i].ring_dec->me = i;
> - DRM_INFO("JPEG(%d) JPEG decode is enabled in VM mode\n",
> i);
> }
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
> b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
> index 1c7cf4800bf7..31cfa3ce6528 100644
> --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
> @@ -146,18 +146,11 @@ static int jpeg_v3_0_hw_init(void *handle) {
> struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> struct amdgpu_ring *ring = adev->jpeg.inst->ring_dec;
> - int r;
>
> adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
> (adev->doorbell_index.vcn.vcn_ring0_1 << 1), 0);
>
> - r = amdgpu_ring_test_helper(ring);
> - if (r)
> - return r;
> -
> - DRM_INFO("JPEG decode initialized successfully.\n");
> -
> - return 0;
> + return amdgpu_ring_test_helper(ring);
> }
>
> /**
> @@ -593,7 +586,6 @@ static const struct amdgpu_ring_funcs
> jpeg_v3_0_dec_ring_vm_funcs = { static void
>
Re: [PATCH] drm/amdgpu: drop some kernel messages in VCN code
Acked-by: Christian König
Thanks,
Christian.
Am 23.05.24 um 19:11 schrieb Jiang, Sonny:
[AMD Official Use Only - AMD Internal Distribution Only]
The patch is Reviewed-by: Sonny Jiang
Thanks,
Sonny
*From:* Dong, Ruijing
*Sent:* Thursday, May 23, 2024 12:58 PM
*To:* Wu, David ; amd-gfx@lists.freedesktop.org
; Koenig, Christian
*Cc:* Deucher, Alexander ; Liu, Leo
; Jiang, Sonny
*Subject:* RE: [PATCH] drm/amdgpu: drop some kernel messages in VCN code
[AMD Official Use Only - AMD Internal Distribution Only]
Thanks for the response, and it looks good to me.
Ruijing
-Original Message-
From: Wu, David
Sent: Thursday, May 23, 2024 12:55 PM
To: Dong, Ruijing ; Wu, David
; amd-gfx@lists.freedesktop.org; Koenig, Christian
Cc: Deucher, Alexander ; Liu, Leo
; Jiang, Sonny
Subject: Re: [PATCH] drm/amdgpu: drop some kernel messages in VCN code
please see in line.
On 2024-05-23 12:02, Dong, Ruijing wrote:
> [AMD Official Use Only - AMD Internal Distribution Only]
>
> Please see my question inline below.
>
> Thanks,
> Ruijing
>
> -Original Message-
> From: Wu, David
> Sent: Thursday, May 23, 2024 11:05 AM
> To: amd-gfx@lists.freedesktop.org; Koenig, Christian
>
> Cc: Deucher, Alexander ; Liu, Leo
> ; Jiang, Sonny ; Dong, Ruijing
>
> Subject: [PATCH] drm/amdgpu: drop some kernel messages in VCN code
>
> We have messages when the VCN fails to initialize and there is no
need to report on success.
> Also PSP loading FWs is the default for production.
>
> Signed-off-by: David (Ming Qiang) Wu
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 1 -
drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 3 ---
drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 10 +-
> 3 files changed, 1 insertion(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> index b89605b400c0..5e2b7c340724 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> @@ -1078,7 +1078,6 @@ void amdgpu_vcn_setup_ucode(struct
amdgpu_device *adev)
> IP_VERSION(4, 0, 3))
> break;
> }
> - dev_info(adev->dev, "Will use PSP to load VCN
firmware\n");
> }
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
> b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
> index 64c856bfe0cb..68ef29bc70e2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
> @@ -145,8 +145,6 @@ static int jpeg_v5_0_0_hw_init(void *handle)
> if (r)
> return r;
>
> - DRM_DEV_INFO(adev->dev, "JPEG decode initialized
successfully.\n");
> -
> return 0;
> }
>
> @@ -549,7 +547,6 @@ static const struct amdgpu_ring_funcs
jpeg_v5_0_0_dec_ring_vm_funcs = { static void
jpeg_v5_0_0_set_dec_ring_funcs(struct amdgpu_device *adev) {
> adev->jpeg.inst->ring_dec->funcs = _v5_0_0_dec_ring_vm_funcs;
> - DRM_DEV_INFO(adev->dev, "JPEG decode is enabled in VM mode\n");
> }
>
> static const struct amdgpu_irq_src_funcs jpeg_v5_0_0_irq_funcs = {
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> index 36d4ca645c56..070b56610c7d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> @@ -200,16 +200,10 @@ static int vcn_v5_0_0_hw_init(void *handle)
>
> r = amdgpu_ring_test_helper(ring);
> if (r)
> - goto done;
> + return r;
> }
> [Ruijing] Are we assuming the hw init process always be successful?
No - it could fail with errors and in this case the top level will
report error. Otherwise it will succeed(and no need to report
successful message).
David
> return 0;
> -done:
> - if (!r)
> - DRM_INFO("VCN decode and encode initialized
successfully(under %s).\n",
> - (adev->pg_flags &
AMD_PG_SUPPORT_VCN_DPG)?"DPG Mode":"SPG Mode");
> -
> - return r;
> }
>
> /**
> @@ -1122,8 +1116,6 @@ static void
> vcn_v5_0_0_set_unified_ring_funcs(struct amdgpu_device *adev)
>
> adev->vcn.inst[i].ring_enc[0].funcs = _v5_0_0_unified_ring_vm_funcs;
> adev->vcn.inst[i].ring_enc[0].me = i;
> -
> - DRM_INFO("VCN(%d) encode/decode are enabled in VM
mode\n", i);
> }
> }
>
> --
> 2.34.1
>
Re: [PATCH] drm/amdgpu: drop some kernel messages in VCN code
[AMD Official Use Only - AMD Internal Distribution Only]
The patch is Reviewed-by: Sonny Jiang
Thanks,
Sonny
From: Dong, Ruijing
Sent: Thursday, May 23, 2024 12:58 PM
To: Wu, David ; amd-gfx@lists.freedesktop.org
; Koenig, Christian
Cc: Deucher, Alexander ; Liu, Leo ;
Jiang, Sonny
Subject: RE: [PATCH] drm/amdgpu: drop some kernel messages in VCN code
[AMD Official Use Only - AMD Internal Distribution Only]
Thanks for the response, and it looks good to me.
Ruijing
-Original Message-
From: Wu, David
Sent: Thursday, May 23, 2024 12:55 PM
To: Dong, Ruijing ; Wu, David ;
amd-gfx@lists.freedesktop.org; Koenig, Christian
Cc: Deucher, Alexander ; Liu, Leo ;
Jiang, Sonny
Subject: Re: [PATCH] drm/amdgpu: drop some kernel messages in VCN code
please see in line.
On 2024-05-23 12:02, Dong, Ruijing wrote:
> [AMD Official Use Only - AMD Internal Distribution Only]
>
> Please see my question inline below.
>
> Thanks,
> Ruijing
>
> -Original Message-
> From: Wu, David
> Sent: Thursday, May 23, 2024 11:05 AM
> To: amd-gfx@lists.freedesktop.org; Koenig, Christian
>
> Cc: Deucher, Alexander ; Liu, Leo
> ; Jiang, Sonny ; Dong, Ruijing
>
> Subject: [PATCH] drm/amdgpu: drop some kernel messages in VCN code
>
> We have messages when the VCN fails to initialize and there is no need to
> report on success.
> Also PSP loading FWs is the default for production.
>
> Signed-off-by: David (Ming Qiang) Wu
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 1 -
> drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 3 ---
> drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 10 +-
> 3 files changed, 1 insertion(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> index b89605b400c0..5e2b7c340724 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> @@ -1078,7 +1078,6 @@ void amdgpu_vcn_setup_ucode(struct amdgpu_device *adev)
> IP_VERSION(4, 0, 3))
> break;
> }
> - dev_info(adev->dev, "Will use PSP to load VCN firmware\n");
> }
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
> b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
> index 64c856bfe0cb..68ef29bc70e2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
> @@ -145,8 +145,6 @@ static int jpeg_v5_0_0_hw_init(void *handle)
> if (r)
> return r;
>
> - DRM_DEV_INFO(adev->dev, "JPEG decode initialized successfully.\n");
> -
> return 0;
> }
>
> @@ -549,7 +547,6 @@ static const struct amdgpu_ring_funcs
> jpeg_v5_0_0_dec_ring_vm_funcs = { static void
> jpeg_v5_0_0_set_dec_ring_funcs(struct amdgpu_device *adev) {
> adev->jpeg.inst->ring_dec->funcs = _v5_0_0_dec_ring_vm_funcs;
> - DRM_DEV_INFO(adev->dev, "JPEG decode is enabled in VM mode\n");
> }
>
> static const struct amdgpu_irq_src_funcs jpeg_v5_0_0_irq_funcs = {
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> index 36d4ca645c56..070b56610c7d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> @@ -200,16 +200,10 @@ static int vcn_v5_0_0_hw_init(void *handle)
>
> r = amdgpu_ring_test_helper(ring);
> if (r)
> - goto done;
> + return r;
> }
> [Ruijing] Are we assuming the hw init process always be successful?
No - it could fail with errors and in this case the top level will report
error. Otherwise it will succeed(and no need to report successful message).
David
> return 0;
> -done:
> - if (!r)
> - DRM_INFO("VCN decode and encode initialized
> successfully(under %s).\n",
> - (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG)?"DPG
> Mode":"SPG Mode");
> -
> - return r;
> }
>
> /**
> @@ -1122,8 +1116,6 @@ static void
> vcn_v5_0_0_set_unified_ring_funcs(struct amdgpu_device *adev)
>
> adev->vcn.inst[i].ring_enc[0].funcs =
> _v5_0_0_unified_ring_vm_funcs;
> adev->vcn.inst[i].ring_enc[0].me = i;
> -
> - DRM_INFO("VCN(%d) encode/decode are enabled in VM mode\n", i);
> }
> }
>
> --
> 2.34.1
>
RE: [PATCH] drm/amdgpu: drop some kernel messages in VCN code
[AMD Official Use Only - AMD Internal Distribution Only]
Thanks for the response, and it looks good to me.
Ruijing
-Original Message-
From: Wu, David
Sent: Thursday, May 23, 2024 12:55 PM
To: Dong, Ruijing ; Wu, David ;
amd-gfx@lists.freedesktop.org; Koenig, Christian
Cc: Deucher, Alexander ; Liu, Leo ;
Jiang, Sonny
Subject: Re: [PATCH] drm/amdgpu: drop some kernel messages in VCN code
please see in line.
On 2024-05-23 12:02, Dong, Ruijing wrote:
> [AMD Official Use Only - AMD Internal Distribution Only]
>
> Please see my question inline below.
>
> Thanks,
> Ruijing
>
> -Original Message-
> From: Wu, David
> Sent: Thursday, May 23, 2024 11:05 AM
> To: amd-gfx@lists.freedesktop.org; Koenig, Christian
>
> Cc: Deucher, Alexander ; Liu, Leo
> ; Jiang, Sonny ; Dong, Ruijing
>
> Subject: [PATCH] drm/amdgpu: drop some kernel messages in VCN code
>
> We have messages when the VCN fails to initialize and there is no need to
> report on success.
> Also PSP loading FWs is the default for production.
>
> Signed-off-by: David (Ming Qiang) Wu
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 1 -
> drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 3 ---
> drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 10 +-
> 3 files changed, 1 insertion(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> index b89605b400c0..5e2b7c340724 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> @@ -1078,7 +1078,6 @@ void amdgpu_vcn_setup_ucode(struct amdgpu_device *adev)
> IP_VERSION(4, 0, 3))
> break;
> }
> - dev_info(adev->dev, "Will use PSP to load VCN firmware\n");
> }
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
> b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
> index 64c856bfe0cb..68ef29bc70e2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
> @@ -145,8 +145,6 @@ static int jpeg_v5_0_0_hw_init(void *handle)
> if (r)
> return r;
>
> - DRM_DEV_INFO(adev->dev, "JPEG decode initialized successfully.\n");
> -
> return 0;
> }
>
> @@ -549,7 +547,6 @@ static const struct amdgpu_ring_funcs
> jpeg_v5_0_0_dec_ring_vm_funcs = { static void
> jpeg_v5_0_0_set_dec_ring_funcs(struct amdgpu_device *adev) {
> adev->jpeg.inst->ring_dec->funcs = _v5_0_0_dec_ring_vm_funcs;
> - DRM_DEV_INFO(adev->dev, "JPEG decode is enabled in VM mode\n");
> }
>
> static const struct amdgpu_irq_src_funcs jpeg_v5_0_0_irq_funcs = {
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> index 36d4ca645c56..070b56610c7d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> @@ -200,16 +200,10 @@ static int vcn_v5_0_0_hw_init(void *handle)
>
> r = amdgpu_ring_test_helper(ring);
> if (r)
> - goto done;
> + return r;
> }
> [Ruijing] Are we assuming the hw init process always be successful?
No - it could fail with errors and in this case the top level will report
error. Otherwise it will succeed(and no need to report successful message).
David
> return 0;
> -done:
> - if (!r)
> - DRM_INFO("VCN decode and encode initialized
> successfully(under %s).\n",
> - (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG)?"DPG
> Mode":"SPG Mode");
> -
> - return r;
> }
>
> /**
> @@ -1122,8 +1116,6 @@ static void
> vcn_v5_0_0_set_unified_ring_funcs(struct amdgpu_device *adev)
>
> adev->vcn.inst[i].ring_enc[0].funcs =
> _v5_0_0_unified_ring_vm_funcs;
> adev->vcn.inst[i].ring_enc[0].me = i;
> -
> - DRM_INFO("VCN(%d) encode/decode are enabled in VM mode\n", i);
> }
> }
>
> --
> 2.34.1
>
Re: [PATCH] drm/amdgpu: drop some kernel messages in VCN code
please see in line.
On 2024-05-23 12:02, Dong, Ruijing wrote:
[AMD Official Use Only - AMD Internal Distribution Only]
Please see my question inline below.
Thanks,
Ruijing
-Original Message-
From: Wu, David
Sent: Thursday, May 23, 2024 11:05 AM
To: amd-gfx@lists.freedesktop.org; Koenig, Christian
Cc: Deucher, Alexander ; Liu, Leo ; Jiang,
Sonny ; Dong, Ruijing
Subject: [PATCH] drm/amdgpu: drop some kernel messages in VCN code
We have messages when the VCN fails to initialize and there is no need to
report on success.
Also PSP loading FWs is the default for production.
Signed-off-by: David (Ming Qiang) Wu
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 1 -
drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 3 ---
drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 10 +-
3 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index b89605b400c0..5e2b7c340724 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -1078,7 +1078,6 @@ void amdgpu_vcn_setup_ucode(struct amdgpu_device *adev)
IP_VERSION(4, 0, 3))
break;
}
- dev_info(adev->dev, "Will use PSP to load VCN firmware\n");
}
}
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
index 64c856bfe0cb..68ef29bc70e2 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
@@ -145,8 +145,6 @@ static int jpeg_v5_0_0_hw_init(void *handle)
if (r)
return r;
- DRM_DEV_INFO(adev->dev, "JPEG decode initialized successfully.\n");
-
return 0;
}
@@ -549,7 +547,6 @@ static const struct amdgpu_ring_funcs
jpeg_v5_0_0_dec_ring_vm_funcs = { static void
jpeg_v5_0_0_set_dec_ring_funcs(struct amdgpu_device *adev) {
adev->jpeg.inst->ring_dec->funcs = _v5_0_0_dec_ring_vm_funcs;
- DRM_DEV_INFO(adev->dev, "JPEG decode is enabled in VM mode\n");
}
static const struct amdgpu_irq_src_funcs jpeg_v5_0_0_irq_funcs = { diff --git
a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
index 36d4ca645c56..070b56610c7d 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
@@ -200,16 +200,10 @@ static int vcn_v5_0_0_hw_init(void *handle)
r = amdgpu_ring_test_helper(ring);
if (r)
- goto done;
+ return r;
}
[Ruijing] Are we assuming the hw init process always be successful?
No - it could fail with errors and in this case the top level will
report error. Otherwise it will succeed(and no need to report successful
message).
David
return 0;
-done:
- if (!r)
- DRM_INFO("VCN decode and encode initialized successfully(under
%s).\n",
- (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG)?"DPG Mode":"SPG
Mode");
-
- return r;
}
/**
@@ -1122,8 +1116,6 @@ static void vcn_v5_0_0_set_unified_ring_funcs(struct
amdgpu_device *adev)
adev->vcn.inst[i].ring_enc[0].funcs =
_v5_0_0_unified_ring_vm_funcs;
adev->vcn.inst[i].ring_enc[0].me = i;
-
- DRM_INFO("VCN(%d) encode/decode are enabled in VM mode\n", i);
}
}
--
2.34.1
RE: [PATCH] drm/amdgpu: drop some kernel messages in VCN code
[AMD Official Use Only - AMD Internal Distribution Only]
Please see my question inline below.
Thanks,
Ruijing
-Original Message-
From: Wu, David
Sent: Thursday, May 23, 2024 11:05 AM
To: amd-gfx@lists.freedesktop.org; Koenig, Christian
Cc: Deucher, Alexander ; Liu, Leo ;
Jiang, Sonny ; Dong, Ruijing
Subject: [PATCH] drm/amdgpu: drop some kernel messages in VCN code
We have messages when the VCN fails to initialize and there is no need to
report on success.
Also PSP loading FWs is the default for production.
Signed-off-by: David (Ming Qiang) Wu
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 1 -
drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 3 ---
drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 10 +-
3 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index b89605b400c0..5e2b7c340724 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -1078,7 +1078,6 @@ void amdgpu_vcn_setup_ucode(struct amdgpu_device *adev)
IP_VERSION(4, 0, 3))
break;
}
- dev_info(adev->dev, "Will use PSP to load VCN firmware\n");
}
}
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
index 64c856bfe0cb..68ef29bc70e2 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
@@ -145,8 +145,6 @@ static int jpeg_v5_0_0_hw_init(void *handle)
if (r)
return r;
- DRM_DEV_INFO(adev->dev, "JPEG decode initialized successfully.\n");
-
return 0;
}
@@ -549,7 +547,6 @@ static const struct amdgpu_ring_funcs
jpeg_v5_0_0_dec_ring_vm_funcs = { static void
jpeg_v5_0_0_set_dec_ring_funcs(struct amdgpu_device *adev) {
adev->jpeg.inst->ring_dec->funcs = _v5_0_0_dec_ring_vm_funcs;
- DRM_DEV_INFO(adev->dev, "JPEG decode is enabled in VM mode\n");
}
static const struct amdgpu_irq_src_funcs jpeg_v5_0_0_irq_funcs = { diff --git
a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
index 36d4ca645c56..070b56610c7d 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
@@ -200,16 +200,10 @@ static int vcn_v5_0_0_hw_init(void *handle)
r = amdgpu_ring_test_helper(ring);
if (r)
- goto done;
+ return r;
}
[Ruijing] Are we assuming the hw init process always be successful?
return 0;
-done:
- if (!r)
- DRM_INFO("VCN decode and encode initialized successfully(under
%s).\n",
- (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG)?"DPG
Mode":"SPG Mode");
-
- return r;
}
/**
@@ -1122,8 +1116,6 @@ static void vcn_v5_0_0_set_unified_ring_funcs(struct
amdgpu_device *adev)
adev->vcn.inst[i].ring_enc[0].funcs =
_v5_0_0_unified_ring_vm_funcs;
adev->vcn.inst[i].ring_enc[0].me = i;
-
- DRM_INFO("VCN(%d) encode/decode are enabled in VM mode\n", i);
}
}
--
2.34.1
