Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5230aea6 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Dave Airlie
Browse files

drm/radeon/kms: isolate audio engine management, change fini order 



We should stop audio-state-reading timer before we turn off engine

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 71b10d87

drivers/gpu/drm/radeon/r600_audio.c

+12 −4
Original line number Diff line number Diff line
@@ -146,6 +146,15 @@ static void r600_audio_update_hdmi(unsigned long param) 
		jiffies + msecs_to_jiffies(AUDIO_TIMER_INTERVALL));

}



/*

 * turn on/off audio engine

 */

static void r600_audio_engine_enable(struct radeon_device *rdev, bool enable)

{

	DRM_INFO("%s audio support", enable ? "Enabling" : "Disabling");

	WREG32_P(R600_AUDIO_ENABLE, enable ? 0x81000000 : 0x0, ~0x81000000);

}



/*

 * initialize the audio vars and register the update timer

 */
@@ -154,8 +163,7 @@ int r600_audio_init(struct radeon_device *rdev) 
	if (!r600_audio_chipset_supported(rdev))

		return 0;



	DRM_INFO("%s audio support", radeon_audio ? "Enabling" : "Disabling");

	WREG32_P(R600_AUDIO_ENABLE, radeon_audio ? 0x81000000 : 0x0, ~0x81000000);

	r600_audio_engine_enable(rdev, radeon_audio);



	rdev->audio_channels = -1;

	rdev->audio_rate = -1;
@@ -261,7 +269,7 @@ void r600_audio_fini(struct radeon_device *rdev) 
	if (!r600_audio_chipset_supported(rdev))

		return;



	WREG32_P(R600_AUDIO_ENABLE, 0x0, ~0x81000000);



	del_timer(&rdev->audio_timer);



	r600_audio_engine_enable(rdev, false);

}