From patchwork Mon May 2 20:00:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 8995321 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5DAF29F441 for ; Mon, 2 May 2016 20:01:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 057F020279 for ; Mon, 2 May 2016 20:01:44 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3C830201BB for ; Mon, 2 May 2016 20:01:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 27DDC6E63C; Mon, 2 May 2016 20:01:34 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-x229.google.com (mail-qk0-x229.google.com [IPv6:2607:f8b0:400d:c09::229]) by gabe.freedesktop.org (Postfix) with ESMTPS id 496306E62F for ; Mon, 2 May 2016 20:01:21 +0000 (UTC) Received: by mail-qk0-x229.google.com with SMTP id v128so10877983qkb.2 for ; Mon, 02 May 2016 13:01:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zzrhX8UI0hfd0cEj9Kk/OKWmIH+azY2pqwA8cLf4Xxs=; b=uw5hJbcseOqyBHNRh6A4R6LVKY8A9X7BwQOyDtDUTtfxTIYnab54qsq9kLwarZebUZ kKhiMUzoLqP+NMYkKqYVoUTb0kDHEJhwyT20a/l5qPPTRCCLPEICBpN5ac+OPXWKVQ5o Vy2bhMnIhuw3bmDmNlNolfDFTjBCECxBI7cJ9zVFljrYGwhKmNa2XeO4MF70KYjOnKpm numO6YiSnTAY33UGcIpUtT0wVwvrBGA2ADGYzZ9Lv/kYxsBXI3kqYMf440SH1iCzv+Df HbGJd/uatLfpOTFrg40XwxRuMWfzb6NeXvPu0b8IKEb17ok1dwTJO+tm5VLAKD/ZBcSp Y+dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zzrhX8UI0hfd0cEj9Kk/OKWmIH+azY2pqwA8cLf4Xxs=; b=bJkcrcr+N+ngd4jX53E3HRl247bChMeKAvVZOHcOjn8xBuYmgv/0XJqkmc1o1C96qs ySx99Qh+buvwpLi1ecLiLtSBqUEWjVHnbHCJt0Mbmw0rohgBuhi8qt1tKt5ymbbleFgz nJa89bftUm75AkyUPcrltisX2Zj9g57fpJaFrk7tYHx5/Fe9lIOYKYIqSo+5zAWeiNFs 7OpF+/Ul8gNiIZbmyCjidSnpjuzQp63wUgz7qDQwGqcgjq5Y7RepqrQKWAfiYI6AA4Tl W0ESo50GABKNGAGY1V1UtYGXZE89c0swXO7v/aSWOydHbi+ui/XHQqFsIoAKgb8IE/dS 3wfw== X-Gm-Message-State: AOPr4FV2SmaqABnSWFbPS1POJ++/xeptVtWSP6Z6w88XUHsjVBUV7fTOY4sdEbx0iRsk5Q== X-Received: by 10.55.149.135 with SMTP id x129mr36542069qkd.140.1462219280361; Mon, 02 May 2016 13:01:20 -0700 (PDT) Received: from cm.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by smtp.gmail.com with ESMTPSA id x189sm9587609qhb.43.2016.05.02.13.01.19 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 02 May 2016 13:01:19 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/amdgpu: add ELM/BAF DCE11 configs (v2) Date: Mon, 2 May 2016 16:00:37 -0400 Message-Id: <1462219259-29806-25-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1462219259-29806-1-git-send-email-alexander.deucher@amd.com> References: <1462219259-29806-1-git-send-email-alexander.deucher@amd.com> MIME-Version: 1.0 Cc: Alex Deucher X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.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 Add support for the display configuration on elm/baf. v2: add missing Stoney case Reviewed-by: Christian König Signed-off-by: Alex Deucher Reviewed-by: Jammy Zhou --- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c index 89aab0a..613cc98 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c @@ -1580,7 +1580,20 @@ static int dce_v11_0_audio_init(struct amdgpu_device *adev) adev->mode_info.audio.enabled = true; - adev->mode_info.audio.num_pins = 7; + switch (adev->asic_type) { + case CHIP_CARRIZO: + case CHIP_STONEY: + adev->mode_info.audio.num_pins = 7; + break; + case CHIP_ELLESMERE: + adev->mode_info.audio.num_pins = 8; + break; + case CHIP_BAFFIN: + adev->mode_info.audio.num_pins = 6; + break; + default: + return -EINVAL; + } for (i = 0; i < adev->mode_info.audio.num_pins; i++) { adev->mode_info.audio.pin[i].channels = -1; @@ -2900,6 +2913,16 @@ static int dce_v11_0_early_init(void *handle) adev->mode_info.num_hpd = 6; adev->mode_info.num_dig = 9; break; + case CHIP_ELLESMERE: + adev->mode_info.num_crtc = 6; + adev->mode_info.num_hpd = 6; + adev->mode_info.num_dig = 6; + break; + case CHIP_BAFFIN: + adev->mode_info.num_crtc = 5; + adev->mode_info.num_hpd = 5; + adev->mode_info.num_dig = 5; + break; default: /* FIXME: not supported yet */ return -EINVAL;