From 5d1477125a15114c23ff57d99f536903b07d2cda Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Thu, 18 Apr 2013 10:32:39 -0400 Subject: [PATCH] --- yaml --- r: 371539 b: refs/heads/master c: 26250e65fdabf4d406dc7846da7f948748cbb922 h: refs/heads/master i: 371537: 46d97610bbabb315647a0ec20a30f85a5f008f2e 371535: 15adaf0dfe1f6e8caec140737e584aa1a8b2877c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/r600_audio.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 252e455058ca..1f61d613d373 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b05e9e4c9d5d0d32357468b64d72101b0fb2b650 +refs/heads/master: 26250e65fdabf4d406dc7846da7f948748cbb922 diff --git a/trunk/drivers/gpu/drm/radeon/r600_audio.c b/trunk/drivers/gpu/drm/radeon/r600_audio.c index cb03fe22b0ab..72561e4a0799 100644 --- a/trunk/drivers/gpu/drm/radeon/r600_audio.c +++ b/trunk/drivers/gpu/drm/radeon/r600_audio.c @@ -57,10 +57,7 @@ static bool radeon_dig_encoder(struct drm_encoder *encoder) */ static int r600_audio_chipset_supported(struct radeon_device *rdev) { - return (rdev->family >= CHIP_R600 && !ASIC_IS_DCE6(rdev)) - || rdev->family == CHIP_RS600 - || rdev->family == CHIP_RS690 - || rdev->family == CHIP_RS740; + return ASIC_IS_DCE2(rdev) && !ASIC_IS_DCE6(rdev); } struct r600_audio r600_audio_status(struct radeon_device *rdev)