From: Alex Deucher <alexander.deucher@amd.com>
Date: Mon, 4 May 2015 18:35:01 +0000 (-0400)
Subject: drm/radeon: don't setup audio on asics that don't support it
X-Git-Tag: MMI-PSA29.97-13-9~10101^2~4^2~6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d73a824acc705571c0f47596326d7967fba9a1d9;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

drm/radeon: don't setup audio on asics that don't support it

bug: https://bugzilla.kernel.org/show_bug.cgi?id=97701

Reported-by: Mikael Pettersson <mikpelinux@gmail.com>
Tested-by: Mikael Pettersson <mikpelinux@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
---

diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c
index 8b82abb78df1..dcb779647c57 100644
--- a/drivers/gpu/drm/radeon/radeon_audio.c
+++ b/drivers/gpu/drm/radeon/radeon_audio.c
@@ -464,6 +464,10 @@ void radeon_audio_detect(struct drm_connector *connector,
 		return;
 
 	rdev = connector->encoder->dev->dev_private;
+
+	if (!radeon_audio_chipset_supported(rdev))
+		return;
+
 	radeon_encoder = to_radeon_encoder(connector->encoder);
 	dig = radeon_encoder->enc_priv;