diff options
| author |   Rafał Miłecki <zajec5@gmail.com> | 2010-02-26 08:46:33 +0000 |
|---|---|---|
| committer |   Dave Airlie <airlied@redhat.com> | 2010-03-01 16:09:40 +1000 |
| commit | c8792d5e6cdfeb7db186f6ea654dee90ca3b9c0c (patch) | |
| tree | d298dcb5de2ef1b55221f6fd7c67c38ee01d0b32 /drivers/gpu/drm/radeon/r600_audio.c | |
| parent | Merge branch 'drm-radeon-testing' of /ssd/git/drm-radeon-next into drm-next-stage (diff) | |
| download | linux-dev-c8792d5e6cdfeb7db186f6ea654dee90ca3b9c0c.tar.xz linux-dev-c8792d5e6cdfeb7db186f6ea654dee90ca3b9c0c.zip | |
drm/radeon/kms: do not preset audio stuff and start timer when not using audio
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r600_audio.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600_audio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c index 387abaa275a4..668ff4b11c60 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); |