summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2015-05-04 14:35:01 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-05-05 09:46:10 -0400
commitd73a824acc705571c0f47596326d7967fba9a1d9 (patch)
treebcc01253fb831aab868749d941f1feec509b4f97
parent013ead48a843442e63b9426e3bd5df18ca5d054a (diff)
downloadop-kernel-dev-d73a824acc705571c0f47596326d7967fba9a1d9.zip
op-kernel-dev-d73a824acc705571c0f47596326d7967fba9a1d9.tar.gz
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
-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 8b82abb..dcb7796 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;
OpenPOWER on IntegriCloud