From 8aaba36e45bdf1aa03050117086f8fc34e995791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Thu, 11 Feb 2010 22:58:52 +0100 Subject: [PATCH] --- yaml --- r: 185583 b: refs/heads/master c: 5230aea62c0d8f53edcc3e014c3404132afcfeb4 h: refs/heads/master i: 185581: 04a4a98d0651408dc7aed3494107196b3c2591f2 185579: 3e49ad9d388f4c966d44d09e6837e92e9591b0ac 185575: 6d6814c13610641f0d1bf1e42f25235d64d1e7ff 185567: e659809f3b53d6bc142046dd4b3b939a8f94848a v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/r600_audio.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a412dd057658..93bfe48363b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71b10d8762b2a548c4ac2e4461b46d9b205a5c77 +refs/heads/master: 5230aea62c0d8f53edcc3e014c3404132afcfeb4 diff --git a/trunk/drivers/gpu/drm/radeon/r600_audio.c b/trunk/drivers/gpu/drm/radeon/r600_audio.c index b1c1d3433454..d7f6909afc01 100644 --- a/trunk/drivers/gpu/drm/radeon/r600_audio.c +++ b/trunk/drivers/gpu/drm/radeon/r600_audio.c @@ -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); }