From: Rafał Miłecki Date: Fri, 26 Feb 2010 08:46:33 +0000 (+0000) Subject: drm/radeon/kms: do not preset audio stuff and start timer when not using audio X-Git-Tag: v2.6.34-rc4~12^2~66 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8792d5e6cdfeb7db186f6ea654dee90ca3b9c0c;p=platform%2Fkernel%2Flinux-3.10.git drm/radeon/kms: do not preset audio stuff and start timer when not using audio Signed-off-by: Rafał Miłecki Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c index 387abaa..668ff4b 100644 --- a/drivers/gpu/drm/radeon/r600_audio.c +++ b/drivers/gpu/drm/radeon/r600_audio.c @@ -160,10 +160,10 @@ static void r600_audio_engine_enable(struct radeon_device *rdev, bool enable) */ int r600_audio_init(struct radeon_device *rdev) { - if (!r600_audio_chipset_supported(rdev)) + if (!radeon_audio || !r600_audio_chipset_supported(rdev)) return 0; - r600_audio_engine_enable(rdev, radeon_audio); + r600_audio_engine_enable(rdev, true); rdev->audio_channels = -1; rdev->audio_rate = -1; @@ -266,7 +266,7 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock) */ void r600_audio_fini(struct radeon_device *rdev) { - if (!r600_audio_chipset_supported(rdev)) + if (!radeon_audio || !r600_audio_chipset_supported(rdev)) return; del_timer(&rdev->audio_timer);