From patchwork Wed Mar 23 17:42:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 8652591 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7EFC4C0553 for ; Wed, 23 Mar 2016 17:44:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 76CB6203F1 for ; Wed, 23 Mar 2016 17:44:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A15DE203E5 for ; Wed, 23 Mar 2016 17:44:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 01F166E8EC; Wed, 23 Mar 2016 17:44:06 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qg0-x236.google.com (mail-qg0-x236.google.com [IPv6:2607:f8b0:400d:c04::236]) by gabe.freedesktop.org (Postfix) with ESMTPS id EDFC36E8E0 for ; Wed, 23 Mar 2016 17:43:29 +0000 (UTC) Received: by mail-qg0-x236.google.com with SMTP id w104so18131079qge.1 for ; Wed, 23 Mar 2016 10:43:29 -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=Rh2A1TpVmn3jZ2Lx3GKE+mBaHNnotZOdmIW0RJYqon4=; b=CubrDDjqmqbId0GGgiNX83Wj5jcPs3azi0ppQa5Lf5gOhpFV5FUwVIMqv/lbc57/aP iD5INOSTHNHp+wJHgpwpZRu059WYVh1HicllB08tumk76rWEq9wh0EkWNytWFsVC+XLh Tl0y5ZOd2uYMoqJ6PxxXN0Lqn0BJFfCOr0EHWW1idqRlZ6Lqem7+qOsI1ERTi+KmlCqc owsIwrA+H1OhuOhA+uiN+7iNqqodkYX/p4F++QGn1Kb1Jx21R0/isPzcF/hLbdmGGDFe gv8koLYhg3HDipRVFOQjAa85Rkfpk6SAyspsfFtKv/cL4ywXgAUvKgqmyysShAZAX1hb NZEQ== 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=Rh2A1TpVmn3jZ2Lx3GKE+mBaHNnotZOdmIW0RJYqon4=; b=fcnd3lGxU98oFPkH9YVU2VDhQOrMyN9rgjpj1mvZuWlCUBNfJvJC9/DznmjoB+NfbT hBdu1wJEnDsCcdpxAv6oEL1MJ+HE/yafwuMk268BVIfo2lfrAOjU6exKR+yVls5ZF1ce YgKbKP7ZBeSSIOQxfDWDibfCgPHuiE6zm6nRFWN2TYhm1YojgR89PMsWYIEhBztgh4qG ChcQjbRmNXxX9WFHcjOvxKSER9O44G0P7Rnzla+6zE/JufnRMU5/RdtCc7BMfiXKB/7x xv/4NyrdI5wv/5wYTtU9k+9swdort1/4MPG2c0A9ykoPXkYee/3tLbEip8SMyJ6gEWGS MIhQ== X-Gm-Message-State: AD7BkJK/eIJMXzvBten+BI5gJFZXPw01f1CS/9XgZDvjyRtu1u00KZOLs0sQy4d8z5nuyQ== X-Received: by 10.140.96.22 with SMTP id j22mr5268642qge.92.1458755008323; Wed, 23 Mar 2016 10:43:28 -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 v190sm1486878qka.46.2016.03.23.10.43.27 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 23 Mar 2016 10:43:27 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 03/52] drm/amdgpu: add ELM/BAF DCE11 configs Date: Wed, 23 Mar 2016 13:42:19 -0400 Message-Id: <1458754988-16222-4-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1458754988-16222-1-git-send-email-alexander.deucher@amd.com> References: <1458754988-16222-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=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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. Reviewed-by: Christian König Signed-off-by: Alex Deucher Reviewed-by: Jammy Zhou --- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 24 +++++++++++++++++++++++- 1 file changed, 23 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 0c7b93e..cf6d87b50 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c @@ -1580,7 +1580,19 @@ 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: + 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 +2912,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;