瀏覽代碼

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>
Rafał Miłecki 15 年之前
父節點
當前提交
c8792d5e6c
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      drivers/gpu/drm/radeon/r600_audio.c

+ 3 - 3
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)
 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)
  */
  */
 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);