[PATCH] drm/amdgpu: drop hw access in non-DC audio fini

[Alex Deucher]

Ping?

On Fri, Aug 8, 2025 at 11:23 AM Alex Deucher <alexander.deucher at amd.com> wrote:
>
> We already disable the audio pins in hw_fini so
> there is no need to do it again in sw_fini.
>
> Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4481
> Cc: stable at vger.kernel.org
> Cc: oushixiong <oushixiong1025 at 163.com>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 5 -----
>  drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 5 -----
>  drivers/gpu/drm/amd/amdgpu/dce_v6_0.c  | 5 -----
>  drivers/gpu/drm/amd/amdgpu/dce_v8_0.c  | 5 -----
>  4 files changed, 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> index bf7c22f81cda3..ba73518f5cdf3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> @@ -1462,17 +1462,12 @@ static int dce_v10_0_audio_init(struct amdgpu_device *adev)
>
>  static void dce_v10_0_audio_fini(struct amdgpu_device *adev)
>  {
> -       int i;
> -
>         if (!amdgpu_audio)
>                 return;
>
>         if (!adev->mode_info.audio.enabled)
>                 return;
>
> -       for (i = 0; i < adev->mode_info.audio.num_pins; i++)
> -               dce_v10_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);
> -
>         adev->mode_info.audio.enabled = false;
>  }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> index 47e05783c4a0e..b01d88d078fa2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> @@ -1511,17 +1511,12 @@ static int dce_v11_0_audio_init(struct amdgpu_device *adev)
>
>  static void dce_v11_0_audio_fini(struct amdgpu_device *adev)
>  {
> -       int i;
> -
>         if (!amdgpu_audio)
>                 return;
>
>         if (!adev->mode_info.audio.enabled)
>                 return;
>
> -       for (i = 0; i < adev->mode_info.audio.num_pins; i++)
> -               dce_v11_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);
> -
>         adev->mode_info.audio.enabled = false;
>  }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> index 276c025c4c03d..81760a26f2ffc 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> @@ -1451,17 +1451,12 @@ static int dce_v6_0_audio_init(struct amdgpu_device *adev)
>
>  static void dce_v6_0_audio_fini(struct amdgpu_device *adev)
>  {
> -       int i;
> -
>         if (!amdgpu_audio)
>                 return;
>
>         if (!adev->mode_info.audio.enabled)
>                 return;
>
> -       for (i = 0; i < adev->mode_info.audio.num_pins; i++)
> -               dce_v6_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);
> -
>         adev->mode_info.audio.enabled = false;
>  }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> index e62ccf9eb73de..19a265bd4d196 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> @@ -1443,17 +1443,12 @@ static int dce_v8_0_audio_init(struct amdgpu_device *adev)
>
>  static void dce_v8_0_audio_fini(struct amdgpu_device *adev)
>  {
> -       int i;
> -
>         if (!amdgpu_audio)
>                 return;
>
>         if (!adev->mode_info.audio.enabled)
>                 return;
>
> -       for (i = 0; i < adev->mode_info.audio.num_pins; i++)
> -               dce_v8_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);
> -
>         adev->mode_info.audio.enabled = false;
>  }
>
> --
> 2.50.1
>