aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2015-05-04 14:35:01 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-17 09:55:09 -0700
commit88c4cb28e333782838b2101336d75c5765044e4c (patch)
treeb4f7566513a7e9e9fe73f8a9df9595382e5c6d88
parenta0db475d779ff69c739bcb8a046bee8840d98838 (diff)
drm/radeon: don't setup audio on asics that don't support it
commit d73a824acc705571c0f47596326d7967fba9a1d9 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/radeon/radeon_audio.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c
index b7d33a13db9f..b7c6bb69f3c7 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;