Commit c8792d5e authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Dave Airlie

drm/radeon/kms: do not preset audio stuff and start timer when not using audio

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 68de7745
...@@ -160,10 +160,10 @@ static void r600_audio_engine_enable(struct radeon_device *rdev, bool enable) ...@@ -160,10 +160,10 @@ static void r600_audio_engine_enable(struct radeon_device *rdev, bool enable)
*/ */
int r600_audio_init(struct radeon_device *rdev) int r600_audio_init(struct radeon_device *rdev)
{ {
if (!r600_audio_chipset_supported(rdev)) if (!radeon_audio || !r600_audio_chipset_supported(rdev))
return 0; return 0;
r600_audio_engine_enable(rdev, radeon_audio); r600_audio_engine_enable(rdev, true);
rdev->audio_channels = -1; rdev->audio_channels = -1;
rdev->audio_rate = -1; rdev->audio_rate = -1;
...@@ -266,7 +266,7 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock) ...@@ -266,7 +266,7 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock)
*/ */
void r600_audio_fini(struct radeon_device *rdev) void r600_audio_fini(struct radeon_device *rdev)
{ {
if (!r600_audio_chipset_supported(rdev)) if (!radeon_audio || !r600_audio_chipset_supported(rdev))
return; return;
del_timer(&rdev->audio_timer); del_timer(&rdev->audio_timer);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment