From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:38561 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934161AbbEOSOH (ORCPT ); Fri, 15 May 2015 14:14:07 -0400 Subject: Patch "drm/radeon: don't setup audio on asics that don't support it" has been added to the 4.0-stable tree To: alexander.deucher@amd.com, gregkh@linuxfoundation.org, mikpelinux@gmail.com Cc: , From: Date: Fri, 15 May 2015 11:14:06 -0700 Message-ID: <1431713646128176@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled drm/radeon: don't setup audio on asics that don't support it to the 4.0-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: drm-radeon-don-t-setup-audio-on-asics-that-don-t-support-it.patch and it can be found in the queue-4.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From d73a824acc705571c0f47596326d7967fba9a1d9 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 4 May 2015 14:35:01 -0400 Subject: drm/radeon: don't setup audio on asics that don't support it From: Alex Deucher commit d73a824acc705571c0f47596326d7967fba9a1d9 upstream. bug: https://bugzilla.kernel.org/show_bug.cgi?id=97701 Reported-by: Mikael Pettersson Tested-by: Mikael Pettersson Signed-off-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/radeon/radeon_audio.c | 4 ++++ 1 file changed, 4 insertions(+) --- 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_conn 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; Patches currently in stable-queue which might be from alexander.deucher@amd.com are queue-4.0/drm-radeon-more-strictly-validate-the-uvd-codec.patch queue-4.0/drm-radeon-don-t-setup-audio-on-asics-that-don-t-support-it.patch queue-4.0/drm-amdkfd-initialize-sdma-vm-when-creating-sdma-queue.patch queue-4.0/drm-radeon-make-vce-handle-check-more-strict.patch queue-4.0/drm-amdkfd-allow-unregister-process-with-queues.patch queue-4.0/drm-radeon-fix-userptr-bo-unpin-bug-v3.patch queue-4.0/drm-radeon-make-uvd-handle-checking-more-strict.patch queue-4.0/drm-radeon-disable-semaphores-for-uvd-v1-v2.patch