drm/radeon/kms: do not disable audio engine twice
Subsystems (2)
PATCH 2/3 drm/radeon/kms: do not disable audio engine twice
Signed-off-by Rafał Miłecki <[email protected]>
---
That's result of taking related patches from 2 branches
--- drivers/gpu/drm/radeon/r600_audio.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/gpu/drm/radeon/r600_audio.c +0 -1
@@ -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); }
Signature · 14 lines
1.6.4.2 ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev -- _______________________________________________ Dri-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/dri-devel
PATCH 3/3 drm/radeon/kms: do not preset audio stuff and start timer when not using audio
Signed-off-by Rafał Miłecki <[email protected]>
--- drivers/gpu/drm/radeon/r600_audio.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/r600_audio.c +3 -3
@@ -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);
Signature · 14 lines
1.6.4.2 ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev -- _______________________________________________ Dri-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/dri-devel