From patchwork Tue Feb 18 16:13:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 3673061 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 22B7BBF13A for ; Tue, 18 Feb 2014 16:14:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 500A22016C for ; Tue, 18 Feb 2014 16:14:04 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 880B1200E0 for ; Tue, 18 Feb 2014 16:14:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7D3DCFAB71; Tue, 18 Feb 2014 08:14:01 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qa0-f41.google.com (mail-qa0-f41.google.com [209.85.216.41]) by gabe.freedesktop.org (Postfix) with ESMTP id 12B3BFAB71 for ; Tue, 18 Feb 2014 08:13:51 -0800 (PST) Received: by mail-qa0-f41.google.com with SMTP id w8so23895795qac.28 for ; Tue, 18 Feb 2014 08:13:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=6c2szNVCazwuhdRGKMgvE1voMVipUnHtGhPwtl0g+mw=; b=ITiacMBX2ssa38cW1RIcy7mWY6E2I+FccruNPctsTip8c+aNYbvBE3T/Oz5G2UiCWC XA2oirHLy6iJkk9iKDd13vbPJAzlu5JHp+m8zeTlcskYjIbuWjqPiaQoqeETxK38HzSU bskKMXUaD/QWarRhc3ZwmWhQ++jm9+vcTjjZCZcWb48AvrBN53JnKd8NXuBk9ue5UQSG wiNmAhPomg3kJ0rWmweVonlK0qJSd+vs4ntCmmwe/SXXrHPR46nJdLdqz8u+J1Nc0m7Q zXPcjh0VFLQKWxIrsybpF6bdhgCJLFqXRQATXCR0MpagjO3PEhh7+5Q6CISJDcfAr8H2 R/gA== X-Received: by 10.140.95.45 with SMTP id h42mr41103713qge.2.1392740031708; Tue, 18 Feb 2014 08:13:51 -0800 (PST) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by mx.google.com with ESMTPSA id k32sm27639368qgf.18.2014.02.18.08.13.51 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Tue, 18 Feb 2014 08:13:51 -0800 (PST) From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/3] drm/radeon: fix audio disable on dce6+ Date: Tue, 18 Feb 2014 11:13:44 -0500 Message-Id: <1392740026-24619-1-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 Cc: Alex Deucher , stable@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Properly clear the enable bit when audio disable is requested. Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Reviewed-by: Christian König --- drivers/gpu/drm/radeon/dce6_afmt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c index 713a5d3..36e8f10 100644 --- a/drivers/gpu/drm/radeon/dce6_afmt.c +++ b/drivers/gpu/drm/radeon/dce6_afmt.c @@ -283,7 +283,7 @@ static void dce6_audio_enable(struct radeon_device *rdev, bool enable) { WREG32_ENDPOINT(pin->offset, AZ_F0_CODEC_PIN_CONTROL_HOTPLUG_CONTROL, - AUDIO_ENABLED); + enable ? AUDIO_ENABLED : 0); DRM_INFO("%s audio %d support\n", enable ? "Enabling" : "Disabling", pin->id); }