Commit 5eeb16ca authored by Alex Deucher's avatar Alex Deucher
Browse files

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

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: oushixiong <oushixiong1025@163.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c2fbf72f

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

+0 −5
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

+0 −5
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/amd/amdgpu/dce_v6_0.c

+0 −5
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

+0 −5
Original line number Diff line number Diff line
@@ -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;

}