summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorRafał Miłecki2010-02-26 09:46:32 +0100
committerDave Airlie2010-03-01 07:09:43 +0100
commit6d9c13513661c1991bf5f4e6e1363c721292d819 (patch)
treed38597d955779a2ce15629ae333664c3c122f767 /drivers/gpu
parentRevert "drm/radeon/kms: disable HDMI audio for now on rv710/rv730" (diff)
downloadkernel-qcow2-linux-6d9c13513661c1991bf5f4e6e1363c721292d819.tar.gz
kernel-qcow2-linux-6d9c13513661c1991bf5f4e6e1363c721292d819.tar.xz
kernel-qcow2-linux-6d9c13513661c1991bf5f4e6e1363c721292d819.zip
drm/radeon/kms: do not disable audio engine twice
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/radeon/r600_audio.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c
index 58c3cb32f7b0..db928016d034 100644
--- a/drivers/gpu/drm/radeon/r600_audio.c
+++ b/drivers/gpu/drm/radeon/r600_audio.c
@@ -270,7 +270,6 @@ void r600_audio_fini(struct radeon_device *rdev)
return;
del_timer(&rdev->audio_timer);
- WREG32_P(R600_AUDIO_ENABLE, 0x0, ~0x81000000);
r600_audio_engine_enable(rdev, false);
}