Commit 7991d665 authored by Slava Grigorev's avatar Slava Grigorev Committed by Alex Deucher
Browse files

radeon/audio: consolidate audio_fini() functions 



Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarSlava Grigorev <slava.grigorev@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8bf59820

drivers/gpu/drm/radeon/cik.c

+1 −1
Original line number Diff line number Diff line
@@ -8576,7 +8576,7 @@ int cik_suspend(struct radeon_device *rdev) 
{

	radeon_kfd_suspend(rdev);

	radeon_pm_suspend(rdev);

	dce6_audio_fini(rdev);

	radeon_audio_fini(rdev);

	radeon_vm_manager_fini(rdev);

	cik_cp_enable(rdev, false);

	cik_sdma_enable(rdev, false);

drivers/gpu/drm/radeon/dce6_afmt.c

+0 −13
Original line number Diff line number Diff line
@@ -248,16 +248,3 @@ void dce6_audio_enable(struct radeon_device *rdev, 
	WREG32_ENDPOINT(pin->offset, AZ_F0_CODEC_PIN_CONTROL_HOT_PLUG_CONTROL,

			enable_mask ? AUDIO_ENABLED : 0);

}
 


void dce6_audio_fini(struct radeon_device *rdev)

{

	int i;



	if (!rdev->audio.enabled)

		return;



	for (i = 0; i < rdev->audio.num_pins; i++)

		radeon_audio_enable(rdev, &rdev->audio.pin[i], false);



	rdev->audio.enabled = false;

}

drivers/gpu/drm/radeon/evergreen.c

+2 −2
Original line number Diff line number Diff line
@@ -5333,7 +5333,7 @@ int evergreen_resume(struct radeon_device *rdev) 
int evergreen_suspend(struct radeon_device *rdev)

{

	radeon_pm_suspend(rdev);

	r600_audio_fini(rdev);

	radeon_audio_fini(rdev);

	uvd_v1_0_fini(rdev);

	radeon_uvd_suspend(rdev);

	r700_cp_stop(rdev);
@@ -5483,7 +5483,7 @@ int evergreen_init(struct radeon_device *rdev) 
void evergreen_fini(struct radeon_device *rdev)

{

	radeon_pm_fini(rdev);

	r600_audio_fini(rdev);

	radeon_audio_fini(rdev);

	r700_cp_fini(rdev);

	r600_dma_fini(rdev);

	r600_irq_fini(rdev);

drivers/gpu/drm/radeon/ni.c

+1 −4
Original line number Diff line number Diff line
@@ -2135,10 +2135,7 @@ int cayman_resume(struct radeon_device *rdev) 
int cayman_suspend(struct radeon_device *rdev)

{

	radeon_pm_suspend(rdev);

	if (ASIC_IS_DCE6(rdev))

		dce6_audio_fini(rdev);

	else

		r600_audio_fini(rdev);

	radeon_audio_fini(rdev);

	radeon_vm_manager_fini(rdev);

	cayman_cp_enable(rdev, false);

	cayman_dma_stop(rdev);

drivers/gpu/drm/radeon/r600.c

+2 −2
Original line number Diff line number Diff line
@@ -3106,7 +3106,7 @@ int r600_resume(struct radeon_device *rdev) 
int r600_suspend(struct radeon_device *rdev)

{

	radeon_pm_suspend(rdev);

	r600_audio_fini(rdev);

	radeon_audio_fini(rdev);

	r600_cp_stop(rdev);

	if (rdev->has_uvd) {

		uvd_v1_0_fini(rdev);
@@ -3225,7 +3225,7 @@ int r600_init(struct radeon_device *rdev) 
void r600_fini(struct radeon_device *rdev)

{

	radeon_pm_fini(rdev);

	r600_audio_fini(rdev);

	radeon_audio_fini(rdev);

	r600_cp_fini(rdev);

	r600_irq_fini(rdev);

	if (rdev->has_uvd) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE