From patchwork Thu Dec 12 17:16:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 3333381 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 783C49F243 for ; Thu, 12 Dec 2013 17:16:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6DEDD2040F for ; Thu, 12 Dec 2013 17:16:44 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 384F120340 for ; Thu, 12 Dec 2013 17:16:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0E2E9FB7EA for ; Thu, 12 Dec 2013 09:16:43 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qe0-f44.google.com (mail-qe0-f44.google.com [209.85.128.44]) by gabe.freedesktop.org (Postfix) with ESMTP id 7EFCAFA78D for ; Thu, 12 Dec 2013 09:16:18 -0800 (PST) Received: by mail-qe0-f44.google.com with SMTP id nd7so592493qeb.3 for ; Thu, 12 Dec 2013 09:16:18 -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=jaHAxLff/BmdqOR619zLS6yPzbYw+cziSdVOwEwQWIU=; b=hVec9SYpcsA4aax1BbdBNKlHq8twFcCi1Jmy2p7nbzHX8/k50s2xCfTDShtxJFSvFF 46z/uNjiBEwWh2rxV/pXMX1CU4hJDPVP68O96P2UBnoxsdujWlTztMqLvns42my/qrzj kG4jUyA5lmNSSWQBKAUZqSX4OWXNWnZ9JZiiJ3xS/mzZC09svPhCZKUPf7I407BjDx0m h5MzQulFC4DEkJv3KPOm5kbgxtWxAs1feX3j3vYxj/+UGYdm+NMSqo5s9TBAftay1mro aFATxAwbdG7Vx2eRd3kIWZynzEcx132zbC88piB9PW4UliwIgBaaxqN5Y2hEbgBe13Jr zHXQ== X-Received: by 10.224.8.72 with SMTP id g8mr7933893qag.83.1386868578218; Thu, 12 Dec 2013 09:16:18 -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 o5sm65447126qeg.2.2013.12.12.09.16.17 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2013 09:16:17 -0800 (PST) From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/dce6: set correct number of audio pins Date: Thu, 12 Dec 2013 12:16:12 -0500 Message-Id: <1386868572-9146-1-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 Cc: Alex Deucher 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+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.1 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 DCE6.0, 8.x has 6 DCE6.1 has 4 Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/dce6_afmt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c index de86493..ab59fd7 100644 --- a/drivers/gpu/drm/radeon/dce6_afmt.c +++ b/drivers/gpu/drm/radeon/dce6_afmt.c @@ -308,7 +308,9 @@ int dce6_audio_init(struct radeon_device *rdev) rdev->audio.enabled = true; if (ASIC_IS_DCE8(rdev)) - rdev->audio.num_pins = 7; + rdev->audio.num_pins = 6; + else if (ASIC_IS_DCE61(rdev)) + rdev->audio.num_pins = 4; else rdev->audio.num_pins = 6;