]> git.hungrycats.org Git - linux/commitdiff
drm/radeon: don't setup audio on asics that don't support it
authorAlex Deucher <alexander.deucher@amd.com>
Mon, 4 May 2015 18:35:01 +0000 (14:35 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 17 May 2015 16:55:09 +0000 (09:55 -0700)
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>
drivers/gpu/drm/radeon/radeon_audio.c

index b7d33a13db9faa8a5d739f6d0890724607e593c8..b7c6bb69f3c7bb36d755612fe5e4a8efcbe3ffce 100644 (file)
@@ -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;