From patchwork Tue Aug 20 19:11:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Francis X-Patchwork-Id: 11104527 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 34BA4112C for ; Tue, 20 Aug 2019 19:12:28 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1C6972082F for ; Tue, 20 Aug 2019 19:12:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1C6972082F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 275546E85B; Tue, 20 Aug 2019 19:12:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM04-SN1-obe.outbound.protection.outlook.com (mail-eopbgr700060.outbound.protection.outlook.com [40.107.70.60]) by gabe.freedesktop.org (Postfix) with ESMTPS id C4A556E858; Tue, 20 Aug 2019 19:12:20 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m6rs3yHjcpk12W4bow9ezwCjhSM6IpqbdmXabMZXRyTeNUqBOGRmL2PlGTTovloOmVJ8KbxKiczU+crG0vW6etrXSJNbt56vLPJwDYQKDgLOU/wFwNN++vbfgtGEIXIiwNJZOkcotGPvVu8zxdiWTluFhNgC1Ucsnnvo0hNnnGo8F7MiYGXQchg1z0JY/yYJjSX5LmW0vn5TyZlt8DfzrpPpKIBSfnERmhN7g95Zx8ETQFSGdHg9g4HnwWc7pZxgVEB5CheSRr8BLRa5ueZnI472uvW9jD61tfKjchK+76qihhqpc0qXy7fO+9QItkME4A/Te3S6Y/Yj6t2g1qeing== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qcumYwHSxR5cVhRbpN3wgIzuxKhPJ9GdIZAOCKyyPmo=; b=J9VlfM71hsO5Ef4j+qq04RMmZlM717k14gOZaVEka1/KVTLob6OuQxg2DuUJ9GeBSsKRqGXj69/qRcxXQOSdYHpBIjexLkPu4rZ9NRgDfHPxGbECOpjHZgCF6Ykqshg7nts4nrDOMh2WQiBoe9m9jHeTRn1efBm4lx51dQOyq9x9ol6ONUFMlqHQAiWwubKCJACqRQyMCK3QbMSw/h0X6Srj+jBvw8zQs80g/FivUCtZaz19/vSkbhbht7CRtXygABKPPMNSiwlKPoKzWhYCz6eTX08qKSi21shcrJPShuAXQ3Gu5chEFXvGTmA5ZpKk5xWBcCc3HaMHL0DiknXPZg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from DM3PR12CA0065.namprd12.prod.outlook.com (2603:10b6:0:56::33) by BN6PR12MB1521.namprd12.prod.outlook.com (2603:10b6:405:f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16; Tue, 20 Aug 2019 19:12:15 +0000 Received: from BY2NAM03FT037.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::203) by DM3PR12CA0065.outlook.office365.com (2603:10b6:0:56::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:15 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by BY2NAM03FT037.mail.protection.outlook.com (10.152.84.188) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:15 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Aug 2019 14:12:14 -0500 From: David Francis To: , Subject: [PATCH v2 01/14] Revert "drm/amd/display: skip dsc config for navi10 bring up" Date: Tue, 20 Aug 2019 15:11:50 -0400 Message-ID: <20190820191203.25807-2-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820191203.25807-1-David.Francis@amd.com> References: <20190820191203.25807-1-David.Francis@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(136003)(39860400002)(376002)(346002)(396003)(2980300002)(428003)(199004)(189003)(53936002)(49486002)(36756003)(336012)(1076003)(2906002)(50226002)(70206006)(4326008)(81166006)(8676002)(81156014)(8936002)(450100002)(5660300002)(51416003)(14444005)(186003)(76176011)(26005)(70586007)(6666004)(86362001)(305945005)(356004)(476003)(2616005)(446003)(11346002)(50466002)(16586007)(48376002)(478600001)(316002)(426003)(126002)(486006)(110136005)(47776003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1521; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b302fdd0-5416-463a-a7e4-08d725a25008 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328); SRVR:BN6PR12MB1521; X-MS-TrafficTypeDiagnostic: BN6PR12MB1521: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:519; X-Forefront-PRVS: 013568035E X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: xi+rvO0xv1hcpTV6aYCj4yWuzYprg5u3qliR1pUJXN8HrD7a1Oio49PU8Ya3MUTK17ATEC5h5J5kCsUKreMejQvR49qCDL6/3tCepxi+gSEO4sYTWwObfk+7DKeVcecIaKKcg4xqDOYCG+yKMIlfOJjbqma8E1MylG7AY4mgVJq/KjV1W7TlcAXvozNC4cV2jwhT9j3un8SXeyWPTT4BxH3XkSL5LZ8MnYo+8yeG6hWRMDbDD76a2bunBZt/GgXAY74OvRYIZBFdvKtli11qyllFHJjxO5J9v4T7tYiPohJS9sqSJSeIFi7uFJdgpS6uRk2jgxBNzE5yGo8s8sYgFB867YhcUPaIQqM7N6rt5Ur0yuklTFa9mKIjxBEVB2CHlezBelgH2Q828u0hxF8Os244T1VxSMEktOkfXerB0/o= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2019 19:12:15.2317 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b302fdd0-5416-463a-a7e4-08d725a25008 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1521 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qcumYwHSxR5cVhRbpN3wgIzuxKhPJ9GdIZAOCKyyPmo=; b=SX7LY8pKDMIOfh2qvXwKC8s2f0/Bsoh0t0PmQr1DJ2Hp9GH+D6iKQ8Y53xGHGj2wvklpkcblCU67YQ/TSTq09QntyjE/Wc/h0zRg+jJHGsDGJ7bCFe33lTPuj6Mcg2FcCnZi3Ib6y96NZuLo+ucgwLbgUWqPT1hk54jl9qGHqdM= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Francis Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This reverts commit 55ad81f3510ec1a1c19e6a4d8a6319812d07d256. optc dsc config was causing warnings due to missing register definitions. With the registers restored, the function can be re-enabled The reverted commit also disabled sanity checks and dsc power gating. The sanity check warnings are not associated with dsc, and power gating on dsc still has an issue on non-dsc monitors where the dsc hardware block is never init and so cannot respond to power gating requests. Therefore, those are left as is Signed-off-by: David Francis Reviewed-by: Roman Li Reviewed-by: Harry Wentland Reviewed-by: Nicholas Kazlauskas --- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c index aedf9de1c947..99070e93020b 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c @@ -191,15 +191,6 @@ void optc2_set_dsc_config(struct timing_generator *optc, uint32_t dsc_slice_width) { struct optc *optc1 = DCN10TG_FROM_TG(optc); - uint32_t data_format = 0; - /* skip if dsc mode is not changed */ - data_format = dm_read_reg(CTX, REG(OPTC_DATA_FORMAT_CONTROL)); - - data_format = data_format & 0x30; /* bit5:4 */ - data_format = data_format >> 4; - - if (data_format == dsc_mode) - return; REG_UPDATE(OPTC_DATA_FORMAT_CONTROL, OPTC_DSC_MODE, dsc_mode); From patchwork Tue Aug 20 19:11:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Francis X-Patchwork-Id: 11104531 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 75FE113B1 for ; Tue, 20 Aug 2019 19:12:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5DDB72082F for ; Tue, 20 Aug 2019 19:12:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5DDB72082F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 671F46E864; Tue, 20 Aug 2019 19:12:29 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM04-SN1-obe.outbound.protection.outlook.com (mail-eopbgr700060.outbound.protection.outlook.com [40.107.70.60]) by gabe.freedesktop.org (Postfix) with ESMTPS id 135BE6E85A; Tue, 20 Aug 2019 19:12:21 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ua/1nI4+048jCwhaWdZj+Zu1mamkSnpPuZ9K/1feald4BSd/hwI/1yeo0P24huYU04Fnb9jlJscEVaSlxgc7rNGRd+Yx7vo0Zg99r8NDtjPz+5QNDNd1MMvv0oIxkyHkkvPLSJsmdyA0OSoQFubs7gI4PjyrEfFlK7VakRVyXHtp3Muh0dZc/hJv8+BYbCh65iOJmv+JVAdg9KI+qIOZHDfFNZIeAgvhlq9XJMXWIbcwi8Kw9DHDuDlWnYmRYsbaVH5BT89DsS/Pd+SUl1Zip293mqeklEYiDlMd9HEr/M+qu1ntaSevQBG2d9o9jhm+2+O6S3C8abSpaLjgnQ/CmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ad5QdkLef/A+rdIQQWP3FTj0kRa3P6DtHyGuaj8rCCU=; b=EaxlKNSb1iiM6Swr/fdhjwQSLYR7vpLq4dfVdmxpxB4X/ZWHHn347UjSYM/iWUDIX5P/ZpWvimPCjfUTRso2Gj+9xRG+9CG+KyEUaIJD9Rlo1EJwYeh7JuJSnF+5P9mAhwvRTUWkcCDfFANfwuj7zSa/hMSz8z+tClxQBpeWDRrL7D6PsWR7Y5u2xLsIbI1FPQoS+aD3pvMBJq42/E/58lg1y6b0yFwXJsjrlBJgWyS60rwMLq201xN4OiLL7iJTC83t9+8jm+QF3haeCyZiLC+ktSl0OsWWHjVJS+jLiJtiafNiKp1A/LcM1dJo0HlqjcXTp3ZRkRzGVaaaSkQUug== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from DM3PR12CA0065.namprd12.prod.outlook.com (2603:10b6:0:56::33) by BN6PR12MB1521.namprd12.prod.outlook.com (2603:10b6:405:f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16; Tue, 20 Aug 2019 19:12:16 +0000 Received: from BY2NAM03FT037.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::203) by DM3PR12CA0065.outlook.office365.com (2603:10b6:0:56::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:16 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by BY2NAM03FT037.mail.protection.outlook.com (10.152.84.188) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:16 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Aug 2019 14:12:15 -0500 From: David Francis To: , Subject: [PATCH v2 02/14] Revert "drm/amd/display: navi10 bring up skip dsc encoder config" Date: Tue, 20 Aug 2019 15:11:51 -0400 Message-ID: <20190820191203.25807-3-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820191203.25807-1-David.Francis@amd.com> References: <20190820191203.25807-1-David.Francis@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(136003)(39860400002)(376002)(346002)(396003)(2980300002)(428003)(199004)(189003)(53936002)(49486002)(36756003)(336012)(1076003)(2906002)(50226002)(70206006)(4326008)(81166006)(8676002)(81156014)(8936002)(450100002)(5660300002)(51416003)(14444005)(186003)(76176011)(26005)(70586007)(6666004)(86362001)(305945005)(356004)(476003)(2616005)(446003)(11346002)(50466002)(16586007)(48376002)(478600001)(316002)(426003)(126002)(486006)(110136005)(47776003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1521; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a0807cf3-877a-4e7d-6435-08d725a250a8 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328); SRVR:BN6PR12MB1521; X-MS-TrafficTypeDiagnostic: BN6PR12MB1521: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:158; X-Forefront-PRVS: 013568035E X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 5pExpkUFHfHMwYLKQVKuxPWHMezii87xGRwlh2BXXZ/ejzL9UQ0Qjo7lB/iXxvKlxxKzJh+YW4h27ozqXkuoZJqBYied0fbbncYRbMSludwXhVGjVi+wkZJfekiKRL1l7AN7GmlkDtA8AKX30ezBH43RIWPm5iRmd7DkBD/1R2syVly5hbltDK9fbSZ+Udy3vpn0aq0FCnpp5bqSoOH9Ayxh0bxHR2zvU4c/ss3udGoG4aMO5cXXk2QMZTDtCBHG0pTcaYvg1fozxr/EXRyYlZGvRrV785qcLhO7c2LniaHY+fRvfZNVlEvb25ho5mfyOAmMqnKmc7OOz8vptxZ4VNyellL/NdQpUWPsY8mEITqCFhpE52X3D8jM55hHXK2QpH1LE1an6UQ91kPOX+QDbdAz0YJUhQAtx5/MIFFtmlQ= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2019 19:12:16.2765 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a0807cf3-877a-4e7d-6435-08d725a250a8 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1521 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ad5QdkLef/A+rdIQQWP3FTj0kRa3P6DtHyGuaj8rCCU=; b=TvLUE00jLjYtk5XdcF+BY+euRZ/Uo7AX7ay5TuFF+Vqr2PlO732n/I2uiGWIILN2qycPl2gsMW8RuCmAMDjmtnOmMcdpHf+CHWkfbam/uzyM5E+5KnILC5SEJC3Qvv6Rvd1FX5CUDAxKN9sXzUYDfR/kwCiOb4DFeSfkUiwNXJo= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Francis Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This reverts commit 5f2fd347eeff7d4ce271920efd47baaa18fe968c. Re-enable enc2_dp_set_dsc_config. This function caused warnings due to missing register definitions. With the registers added, this now works Signed-off-by: David Francis Reviewed-by: Roman Li Reviewed-by: Harry Wentland Reviewed-by: Nicholas Kazlauskas --- .../gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c index 6d54942ab98b..a4e67286cdad 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c @@ -277,14 +277,6 @@ static void enc2_dp_set_dsc_config(struct stream_encoder *enc, uint32_t dsc_slice_width) { struct dcn10_stream_encoder *enc1 = DCN10STRENC_FROM_STRENC(enc); - uint32_t dsc_value = 0; - - dsc_value = REG_READ(DP_DSC_CNTL); - - /* dsc disable skip */ - if ((dsc_value & 0x3) == 0x0) - return; - REG_UPDATE_2(DP_DSC_CNTL, DP_DSC_MODE, dsc_mode, From patchwork Tue Aug 20 19:11:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Francis X-Patchwork-Id: 11104523 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5783513B1 for ; Tue, 20 Aug 2019 19:12:23 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3F4972082F for ; Tue, 20 Aug 2019 19:12:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3F4972082F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D19886E858; Tue, 20 Aug 2019 19:12:21 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-eopbgr740084.outbound.protection.outlook.com [40.107.74.84]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6A7566E858; Tue, 20 Aug 2019 19:12:20 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m3/ktJh9QRIFBF/KEEEYZgMUdPCugmI2rDG7oQziL/EbjeZ/02JfRlP++opdBrb+g3M60xLAoZhw3i41k1FQaAxqepWFrcUtfXQ+eQNS4moRcfpl/noJWotYduH3u8rEIgyGSLQhd04E2o8H53KkGyI2hPVf6FNTE1XiPRBDc8vXksBEaP0DJyPSDM1GN8CehNfcdnnp99sbD+dLrVWZdQy9w0aQlItRW90QrTyOHBI/NoumLSN+SP6mR2Ifng5tKA0SFgZEv88Y86xDKvTH/V/fkVlsMOx8o+zH4puVg4hE/f3D2aeRki99jEn9zO1ucgGdvwGz8JOZANp5fZfjcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=X813OVoOxYUUz5sdQTIQb9htdht2aesm57hljVHuyoA=; b=V7GHG2Mk/Ps0qXpy2tuZbSzES6d4guHG3V/wWxdIC+XdIgd/6cVtAYLOQU9mZJSco6Sz5q2f7+3G1PjfCjZ5QcqCPLzgZv0V8QATxL9DNhGIMYolXhFSvftf3lVwXLl47trpQNRNOxoV/YnjfUtjlyI3LHSBTl77od1xfnvvJhMact1T8hP4znYyTDxMEczplPupCLLJe82wug6hg4E8t/Hf6Sea4FIwfRc00wwwPLtXTCAf3n9xMjzZn2ZYEe3IVdZGkuAHgpoLnCQuC0md72M7kH515ZnQCJ0LWdE2XHW5BKP8WgkVsPBMMRvVdecgqQ6sWSU/wetzYRAfYidugg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from DM3PR12CA0109.namprd12.prod.outlook.com (2603:10b6:0:55::29) by BN6PR12MB1522.namprd12.prod.outlook.com (2603:10b6:405:11::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16; Tue, 20 Aug 2019 19:12:18 +0000 Received: from BY2NAM03FT025.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::203) by DM3PR12CA0109.outlook.office365.com (2603:10b6:0:55::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:18 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by BY2NAM03FT025.mail.protection.outlook.com (10.152.84.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:17 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Aug 2019 14:12:17 -0500 From: David Francis To: , Subject: [PATCH v2 03/14] Revert "drm/amd/display: add global master update lock for DCN2" Date: Tue, 20 Aug 2019 15:11:52 -0400 Message-ID: <20190820191203.25807-4-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820191203.25807-1-David.Francis@amd.com> References: <20190820191203.25807-1-David.Francis@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(376002)(346002)(396003)(136003)(39860400002)(2980300002)(428003)(189003)(199004)(446003)(48376002)(11346002)(50466002)(2906002)(26005)(186003)(486006)(4326008)(450100002)(356004)(6666004)(70206006)(70586007)(51416003)(14444005)(305945005)(110136005)(53936002)(336012)(16586007)(47776003)(36756003)(81156014)(8936002)(8676002)(81166006)(316002)(15650500001)(1076003)(86362001)(5660300002)(426003)(49486002)(76176011)(2616005)(476003)(126002)(478600001)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1522; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 74db2264-77f8-4851-4725-08d725a251ab X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328); SRVR:BN6PR12MB1522; X-MS-TrafficTypeDiagnostic: BN6PR12MB1522: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:96; X-Forefront-PRVS: 013568035E X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: n2rthKFfQGolT6+8aGTai5au0WlsbCAPEN4FZQopGVDOJ4t2QpM3DPPq93pHbMxo8wAeiWlXVJEdDaZ8qbdV/EL9uQhHAd31k1Wa5p650bPeaAdHUaJgnqxeGv7XvITof5hYm5IhrGM1vKP2JaTxX0PQ7XFcw9UmB/mPqi2KVeFKqETVAepA8zUt+zQ7I8qiLoand9XjtqQ/fPGGLW64cmzxZWFEtto32J5MLJ9kfFdmzNGdCOPcLQLjns1f7fFQoUcgrw2ntOvAtFKDyHok1CBGWnQBOw7zFfo6ynXTNva7fgZ6qtytt7noici+SpFnJVmCq7TzAuuI5mVY9GqMAF2nXb+qbvP3Gsm/Nh3sUARu57HLuA6wEfcAe+NUuIGkRDmsCGgqAr5JpTrbmmEm0CN2noIefqX7heACpJN3Ecs= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2019 19:12:17.9772 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 74db2264-77f8-4851-4725-08d725a251ab X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1522 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=X813OVoOxYUUz5sdQTIQb9htdht2aesm57hljVHuyoA=; b=wvkbP7F6n2DuinCvvr42lq+mQ3Oo9LGaLy1c9y6P6bbHVeyAeBE0e7uWPA2FmCdt5LFoEG3izee0nvTn5/WDvfPiFi+JYBIgnGj5kSOjgMG8ir0ygAkAFAXzCHeI2GKPp6ME7SlApyr1MNbdlB8vl4RwrDCbsbLWh2jAK+85EeY= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Francis Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This reverts commit 55a6f5bbcf00a49565946c0a9b8c716313dc6c05. This commit was accidentally promoted twice Signed-off-by: David Francis Reviewed-by: Roman Li Reviewed-by: Harry Wentland Reviewed-by: Nicholas Kazlauskas --- .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 4 -- .../gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 63 +------------------ .../gpu/drm/amd/display/dc/dcn20/dcn20_optc.h | 3 - .../amd/display/dc/inc/hw/timing_generator.h | 2 - 4 files changed, 1 insertion(+), 71 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c index fa8a73f6c8e3..e146d1d8d45e 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c @@ -575,10 +575,6 @@ enum dc_status dcn20_enable_stream_timing( pipe_ctx->stream->signal, true); - if (pipe_ctx->stream_res.tg->funcs->setup_global_lock) - pipe_ctx->stream_res.tg->funcs->setup_global_lock( - pipe_ctx->stream_res.tg); - if (odm_pipe) odm_pipe->stream_res.opp->funcs->opp_pipe_clock_control( odm_pipe->stream_res.opp, diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c index 99070e93020b..2137e2be2140 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c @@ -333,65 +333,6 @@ void optc2_triplebuffer_unlock(struct timing_generator *optc) } - -void optc2_setup_global_lock(struct timing_generator *optc) -{ - struct optc *optc1 = DCN10TG_FROM_TG(optc); - uint32_t v_blank_start = 0; - uint32_t h_blank_start = 0, h_total = 0; - - REG_SET(OTG_GLOBAL_CONTROL1, 0, MASTER_UPDATE_LOCK_DB_EN, 1); - - REG_SET(OTG_GLOBAL_CONTROL2, 0, DIG_UPDATE_LOCATION, 20); - - REG_GET(OTG_V_BLANK_START_END, OTG_V_BLANK_START, &v_blank_start); - - REG_GET(OTG_H_BLANK_START_END, OTG_H_BLANK_START, &h_blank_start); - - REG_GET(OTG_H_TOTAL, OTG_H_TOTAL, &h_total); - REG_UPDATE_2(OTG_GLOBAL_CONTROL1, - MASTER_UPDATE_LOCK_DB_X, - h_blank_start - 200 - 1, - MASTER_UPDATE_LOCK_DB_Y, - v_blank_start - 1); -} - -void optc2_lock_global(struct timing_generator *optc) -{ - struct optc *optc1 = DCN10TG_FROM_TG(optc); - - REG_UPDATE(OTG_GLOBAL_CONTROL2, GLOBAL_UPDATE_LOCK_EN, 1); - - REG_SET(OTG_GLOBAL_CONTROL0, 0, - OTG_MASTER_UPDATE_LOCK_SEL, optc->inst); - REG_SET(OTG_MASTER_UPDATE_LOCK, 0, - OTG_MASTER_UPDATE_LOCK, 1); - - /* Should be fast, status does not update on maximus */ - if (optc->ctx->dce_environment != DCE_ENV_FPGA_MAXIMUS) - REG_WAIT(OTG_MASTER_UPDATE_LOCK, - UPDATE_LOCK_STATUS, 1, - 1, 10); -} - -void optc2_lock(struct timing_generator *optc) -{ - struct optc *optc1 = DCN10TG_FROM_TG(optc); - - REG_UPDATE(OTG_GLOBAL_CONTROL2, GLOBAL_UPDATE_LOCK_EN, 0); - - REG_SET(OTG_GLOBAL_CONTROL0, 0, - OTG_MASTER_UPDATE_LOCK_SEL, optc->inst); - REG_SET(OTG_MASTER_UPDATE_LOCK, 0, - OTG_MASTER_UPDATE_LOCK, 1); - - /* Should be fast, status does not update on maximus */ - if (optc->ctx->dce_environment != DCE_ENV_FPGA_MAXIMUS) - REG_WAIT(OTG_MASTER_UPDATE_LOCK, - UPDATE_LOCK_STATUS, 1, - 1, 10); -} - void optc2_lock_doublebuffer_enable(struct timing_generator *optc) { struct optc *optc1 = DCN10TG_FROM_TG(optc); @@ -486,10 +427,8 @@ static struct timing_generator_funcs dcn20_tg_funcs = { .triplebuffer_lock = optc2_triplebuffer_lock, .triplebuffer_unlock = optc2_triplebuffer_unlock, .disable_reset_trigger = optc1_disable_reset_trigger, - .lock = optc2_lock, + .lock = optc1_lock, .unlock = optc1_unlock, - .lock_global = optc2_lock_global, - .setup_global_lock = optc2_setup_global_lock, .lock_doublebuffer_enable = optc2_lock_doublebuffer_enable, .lock_doublebuffer_disable = optc2_lock_doublebuffer_disable, .enable_optc_clock = optc1_enable_optc_clock, diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h index 47cb4de1564c..32a58431fd09 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h @@ -106,9 +106,6 @@ void optc2_get_optc_source(struct timing_generator *optc, void optc2_triplebuffer_lock(struct timing_generator *optc); void optc2_triplebuffer_unlock(struct timing_generator *optc); -void optc2_lock(struct timing_generator *optc); -void optc2_lock_global(struct timing_generator *optc); -void optc2_setup_global_lock(struct timing_generator *optc); void optc2_lock_doublebuffer_disable(struct timing_generator *optc); void optc2_lock_doublebuffer_enable(struct timing_generator *optc); void optc2_program_manual_trigger(struct timing_generator *optc); diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h b/drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h index f607ef24c766..e0713d6d6c8d 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h +++ b/drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h @@ -189,10 +189,8 @@ struct timing_generator_funcs { bool (*did_triggered_reset_occur)(struct timing_generator *tg); void (*setup_global_swap_lock)(struct timing_generator *tg, const struct dcp_gsl_params *gsl_params); - void (*setup_global_lock)(struct timing_generator *tg); void (*unlock)(struct timing_generator *tg); void (*lock)(struct timing_generator *tg); - void (*lock_global)(struct timing_generator *tg); void (*lock_doublebuffer_disable)(struct timing_generator *tg); void (*lock_doublebuffer_enable)(struct timing_generator *tg); #if defined(CONFIG_DRM_AMD_DC_DCN2_0) From patchwork Tue Aug 20 19:11:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Francis X-Patchwork-Id: 11104525 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0C59313B1 for ; Tue, 20 Aug 2019 19:12:26 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E84822082F for ; Tue, 20 Aug 2019 19:12:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E84822082F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 473FE6E85C; Tue, 20 Aug 2019 19:12:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-eopbgr740070.outbound.protection.outlook.com [40.107.74.70]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0ACCD6E85B; Tue, 20 Aug 2019 19:12:21 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DmN4uRLnRmEp7ewh6YrPjNUOXoNavVaXTWxQ3ObSJ21Qo8e8K/pIyoukoLsFO8qg9HQxgC2rgZvw4Q97ayBv0FH78wIGpZb3ROoWQ4xqVPooLyNwZkP7Bm5yktmlMeNuUgoS6ghUAvVNBs/C7bSrMTNOOV9LJXEURfHyU6xqg+GQNCHbSWTTUjtwQeKpyjgENvW7RzLzenmSZym5cbE0v1cF8aJuv3wHWagdPGvA9g17Lc6Azyhilm0VIC+WAhJEyl+PfpAqw3Wmda3lKedPQTNdffdP5aJutdyQl6W8x2FnKyjg4mwg9RkP6rEHCVa73A/xg7BUPzoI4kiGDMkcmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ywSTmYSp/jtxrNMaLPn7VmtQiBN4urC7GQOHwO62wcM=; b=cX2EJ2RGe0txl6XGq+r268IZ/o+mZXgsuM2UiIJeSxUYgzTtagMqn7CWWl0mImVR6vjcf9m0EeXRcAo6kkXv+ppynt4dpOresJmsqrejKG7Xth2nXY57whF7/6W2/5ur/YXF1IUnTpN7qoJ5sWG/Yeo6Xvdb0TZw9DUodQ2tGdR+wBUeyCFskgMF7RE1Qa6lRuJXO9/lYTGJ3Z0IDPxi4Fxqqzl/bWWMYwzBYTYB8TkfmP72rBekzQB94ZAnjUB8FNgeWkrIQFzf3CXNYaGlx4pW8g1Gb2yI0wjekbkDzwvo9/edNG2aTMzNPieFGSd9+GbC9frg0n6mK+iliX5Uzg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from DM3PR12CA0109.namprd12.prod.outlook.com (2603:10b6:0:55::29) by MWHPR12MB1280.namprd12.prod.outlook.com (2603:10b6:300:12::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.19; Tue, 20 Aug 2019 19:12:19 +0000 Received: from BY2NAM03FT025.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::203) by DM3PR12CA0109.outlook.office365.com (2603:10b6:0:55::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:19 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by BY2NAM03FT025.mail.protection.outlook.com (10.152.84.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:18 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Aug 2019 14:12:18 -0500 From: David Francis To: , Subject: [PATCH v2 04/14] Revert "drm/amd/display: Fix underscan not using proper scaling" Date: Tue, 20 Aug 2019 15:11:53 -0400 Message-ID: <20190820191203.25807-5-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820191203.25807-1-David.Francis@amd.com> References: <20190820191203.25807-1-David.Francis@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(136003)(396003)(376002)(39860400002)(346002)(2980300002)(428003)(199004)(189003)(6666004)(186003)(336012)(26005)(356004)(70206006)(70586007)(76176011)(51416003)(2616005)(446003)(49486002)(426003)(476003)(11346002)(126002)(86362001)(486006)(4326008)(81156014)(8936002)(50226002)(14444005)(81166006)(8676002)(305945005)(110136005)(316002)(16586007)(53936002)(36756003)(50466002)(5660300002)(48376002)(478600001)(2906002)(47776003)(450100002)(1076003); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR12MB1280; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8d1b8669-b4a9-4625-80de-08d725a2523c X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328); SRVR:MWHPR12MB1280; X-MS-TrafficTypeDiagnostic: MWHPR12MB1280: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:639; X-Forefront-PRVS: 013568035E X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: v59ffo9SMQHV9ha3lnjZbwZIJ6Ojxgp3xm6lyvAhR+eqIQdijcH1IgCUulWvVZ5i0NIrw4KDxlqonSiRaFPkSqLycIdiqj213KwrMSTT8ASBDFl8P5p1bgCbgUQfJ4S5trLuP7qRk7OMaTBGLcG7LyTcEcWPedCVS/16o48jGfs8IcshvHhITJ+k3YdWtfiH9D8+ez27kAweZM3rFdG+eLNnnRRw4tOnl2IWmr29p7AGMZoBnxZN8iNmQ8F136eSQHbzNoncnrtvzVpmxtiSJl/tFR7oJP/eHuL2u3p1IQCVrODM4n3u1cYBmzAJgMsha4J4Asci+6JjH11D5ZPp5kfi/LuMUrqQgaalqyTqnvyggLmPSMgMXivnBvDiNLiKK1taMmVzV+IrAz7zxKtwSUX42Lu+MoNrbVvKY63QIcg= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2019 19:12:18.9189 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8d1b8669-b4a9-4625-80de-08d725a2523c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1280 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ywSTmYSp/jtxrNMaLPn7VmtQiBN4urC7GQOHwO62wcM=; b=krT1y/4QzvuaaVYlEI3Nmw7T3QTmNj19Eq7HoB1NfwFy86wVCLfw7pvxjWo3H+O9PyuTLoqDkK119hDqFAzEq9inHM6fHDR0BVn5La2ku92Y0yvVgZHl+ZdGATeAKSCkYIJD9/sItfhgueKkW93GdAT5ID6tYLU0riW3xh04ihE= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Francis Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This reverts commit 80e80ec817f161560b4159608fb41bd289abede3. This commit fixed an issue with underscan commits not updating all needed timing values, but through various refactors it is no longer necessary. It causes corruption on odm combine by overwriting the halved h_active in the stream timing Signed-off-by: David Francis Reviewed-by: Roman Li Reviewed-by: Harry Wentland Reviewed-by: Nicholas Kazlauskas --- drivers/gpu/drm/amd/display/dc/core/dc.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index 77ac7f707ec5..1189e320062b 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -2127,7 +2127,7 @@ void dc_commit_updates_for_stream(struct dc *dc, enum surface_update_type update_type; struct dc_state *context; struct dc_context *dc_ctx = dc->ctx; - int i, j; + int i; stream_status = dc_stream_get_status(stream); context = dc->current_state; @@ -2165,16 +2165,6 @@ void dc_commit_updates_for_stream(struct dc *dc, copy_surface_update_to_plane(surface, &srf_updates[i]); - if (update_type >= UPDATE_TYPE_MED) { - for (j = 0; j < dc->res_pool->pipe_count; j++) { - struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j]; - - if (pipe_ctx->plane_state != surface) - continue; - - resource_build_scaling_params(pipe_ctx); - } - } } copy_stream_update_to_stream(dc, context, stream, stream_update); From patchwork Tue Aug 20 19:11:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Francis X-Patchwork-Id: 11104529 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D9CEC13B1 for ; Tue, 20 Aug 2019 19:12:33 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C17742082F for ; Tue, 20 Aug 2019 19:12:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C17742082F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A2CBC6E868; Tue, 20 Aug 2019 19:12:28 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-eopbgr740054.outbound.protection.outlook.com [40.107.74.54]) by gabe.freedesktop.org (Postfix) with ESMTPS id A9DDD6E85E; Tue, 20 Aug 2019 19:12:22 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bAoFxnM41fcXgi2ch+y24SqDG40Wj/ZCwHoHwnryuGV7wCli31rSqNmftmOHTd6WuX1tGmdTnXP/WJH4Q77s5hVC9bEwgiNL88Qxp9BmnJTVz+CvdHsDLMPIgJ4rVvURsZgWdCqLdCgTGgO+JHuA1hMpQGe0AxvIGPMmv4it0DPBjDJScIZgjSSJrBi2UkAx9+P/Y1o78O3+dZeSL9Vj6A3Kwrv5DqPYwM1YCgl/oFzXaWyAtKM7ISLGz7CSvpAxnlHuMzJZ3guLNKYeohsRuL96q0VcF4z5vb23+uND2dkAUGMTdP1y8lX89KENvQvLfzrZqA1tEsKsQ7jHOmsQdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Od0FZ3hhYGiEL0dlp0VNNk+Yi6h4HbAKvOIjRzVVEZc=; b=kfrg48KfWSv0FgymOQNtZq8inawI5ZLPcw7GCzOawF9OAh+Xo1cDFzw1eKbki3VT5xfbbk6uNKgGIFzoawnK0X0FajseY2PPlMh5RGDuuNtjAf/Um21k7CXTl2ifRsixNtu8EnsqHZSGJiugP7hvy7ZBE36cL/xfBZIbbT36D0A3KoVTjUtXraq0gUjL/6HiyTI7J8vO+5EuzluWmqXbs5KETTAXRemCj094St2SDXAXVlObg8pDOYH05imrg8FUW1UAU+QxNHPTIJ6X+oGxwu2yED36C/eXpIqwenMP+GB5nIGQQPKG2zZa4JytwsPLmpu0Z6Zgt8bAaRbN6yWZow== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from MWHPR12CA0044.namprd12.prod.outlook.com (2603:10b6:301:2::30) by BYAPR12MB2709.namprd12.prod.outlook.com (2603:10b6:a03:68::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.18; Tue, 20 Aug 2019 19:12:20 +0000 Received: from BY2NAM03FT046.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::206) by MWHPR12CA0044.outlook.office365.com (2603:10b6:301:2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:20 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by BY2NAM03FT046.mail.protection.outlook.com (10.152.85.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:20 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Aug 2019 14:12:19 -0500 From: David Francis To: , Subject: [PATCH v2 05/14] drm/amd/display: Enable SST DSC in DM Date: Tue, 20 Aug 2019 15:11:54 -0400 Message-ID: <20190820191203.25807-6-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820191203.25807-1-David.Francis@amd.com> References: <20190820191203.25807-1-David.Francis@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(136003)(376002)(396003)(39860400002)(346002)(2980300002)(428003)(189003)(199004)(16586007)(316002)(186003)(8936002)(50226002)(81156014)(8676002)(53936002)(81166006)(49486002)(26005)(450100002)(305945005)(47776003)(86362001)(4326008)(2906002)(36756003)(70586007)(50466002)(446003)(356004)(110136005)(48376002)(6666004)(11346002)(426003)(14444005)(70206006)(51416003)(76176011)(478600001)(126002)(486006)(5660300002)(2616005)(476003)(1076003)(336012); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR12MB2709; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4050ef65-8e46-4ff5-bb91-08d725a2532f X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328); SRVR:BYAPR12MB2709; X-MS-TrafficTypeDiagnostic: BYAPR12MB2709: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:156; X-Forefront-PRVS: 013568035E X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: erAy70kEM4XYnzub4rTaTg5V0euGEux8o3LWuAC1Vo2Mf0TDkq8ndFyhjDgrNWdioQ2SuQ9ucCVqGVoC7gY/pdqHCbwQ38SYtxDLoCI9S809Gcd6UL9LxYagmmztmM4kFb5PNVEzDZtv6JqDeV2jnDWwnmyk0ctrEvoK5IbPMEaP/IpFtAEdTPBqTfl3X6wlXiETHiNAwZrhCm5yM4T8xeYQdJXc6xwdHGNWDxyNC3UozcHyLeT8ZK9VR+ti0QQpZGZYG9BmLpab/X80sd/QxMUD3P37SqPfuXmayxPKc0fo2/bH4tR6aSK9s23MS509Q8e9PgWP1TsTVoXnUWNoEBF/Oys+DxujsDTBXUizHJCajzfyMi6S5yE6O2nc+lGTT38ypQDIgT6Jw5DCpE2EOUNyR3nWVn7OAB03jNQk1ZQ= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2019 19:12:20.5139 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4050ef65-8e46-4ff5-bb91-08d725a2532f X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2709 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Od0FZ3hhYGiEL0dlp0VNNk+Yi6h4HbAKvOIjRzVVEZc=; b=zrFui8jyJUm7jT63glG6iUoM0fxwkcJrRkRZsEpIQ53/OLg5bUeVPe77shmfEgSc/ojogi5u93WxIcExL5l+yPPOAgmF9ztF8xe9pdSmoMBf3UYUrlzhyAjEbEwkp16F25u1ON+/C1qa41RIhs0LQNbzd096fw7UUCFGbbJ73lk= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Francis Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" In create_stream_for_sink, check for SST DP connectors Parse DSC caps to DC format, then, if DSC is supported, compute the config DSC hardware will be programmed by dc_commit_state Tested-by: Mikita Lipski Signed-off-by: David Francis Reviewed-by: Nicholas Kazlauskas --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 32 ++++++++++++------- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 4 ++- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 911fe78b47c1..84249057e181 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -3576,6 +3576,10 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector, bool scale = dm_state ? (dm_state->scaling != RMX_OFF) : false; int mode_refresh; int preferred_refresh = 0; +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT + struct dsc_dec_dpcd_caps dsc_caps; + uint32_t link_bandwidth_kbps; +#endif struct dc_sink *sink = NULL; if (aconnector == NULL) { @@ -3648,17 +3652,23 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector, &mode, &aconnector->base, con_state, old_stream); #ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT - /* stream->timing.flags.DSC = 0; */ - /* */ - /* if (aconnector->dc_link && */ - /* aconnector->dc_link->connector_signal == SIGNAL_TYPE_DISPLAY_PORT #<{(|&& */ - /* aconnector->dc_link->dpcd_caps.dsc_caps.dsc_basic_caps.is_dsc_supported|)}>#) */ - /* if (dc_dsc_compute_config(aconnector->dc_link->ctx->dc, */ - /* &aconnector->dc_link->dpcd_caps.dsc_caps, */ - /* dc_link_bandwidth_kbps(aconnector->dc_link, dc_link_get_link_cap(aconnector->dc_link)), */ - /* &stream->timing, */ - /* &stream->timing.dsc_cfg)) */ - /* stream->timing.flags.DSC = 1; */ + stream->timing.flags.DSC = 0; + + if (aconnector->dc_link && sink->sink_signal == SIGNAL_TYPE_DISPLAY_PORT) { + dc_dsc_parse_dsc_dpcd(aconnector->dc_link->dpcd_caps.dsc_caps.dsc_basic_caps.raw, + aconnector->dc_link->dpcd_caps.dsc_caps.dsc_ext_caps.raw, + &dsc_caps); + link_bandwidth_kbps = dc_link_bandwidth_kbps(aconnector->dc_link, + dc_link_get_link_cap(aconnector->dc_link)); + + if (dsc_caps.is_dsc_supported) + if (dc_dsc_compute_config(aconnector->dc_link->ctx->dc, + &dsc_caps, + link_bandwidth_kbps, + &stream->timing, + &stream->timing.dsc_cfg)) + stream->timing.flags.DSC = 1; + } #endif update_stream_scaling_settings(&mode, dm_state, stream); diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index 7cf0573ab25f..5f2c315b18ba 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c @@ -549,7 +549,9 @@ bool dm_helpers_dp_write_dsc_enable( bool enable ) { - return false; + uint8_t enable_dsc = enable ? 1 : 0; + + return dm_helpers_dp_write_dpcd(ctx, stream->sink->link, DP_DSC_ENABLE, &enable_dsc, 1); } #endif From patchwork Tue Aug 20 19:11:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Francis X-Patchwork-Id: 11104535 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9CB8813B1 for ; Tue, 20 Aug 2019 19:12:42 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 84D4D2082F for ; Tue, 20 Aug 2019 19:12:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 84D4D2082F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 27F006E86C; Tue, 20 Aug 2019 19:12:30 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM05-DM3-obe.outbound.protection.outlook.com (mail-eopbgr730066.outbound.protection.outlook.com [40.107.73.66]) by gabe.freedesktop.org (Postfix) with ESMTPS id 623D66E866; Tue, 20 Aug 2019 19:12:28 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mvviOYw3LHouMQv6rQ/Mmy8HRl4fw5O3LQf8Sti0cO912jILdxy3B5w/0/gOsqcCBQzNd3BuapnT8ZpyxloVJcW6bHc5n6g4R1/KpUuzHS7er4edlW4dRoksvnIh464dFeJsQEagb5UYdKsT5UmReBWBEa2ADILtZ1Ruf9UNE8j8oD4I4r5woVkl+Kj+Ej5TkRBWtqu+lAXDo8GnLzUGCHONvo8lE+qHeNos+tCvEuwBSTLrWtDwPgOOYtB3Xutx+X1KQkpCCJU8AMcuT4zXQ+nE+ZH6LmE5JY+U3g5Z3+w0iDrX772VIIgGJ1BmRl5b/97FzI63LwaRJX8aq9O9nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xWxSdJDCh0chskGh5wL8fWwLYc0o9AVKu+WfRH16CCo=; b=mviivZ+uw0lWzdkFWnpOsWpKMb9IjJ/QuZiJa7kibtJqPI4T2DPgBaYdYaS71/kOXWkh81zLbiTTlCFsmpQTxbjF2ORGuXMpqXpjsvG0aE60+iU0gQaDq1jjwOTsW0QSm2EOham5gqEfEizBdA1nGecp9ZSUg9BgWotcpt/C5jFAMhmdAcwjJSRWGEp0hi6fm4BjrB+7mRO5/ajdkEIxNDE4mgv2IL86MEoFx5lcZww16nlXr9rdv2SYRcMhIvuSQRjY51pq1Wr5ME01LsxtfQ6Bht5rIaIAmVZ+L5SX920UEafq0yLGRryqrWhToBIU7JMtgNfitY+ENRW5A1qfsw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from MWHPR1201CA0010.namprd12.prod.outlook.com (2603:10b6:301:4a::20) by CY4PR12MB1271.namprd12.prod.outlook.com (2603:10b6:903:3d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16; Tue, 20 Aug 2019 19:12:25 +0000 Received: from BY2NAM03FT012.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::205) by MWHPR1201CA0010.outlook.office365.com (2603:10b6:301:4a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:25 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by BY2NAM03FT012.mail.protection.outlook.com (10.152.84.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:24 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Aug 2019 14:12:21 -0500 From: David Francis To: , Subject: [PATCH v2 06/14] drm/dp-mst: Use dc and drm helpers to compute timeslots Date: Tue, 20 Aug 2019 15:11:55 -0400 Message-ID: <20190820191203.25807-7-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820191203.25807-1-David.Francis@amd.com> References: <20190820191203.25807-1-David.Francis@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(346002)(39860400002)(396003)(376002)(136003)(2980300002)(428003)(189003)(199004)(81166006)(81156014)(5660300002)(478600001)(8676002)(8936002)(70586007)(50226002)(70206006)(86362001)(50466002)(305945005)(48376002)(51416003)(49486002)(76176011)(476003)(126002)(450100002)(14444005)(53936002)(54906003)(110136005)(16586007)(446003)(426003)(11346002)(336012)(2616005)(186003)(26005)(36756003)(486006)(1076003)(316002)(6666004)(356004)(2906002)(4326008)(47776003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1271; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 031af769-cfa6-4556-a2de-08d725a255cb X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328); SRVR:CY4PR12MB1271; X-MS-TrafficTypeDiagnostic: CY4PR12MB1271: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-Forefront-PRVS: 013568035E X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 4aWc5pAZ4zgmax19dZ/L5cTMHG4AUW2UVvxxbQKUmeGVIaIWi/kZG8pmS9bnU9jzYGLNyuxxTB4bNwJco/BOOr9Hb0EusuXSyLtwHDuFrIfzy6L5RKIL1xFLEuF1OomPPdDIAmJwHaMe4vtXl/POtA6VGi6RCYW7+5MZ9rInRtliS3zC12qSeQ9y2rKs6mDpP4Mjt+Gz2Rurit1lDLwDfXgkYxk+SLNNbAYOBMyo58/qfe0IOZrAq7cd6p2pQ33joJwSnHsgB0GYvCEKQLrGigHBPsVietDqXBV7RCXMeiuJ3RB1jdt7BMAURgBrzBVsTFqxhXFChL0XU1vB9rENK3azaY74sT3rslGLcQBEc4hK9exwDdAYDiX4B4xXniOlPuauiGjEZz/tdgU7WACA1n9MVfENNLbc9c6ZOC7kYQA= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2019 19:12:24.8921 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 031af769-cfa6-4556-a2de-08d725a255cb X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1271 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xWxSdJDCh0chskGh5wL8fWwLYc0o9AVKu+WfRH16CCo=; b=i7i3tJFrv5jC1m5Bys9MWUJ1OGuint9cblCMA56lCbCqyvawMYFB2mBlPlLCQ9oZgP/FJDDNS7Lw+mMhJiFoS3zwu2XqhmhzJkx7+wQc5eIksuo7BppcEi/0Cx9o5OezyDBazKBtecttqqKEQiky5xAOI0EfGctxn/R/IQyA3WQ= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Francis , Jerry Zuo , Nicholas Kazlauskas Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" We were using drm helpers to convert a timing into its bandwidth, its bandwidth into pbn, and its pbn into timeslots These helpers -Did not take DSC timings into account -Used the link rate and lane count of the link's aux device, which are not the same as the link's current cap -Did not take FEC into account (FEC reduces the PBN per timeslot) For converting timing into PBN, add a new function drm_dp_calc_pbn_mode_dsc that handles the DSC case For converting PBN into time slots, amdgpu doesn't use the 'correct' atomic method (drm_dp_atomic_find_vcpi_slots), so don't add a new helper to cover our approach. Use the same means of calculating pbn per time slot as the DSC code. v2: Add drm helper for clock to pbn conversion Cc: Jerry Zuo Cc: Nicholas Kazlauskas Signed-off-by: David Francis --- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 18 +++++--- drivers/gpu/drm/drm_dp_mst_topology.c | 41 +++++++++++++++++++ include/drm/drm_dp_mst_helper.h | 2 +- 3 files changed, 54 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index 5f2c315b18ba..dfa99e0d6e64 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c @@ -189,8 +189,8 @@ bool dm_helpers_dp_mst_write_payload_allocation_table( int slots = 0; bool ret; int clock; - int bpp = 0; int pbn = 0; + int pbn_per_timeslot, bpp = 0; aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context; @@ -208,7 +208,6 @@ bool dm_helpers_dp_mst_write_payload_allocation_table( clock = stream->timing.pix_clk_100hz / 10; switch (stream->timing.display_color_depth) { - case COLOR_DEPTH_666: bpp = 6; break; @@ -234,11 +233,18 @@ bool dm_helpers_dp_mst_write_payload_allocation_table( bpp = bpp * 3; - /* TODO need to know link rate */ - - pbn = drm_dp_calc_pbn_mode(clock, bpp); +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT + if (stream->timing.flags.DSC) + pbn = drm_dp_calc_pbn_mode_dsc(clock, + stream->timing.dsc_cfg.bits_per_pixel); + else +#endif + pbn = drm_dp_calc_pbn_mode(clock, bpp); - slots = drm_dp_find_vcpi_slots(mst_mgr, pbn); + /* Convert kilobits per second / 64 (for 64 timeslots) to pbn (54/64 megabytes per second) */ + pbn_per_timeslot = dc_link_bandwidth_kbps( + stream->link, dc_link_get_link_cap(stream->link)) / (8 * 1000 * 54); + slots = DIV_ROUND_UP(pbn, pbn_per_timeslot); ret = drm_dp_mst_allocate_vcpi(mst_mgr, mst_port, pbn, slots); if (!ret) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 398e7314ea8b..d789b7af7dbf 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -3588,6 +3588,47 @@ static int test_calc_pbn_mode(void) return 0; } +/** + * drm_dp_calc_pbn_mode_dsc() - Calculate the PBN for a mode with DSC enabled. + * @clock: dot clock for the mode + * @dsc_bpp: dsc bits per pixel x16 (e.g. dsc_bpp = 136 is 8.5 bpp) + * + * This uses the formula in the spec to calculate the PBN value for a mode, + * given that the mode is using DSC + */ +int drm_dp_calc_pbn_mode_dsc(int clock, int dsc_bpp) +{ + u64 kbps; + s64 peak_kbps; + u32 numerator; + u32 denominator; + + kbps = clock * dsc_bpp; + + /* + * margin 5300ppm + 300ppm ~ 0.6% as per spec, factor is 1.006 + * The unit of 54/64Mbytes/sec is an arbitrary unit chosen based on + * common multiplier to render an integer PBN for all link rate/lane + * counts combinations + * calculate + * peak_kbps *= (1/16) bppx16 to bpp + * peak_kbps *= (1006/1000) + * peak_kbps *= (64/54) + * peak_kbps *= 8 convert to bytes + * + * Divide numerator and denominator by 16 to avoid overflow + */ + + numerator = 64 * 1006 / 16; + denominator = 54 * 8 * 1000 * 1000; + + kbps *= numerator; + peak_kbps = drm_fixp_from_fraction(kbps, denominator); + + return drm_fixp2int_ceil(peak_kbps); +} +EXPORT_SYMBOL(drm_dp_calc_pbn_mode_dsc); + /* we want to kick the TX after we've ack the up/down IRQs. */ static void drm_dp_mst_kick_tx(struct drm_dp_mst_topology_mgr *mgr) { diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h index 2ba6253ea6d3..ddb518f2157a 100644 --- a/include/drm/drm_dp_mst_helper.h +++ b/include/drm/drm_dp_mst_helper.h @@ -611,7 +611,7 @@ struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_ int drm_dp_calc_pbn_mode(int clock, int bpp); - +int drm_dp_calc_pbn_mode_dsc(int clock, int dsc_bpp); bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, int pbn, int slots); From patchwork Tue Aug 20 19:11:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Francis X-Patchwork-Id: 11104533 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 690AE112C for ; Tue, 20 Aug 2019 19:12:38 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4FF422082F for ; Tue, 20 Aug 2019 19:12:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4FF422082F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0ABC96E863; Tue, 20 Aug 2019 19:12:30 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0623.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::623]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3257D6E864; Tue, 20 Aug 2019 19:12:28 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NCdY+AOPcTz6yLBodknLWKITCTlVlT5gwarkFb37zlV3ak5DGdMUAXD4lqKTKjgoT0e2UEPnY5JJaYR/tZ/CWSJsjWc3Ttu7/7N36D7wWq7G4G3NNsJJ3hqQL2vHBuh2Cpj8+oXAZhoIlDZCtrGH9DTa7//ITFC+xXj44fNbRxUTE3zTvfOimfb+N/PmOcG5MQASpfAwU/69+f76kfgdZw/PYIWZ1Vp++t+t+cudrnlY/gZlWn+3Pp16cIsHCQjPw3OVN8BCzq1WV8ifwiceUKPGtubPnVtJdToJNq24fr0aWyUFKJW9OJazNpZkumLpcpIHiMjBAUteWTjgkO6iOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=B6lcmM8IbjEeihjHuyWQ0gbYWu4vsd2VOF/WuQZds0Y=; b=nLoujRfVhlt0aIFiCXH4gPhlKvJUWYLL6cRAMFe9IIBxYnskMxUqnhsRYywJUIhzSY35I+T1ufgAWPCwNXR0bbD+DDqDWLeqUhcF6WsJ5Drhwm0DPAAxF+AK55DfKimzwgU7Rrzh2+6dUEyOYWiMzV1+DZ9ZoVecp5DQ9kP2sFGtZxTNmCRuTLwb6RaTSo/PDlgKEtKw9Y/9zBpQ20HMWkLZxARzVrvweeQ7JPQfr1bn6/DrK/PpWFGV4txluKMaZtIfMu2chl8smHttaLIJW9rA1DpB71sV9iJJcHgqg8Td048ysCamxRRwo3COIwxMMRgEQgwmDDYIkzw+3f9Dpw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from MWHPR1201CA0010.namprd12.prod.outlook.com (2603:10b6:301:4a::20) by DM6PR12MB2714.namprd12.prod.outlook.com (2603:10b6:5:49::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.18; Tue, 20 Aug 2019 19:12:26 +0000 Received: from BY2NAM03FT012.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::205) by MWHPR1201CA0010.outlook.office365.com (2603:10b6:301:4a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:26 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by BY2NAM03FT012.mail.protection.outlook.com (10.152.84.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:25 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Aug 2019 14:12:22 -0500 From: David Francis To: , Subject: [PATCH v2 07/14] drm/amd/display: Initialize DSC PPS variables to 0 Date: Tue, 20 Aug 2019 15:11:56 -0400 Message-ID: <20190820191203.25807-8-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820191203.25807-1-David.Francis@amd.com> References: <20190820191203.25807-1-David.Francis@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(396003)(136003)(376002)(346002)(2980300002)(428003)(189003)(199004)(50226002)(450100002)(48376002)(8936002)(49486002)(81166006)(50466002)(16586007)(70206006)(4326008)(110136005)(70586007)(86362001)(8676002)(47776003)(316002)(6666004)(5660300002)(356004)(1076003)(53936002)(26005)(36756003)(486006)(11346002)(476003)(81156014)(2616005)(446003)(426003)(336012)(186003)(126002)(478600001)(51416003)(2906002)(76176011)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR12MB2714; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a0784095-d6f6-4f94-cc2a-08d725a25650 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328); SRVR:DM6PR12MB2714; X-MS-TrafficTypeDiagnostic: DM6PR12MB2714: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:345; X-Forefront-PRVS: 013568035E X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 90Z1z+M81sWL/YZuWlVtt0OUBwSiY2PXBFSr9CM6QnJbAtlyd+DJZDJCKxmcW0LJOy7Gka23fimFy/lmYBj1rvRYZB5mga6jThGvsD5zpG+sUbWycUjeoS30fMRJbAqILTZmYHeVGlGMdzFVxf6GA7/RHeGMbTUUkHrkTS0UHYWofMbgZKbjRL2APzeknAw8GaiJzPL3qQwed5YG95/mUVB5AQOVgBSKuGrUY6iP75MqlmE5F/QPRdFQOLNB21fjlMu6YLS+SyjhxIawTcexnNZytp4cLr+RbSuiWpPT5BGQZ/dTSRHuvpV6mE5BUvnRHfSsRF9VjHKL0Im1GtwHjdvknktbggY+PV65q8XHP99UF9xO4tJRIbanaZaa5jwLP0EVnDmEq7VO6tE9RNKSswm5XXVgTgEt1aqoF5i0XYM= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2019 19:12:25.7528 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a0784095-d6f6-4f94-cc2a-08d725a25650 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB2714 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=B6lcmM8IbjEeihjHuyWQ0gbYWu4vsd2VOF/WuQZds0Y=; b=qLKlrit7IfHh0wBNSZ7g+YjY/ptveYIQUjqlTjHZkUgeOWwVOy4nshQ4xtwWs7/ZaH0dpy7b4UXK69IIpigoI9YRcX0IC9l1bzASUCwapjXyi6xcr+k3muu4oDJI9Hqan7vnYFrkEYUXb4RF+ZF2X1uWL4XJ4IGuGOcLTwWV1lY= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Francis Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" For DSC MST, sometimes monitors would break out in full-screen static. The issue traced back to the PPS generation code, where these variables were being used uninitialized and were picking up garbage. memset to 0 to avoid this Signed-off-by: David Francis Reviewed-by: Nicholas Kazlauskas --- drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 3 +++ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c index 35c5467e60e8..619ac48edd05 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c @@ -491,6 +491,9 @@ bool dp_set_dsc_pps_sdp(struct pipe_ctx *pipe_ctx, bool enable) struct dsc_config dsc_cfg; uint8_t dsc_packed_pps[128]; + memset(&dsc_cfg, 0, sizeof(dsc_cfg)); + memset(dsc_packed_pps, 0, 128); + /* Enable DSC hw block */ dsc_cfg.pic_width = stream->timing.h_addressable + stream->timing.h_border_left + stream->timing.h_border_right; dsc_cfg.pic_height = stream->timing.v_addressable + stream->timing.v_border_top + stream->timing.v_border_bottom; diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c index 379c9e4ac63b..16debe6d89f2 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c @@ -207,6 +207,9 @@ static bool dsc2_get_packed_pps(struct display_stream_compressor *dsc, const str struct dsc_reg_values dsc_reg_vals; struct dsc_optc_config dsc_optc_cfg; + memset(&dsc_reg_vals, 0, sizeof(dsc_reg_vals)); + memset(&dsc_optc_cfg, 0, sizeof(dsc_optc_cfg)); + DC_LOG_DSC("Getting packed DSC PPS for DSC Config:"); dsc_config_log(dsc, dsc_cfg); DC_LOG_DSC("DSC Picture Parameter Set (PPS):"); From patchwork Tue Aug 20 19:11:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Francis X-Patchwork-Id: 11104539 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 69C37112C for ; Tue, 20 Aug 2019 19:12:46 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 51AA72082F for ; Tue, 20 Aug 2019 19:12:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 51AA72082F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 05FD26E872; Tue, 20 Aug 2019 19:12:33 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM05-CO1-obe.outbound.protection.outlook.com (mail-eopbgr720075.outbound.protection.outlook.com [40.107.72.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0D6476E86C; Tue, 20 Aug 2019 19:12:29 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gkuQy59GUj3DytRl/eToJPOh8WaOVP6mMy9r2QAdbtCtosIHdz3/MxdpmOnGxInTTUkAotau9iQ99+MYPOHwIhgj0Vlr8xsrqxW7+2U9nCH2J3XyzXNlAbPw5w+6AgSFIoMu2qetQ/KJHOuaPM2T00xM8iZeAfR9fPqRIqCjy/v0z9U5Ml4mqGwTMc/24XdiyFgI31jyRrGu2GGs2o529r0E0/rcXeqaN18oB0eYOb1cNohErhwjwuMmFvhzkn69Z+0f+l9d3yitaBXeddh/Y9mpJjO4XEqX9klAwwxhl+Wj2+0xwm/DNcYDCQ6tivYjVo5TwDyz2vtKSRfA8rfV2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CtCR6fWKI+boeE4sxEqRXhuPFOL/DaxNEvcfqpsdLf8=; b=AwRqCHOwrkeb39XKaBv/bCC9sIrkEiXGbFQBKdM9LYzITggehMUSZKdulnuPxOcoFmmcHbQkTzio04a4zhHqy6xR5N+FYgLcJO63G8ExreI4zuDwQvmFp7RrXMSn2Gj/pyFIqBHjDCPL0eTiIoO8LcqErNxs0TN+fIiA7M+n/oeyo8D0U6Vnuh/B06WAOWInBCtLuSmeirgVCbRxXYS4qs6ril2FxtgZeV2K1CyBg88tdBsb5SavpTTMsz3nWvO9N1r4JWlYmslo8C0yw1n5/YPcwbJM0QSs1+oRDXgjX1IUg8atuhaqzuJ3QW98vSaNJ25EswIr+Y0+a6LAZnfMVQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from MWHPR1201CA0010.namprd12.prod.outlook.com (2603:10b6:301:4a::20) by DM5PR12MB1276.namprd12.prod.outlook.com (2603:10b6:3:79::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16; Tue, 20 Aug 2019 19:12:27 +0000 Received: from BY2NAM03FT012.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::205) by MWHPR1201CA0010.outlook.office365.com (2603:10b6:301:4a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:27 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by BY2NAM03FT012.mail.protection.outlook.com (10.152.84.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:26 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Aug 2019 14:12:23 -0500 From: David Francis To: , Subject: [PATCH v2 08/14] drm/dp-mst: Parse FEC capability on MST ports Date: Tue, 20 Aug 2019 15:11:57 -0400 Message-ID: <20190820191203.25807-9-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820191203.25807-1-David.Francis@amd.com> References: <20190820191203.25807-1-David.Francis@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(346002)(39860400002)(376002)(136003)(396003)(2980300002)(428003)(189003)(199004)(450100002)(76176011)(4326008)(16586007)(316002)(426003)(486006)(11346002)(446003)(126002)(476003)(53936002)(81156014)(8676002)(5660300002)(110136005)(2616005)(49486002)(81166006)(50226002)(36756003)(8936002)(478600001)(186003)(26005)(1076003)(47776003)(2906002)(86362001)(336012)(50466002)(51416003)(70586007)(6666004)(305945005)(48376002)(356004)(70206006); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB1276; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5e2858e3-f1ff-4a9b-8172-08d725a256e9 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328); SRVR:DM5PR12MB1276; X-MS-TrafficTypeDiagnostic: DM5PR12MB1276: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-Forefront-PRVS: 013568035E X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: +OSbyFJ46oUiZA4GtcgamQ+dd8cVIeLs3eK3ZTOuknqOBbD+JVta5BH7E+QMDLUp64SK/QSgyiOeYY/ZsR2d+SFj2hb3R+YZZ7ABepdxumsTd8sAk8LBPkW9bLZGi+QPBKBBDe2vzii7nE3qrUW8CJuE9PZQ3uxCaK0C5PUqOdSAtOYaSZVju9ISIIQhKGHjxYAmYKdJsc/yZVCk8wjrFU7AMy9oWmxsgRx6qzy7RdQc20aIUdUwBV6WPZGIx/OjVC3ePpZA5/IHS+l1HRnwEB9QD6kBo/ZrvGWsmyy5HgYQL4bIygL3eONtaVbCDjmhrmsO78ra8hP/L0iS9/JPurUQnsUjcckvYXJ0azYjOBxTnfbdGiPNnPVGcchA2RJyd2NFryrtQVhclCizwI5r7/S6pxHrNOkhpORZm/cDq00= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2019 19:12:26.7656 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5e2858e3-f1ff-4a9b-8172-08d725a256e9 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1276 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CtCR6fWKI+boeE4sxEqRXhuPFOL/DaxNEvcfqpsdLf8=; b=TDAuzcuqff6DDl7w20Vc9Zs5mbaH9ijOs/eSKdy7zoVffFkmyiOVkOjAMy69cPgQfOX5vubhVFfKHBJUVBVnLsPgUGH7KN5H6InaxEgOTfvi/Q+/DCatxjqKnr+Hy7BNdg45P8oTMhMsRkORO5YwykLfLo7U4KRBJ7NBILg/QrM= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Francis Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" As of DP1.4, ENUM_PATH_RESOURCES returns a bit indicating if FEC can be supported up to that point in the MST network. The bit is the first byte of the ENUM_PATH_RESOURCES ack reply, bottom-most bit (refer to section 2.11.9.4 of DP standard, v1.4) That value is needed for FEC and DSC support Store it on drm_dp_mst_port Signed-off-by: David Francis Reviewed-by: Lyude Paul --- drivers/gpu/drm/drm_dp_mst_topology.c | 2 ++ include/drm/drm_dp_mst_helper.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index d789b7af7dbf..b40d975aec76 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -552,6 +552,7 @@ static bool drm_dp_sideband_parse_enum_path_resources_ack(struct drm_dp_sideband { int idx = 1; repmsg->u.path_resources.port_number = (raw->msg[idx] >> 4) & 0xf; + repmsg->u.path_resources.fec_capable = raw->msg[idx] & 0x1; idx++; if (idx > raw->curlen) goto fail_len; @@ -2180,6 +2181,7 @@ static int drm_dp_send_enum_path_resources(struct drm_dp_mst_topology_mgr *mgr, DRM_DEBUG_KMS("enum path resources %d: %d %d\n", txmsg->reply.u.path_resources.port_number, txmsg->reply.u.path_resources.full_payload_bw_number, txmsg->reply.u.path_resources.avail_payload_bw_number); port->available_pbn = txmsg->reply.u.path_resources.avail_payload_bw_number; + port->fec_capable = txmsg->reply.u.path_resources.fec_capable; } } diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h index ddb518f2157a..fa973773a4a7 100644 --- a/include/drm/drm_dp_mst_helper.h +++ b/include/drm/drm_dp_mst_helper.h @@ -108,6 +108,8 @@ struct drm_dp_mst_port { * audio-capable. */ bool has_audio; + + bool fec_capable; }; /** @@ -312,6 +314,7 @@ struct drm_dp_port_number_req { struct drm_dp_enum_path_resources_ack_reply { u8 port_number; + bool fec_capable; u16 full_payload_bw_number; u16 avail_payload_bw_number; }; From patchwork Tue Aug 20 19:11:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Francis X-Patchwork-Id: 11104537 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B66A213B1 for ; Tue, 20 Aug 2019 19:12:44 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9E7712082F for ; Tue, 20 Aug 2019 19:12:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9E7712082F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 524FD6E866; Tue, 20 Aug 2019 19:12:32 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-eopbgr790055.outbound.protection.outlook.com [40.107.79.55]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2613B6E866; Tue, 20 Aug 2019 19:12:30 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OHgeXu6/+47P01MrznAIRUYt5EtGyO0wJS+ymn3dNaP7YGHMw//c4oKLzq30Du7R3f0ppsdxW6OEu/afgpQbm1579pxTcbA03k/O56D8RoJHdznakpOxf5yU8yFV0POaGJSMOdQV35PRCY08oec65OEXBXlFPOCLp2GsgfhCfnxL6ujqIsDK1f1mfXhLKvXd/4h91DLpotgEa+Ut9MZ91qdhOL+rqfm4bwLBjYAuqn5cPmN+wyuXR9dZOrvl+WL0UsOVC9VU8TqY8P39dTwHD9UEyMwlcDwOB6fCJgSqa0B+Pp7WZq1iYMjseXVFxSYTlx1y3XuE6NJlh3NyetZ+Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lzTeIu1BntjAS6locUam6LE1vFmGohGNBgHeqnseT3A=; b=eumIPNHkesb0eZtsQ7grkzl2IdZP1QB7RhLCiDZnJ6eAgCOG9SipRC3isHK7A4DUjRmX0sZL50C1APzBAlaSTVEzbv8KOSeLP2GF9yCqcJFAiZDuE1nzhzkFdwFI+ckE6wvIP5TcTF/QxLnX+1b/IiuidOToaW+VwP/dDghU3znNCXMAZVS5NVdYVfB0hGQEjbFylArxjhh/r8rE0OAjWqBIR8t8m+dbXuPFZIMzBKgDTBojJleSu/YMyUg7GOjvvs4QVTs6CHnN3io4bKNAc4TgKUQ34MEfeyG0V+ctr8m5HoIN/PhNlkdu2kHn4+HKnF7xBApQxvkb11tno/0VDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from MWHPR1201CA0010.namprd12.prod.outlook.com (2603:10b6:301:4a::20) by BN7PR12MB2705.namprd12.prod.outlook.com (2603:10b6:408:25::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.18; Tue, 20 Aug 2019 19:12:28 +0000 Received: from BY2NAM03FT012.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::205) by MWHPR1201CA0010.outlook.office365.com (2603:10b6:301:4a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:27 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by BY2NAM03FT012.mail.protection.outlook.com (10.152.84.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:27 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Aug 2019 14:12:24 -0500 From: David Francis To: , Subject: [PATCH v2 09/14] drm/dp-mst: Export symbols for dpcd read/write Date: Tue, 20 Aug 2019 15:11:58 -0400 Message-ID: <20190820191203.25807-10-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820191203.25807-1-David.Francis@amd.com> References: <20190820191203.25807-1-David.Francis@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(376002)(396003)(39860400002)(136003)(346002)(2980300002)(428003)(199004)(189003)(450100002)(6666004)(50466002)(336012)(356004)(48376002)(50226002)(5660300002)(53936002)(16586007)(47776003)(316002)(2906002)(110136005)(478600001)(305945005)(76176011)(186003)(51416003)(26005)(4326008)(70206006)(36756003)(81166006)(81156014)(70586007)(1076003)(49486002)(486006)(8936002)(86362001)(4744005)(476003)(11346002)(446003)(426003)(126002)(2616005)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN7PR12MB2705; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4def1dfa-2823-46b7-dd27-08d725a25768 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600148)(711020)(4605104)(1401327)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328); SRVR:BN7PR12MB2705; X-MS-TrafficTypeDiagnostic: BN7PR12MB2705: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3826; X-Forefront-PRVS: 013568035E X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: DtyOdje9N/+c6tvl4mysMowdaExgXdVtoF7GCvXYNZF5VcLYIxIRbUetLb6JHlFesfKK9Q+jDRodFcGeTrHOWHqWtB+PI/roBx2W8Rj572i1DNagpJz8WAdYyIsV7bFGsVaNxFxZR7gekluDWE2JeTNjISHIUrxTOslIe7J+r3DGOV33QGrFe4cE9onuORA0CbZ0GmQuH7/aUk3RCZyKxMUWE1CzABlpW3eGL3Dj4AOjI6zaGJofQDHoHaePP1N/d0ACy5NshFRqVRDiDghc/d/Dw2M1z0JmHbMadUo/qCfI1Bpl2PrYvw0515zyjrtIPyemtexC9uoyBMS26D9OrPnAcWOjWUHDieRk3ULUVRiyj2xqLqmYntFPlLGmTBnulEbq7sUbJoySIcPqlfwgBPWl/A0O26GclbmGwgTpxn0= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2019 19:12:27.5662 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4def1dfa-2823-46b7-dd27-08d725a25768 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR12MB2705 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lzTeIu1BntjAS6locUam6LE1vFmGohGNBgHeqnseT3A=; b=O52tREZuSkMg1eKtINKWn8z2d9tZYUK0I5n95wgemQDZDd+1Oaxu1lMDh40qTTUtgohttgdFE+IJagMVtx98K2ZZsE8QuL1tpt9DECTM1cNajvx6TMOh2gfW+VljaAU3YLU8Jhj+3MwfhmwMGM51mXIIj4SDjC1gKGdy8HcF/oU= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Francis Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To use these functions in drm driver directories, they must be exported Signed-off-by: David Francis --- drivers/gpu/drm/drm_dp_mst_topology.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index b40d975aec76..5d5bd42da17c 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -1512,6 +1512,7 @@ ssize_t drm_dp_mst_dpcd_read(struct drm_dp_aux *aux, return drm_dp_send_dpcd_read(port->mgr, port, offset, size, buffer); } +EXPORT_SYMBOL(drm_dp_mst_dpcd_read); /** * drm_dp_mst_dpcd_write() - write a series of bytes to the DPCD via sideband @@ -1535,6 +1536,7 @@ ssize_t drm_dp_mst_dpcd_write(struct drm_dp_aux *aux, return drm_dp_send_dpcd_write(port->mgr, port, offset, size, buffer); } +EXPORT_SYMBOL(drm_dp_mst_dpcd_write); static void drm_dp_check_mstb_guid(struct drm_dp_mst_branch *mstb, u8 *guid) { From patchwork Tue Aug 20 19:11:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Francis X-Patchwork-Id: 11104543 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 08A5B13B1 for ; Tue, 20 Aug 2019 19:12:52 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E495C22DD3 for ; Tue, 20 Aug 2019 19:12:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E495C22DD3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 03A3D6E877; Tue, 20 Aug 2019 19:12:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-eopbgr790070.outbound.protection.outlook.com [40.107.79.70]) by gabe.freedesktop.org (Postfix) with ESMTPS id 03E4E6E869; Tue, 20 Aug 2019 19:12:31 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SL1IUcC0F4MUJZljaFIdxUY1QE4Fup/ADgMNYlkIoDqpEkOgUDcpwj3xrc9DtI7AVmAjnU1X0ji0gHR2WEhewKdN98xk6hZsNvM/laJC2rPFPBvo5gu9doU3p0KHdAExaIsgsZzfD1mpC5GHNZCENiFlzcZAfHZlFfUAeiZsFtVfP+OVOfIfXS2ZpOq7mZKtW0bbOKMFJf+DnrFRSahgU6f3kj4/+Eosttj/DBopS+1HjD50IwBwTQ5acxP4jYo/Oyi2hksJbVwiuOQKvWbdjEwGGfgQSXjm/p6cP1nEXJNaXWElpQHrN8NivdJecavDo9nWblxOD1CcfNP4xElscQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pNjshlRcUanOJLgfR8aBbtgXRdOIki4lcUKdbU+enwI=; b=gR83tDWZy36nUG+S9AN6f3tICkUaK5XWK9xBLG1K8iHvWalnx3b8LPRLmWD+/8LN82uvT2Ke4cjfiR+b3WQSdPJYXMnTZt+0/FzmdQ+BOJ56oQ7EEl7zI0ZVuAKoYvUzg+TRxUWTA1yPdqtQh0bxSLGoBaTZ5cKDaadu3lAv3+DZQ6W4KbuUG9AfKWDpQMjUDRaSfDwMrfnad9MIjrhZ9LwnxhNaHbnd7Q6v2BLYQ4Jjy/lfWpqBGVasnZY+egK7LBLovfZobrNgS26EwO1ACkBE8kc5PQzxWscSyHQAWUiHnseULMLoKnVwZhZbl5LlrI+17RoR+WdzhFQkfyV2Fw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from MWHPR1201CA0010.namprd12.prod.outlook.com (2603:10b6:301:4a::20) by MWHPR12MB1278.namprd12.prod.outlook.com (2603:10b6:300:10::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.18; Tue, 20 Aug 2019 19:12:29 +0000 Received: from BY2NAM03FT012.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::205) by MWHPR1201CA0010.outlook.office365.com (2603:10b6:301:4a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:29 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by BY2NAM03FT012.mail.protection.outlook.com (10.152.84.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:29 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Aug 2019 14:12:25 -0500 From: David Francis To: , Subject: [PATCH v2 10/14] drm/dp-mst: Fill branch->num_ports Date: Tue, 20 Aug 2019 15:11:59 -0400 Message-ID: <20190820191203.25807-11-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820191203.25807-1-David.Francis@amd.com> References: <20190820191203.25807-1-David.Francis@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(136003)(346002)(376002)(396003)(2980300002)(428003)(199004)(189003)(476003)(11346002)(51416003)(446003)(76176011)(2616005)(1076003)(426003)(2906002)(86362001)(16586007)(49486002)(48376002)(336012)(70206006)(70586007)(486006)(316002)(110136005)(126002)(50466002)(478600001)(81156014)(4326008)(305945005)(36756003)(6666004)(356004)(5660300002)(81166006)(450100002)(8936002)(26005)(8676002)(186003)(50226002)(14444005)(47776003)(4744005)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR12MB1278; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 75259ea2-8bdf-4f17-cd9a-08d725a25868 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600148)(711020)(4605104)(1401327)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328); SRVR:MWHPR12MB1278; X-MS-TrafficTypeDiagnostic: MWHPR12MB1278: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2276; X-Forefront-PRVS: 013568035E X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: Hv3o1UA8QVNdAIr7w2N+oJAAUSRdvsEs91yV4BNLd9wiW4cxetbgoKkHIfhWbB8ge6S2e4JYpUCSVDJDNNOYomSAD7pJaPi2LOpfR6gBwBWebxJ4huyCERmCz0zgkJlKTBevbGLlzarGABxCjt8ASv9vz1Bthv//0KBfbyRunxgkt5m3zN7giAIaO36LHox2o62wNPjXsTH7ptP4+naC3WG1iSBjFsmmOmjOWLZ4W+cq0LcFDTzVrn2d9ghOCqBRAdEiQD+bsF7uVcshNzOp/muqr8FGbwJcI0rJ8PxMbDppsYov9EDS/Lrv6SyVpHGXJxw9ZTo8OYON7jaXpZzyipn8Po55YJAMrYdaG6Rz6uD+OOzsa6FKIg99uOZrcJNBJnVJ5qp0jgj5BUmeNK3O4U3wt2cOWCVMAGLICMleVFs= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2019 19:12:29.2756 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 75259ea2-8bdf-4f17-cd9a-08d725a25868 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1278 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pNjshlRcUanOJLgfR8aBbtgXRdOIki4lcUKdbU+enwI=; b=4gn2NP+bWf7BIQkvzNwu2cQ4cAexyVCmfCf4SX52is3s+soxTR+WpNXp2EcmHYZVTlqDymyIAYc/qNiv9nqDZF1rZem6hCqKTMFhQUz7H87SnnxZHQJa1AGwIBQDLBVqzCQsTBVt994H3nV30Hg9HYQdkwkwcOjI24O+WN0yb00= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Francis Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This field on drm_dp_mst_branch was never filled Initialize it to zero when the list of ports is created. When a port is added to the list, increment num_ports Signed-off-by: David Francis Reviewed-by: Lyude Paul --- drivers/gpu/drm/drm_dp_mst_topology.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 5d5bd42da17c..0c580d5279c1 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -918,6 +918,7 @@ static struct drm_dp_mst_branch *drm_dp_add_mst_branch_device(u8 lct, u8 *rad) INIT_LIST_HEAD(&mstb->ports); kref_init(&mstb->topology_kref); kref_init(&mstb->malloc_kref); + mstb->num_ports = 0; return mstb; } @@ -1672,6 +1673,7 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb, mutex_lock(&mstb->mgr->lock); drm_dp_mst_topology_get_port(port); list_add(&port->next, &mstb->ports); + mstb->num_ports++; mutex_unlock(&mstb->mgr->lock); } From patchwork Tue Aug 20 19:12:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Francis X-Patchwork-Id: 11104549 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D4AF313B1 for ; Tue, 20 Aug 2019 19:12:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BCE542339D for ; Tue, 20 Aug 2019 19:12:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BCE542339D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C94206E875; Tue, 20 Aug 2019 19:12:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-eopbgr780048.outbound.protection.outlook.com [40.107.78.48]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2E11F6E871; Tue, 20 Aug 2019 19:12:32 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CgekKhlEPvMZwPpTQC5ugjDQG9aDYKo2r+vvVydH0lIP9AdhFBOoZKFL/q6V4u9KVKf5sXAW9JBQ/0XGR/60olZTAR7WPt9FE8DamZvurjhnTO10RG+6xq7X6JaFeRJs1WO+hnkyNDi4cAIECuKZle20n0taMoILVUq0wrb43rVt+b4BNMLk4IvxFpAwuwre1bqwz7h1OdqEF761IE2EQcNlOxvwpZvsimFUPOdg+yLuv4gE5XUg+9ikg1r0GnRteWbeSsmRdw7+Ps67xvxPyL7BadQb3wku+wFecfH2Nb1DW6rFnT91tK4PTMp0Sbmado9akwAZN4M/5DB4vx3ZbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RUEEM2d6WZBmN3Dott5Eu5Hr40MSNGSkPWQ84FFXrgg=; b=Ldnd8pkqvzwZAZoGIKG4ngjXyNNFRZfQ6fET8D0hwYUs4xCCv6sARB8AfMKHJu16YvswO1t3MN3YK9U5tJiQdf1IBdBKAafXGqO9kyvCQambapVutOZ11R2ytl/6y6qfuXmkX0uKS7YS1UdMtoE/zF4JF/7zZs643e6VANDzn6VUcvAanxiTnIFcr9MclxGhDrjosXoLAe4pj9X1xSHAd7903wK8hpW9QX4vatDKPSyZt9eZoLqUbtHmcSc/Efnkqyz5DRG/UgGenW6AyyJaE8fSxrbKABfh3RizLudKoLUCTtOsNmICjkBP9zAsKxMRBczoCG+fdF42Tjzk2Ut8nw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from MWHPR1201CA0010.namprd12.prod.outlook.com (2603:10b6:301:4a::20) by SN6PR12MB2719.namprd12.prod.outlook.com (2603:10b6:805:70::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16; Tue, 20 Aug 2019 19:12:30 +0000 Received: from BY2NAM03FT012.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::205) by MWHPR1201CA0010.outlook.office365.com (2603:10b6:301:4a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:30 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by BY2NAM03FT012.mail.protection.outlook.com (10.152.84.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:30 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Aug 2019 14:12:26 -0500 From: David Francis To: , Subject: [PATCH v2 11/14] drm/amd/display: Validate DSC caps on MST endpoints Date: Tue, 20 Aug 2019 15:12:00 -0400 Message-ID: <20190820191203.25807-12-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820191203.25807-1-David.Francis@amd.com> References: <20190820191203.25807-1-David.Francis@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(136003)(39860400002)(396003)(376002)(346002)(2980300002)(428003)(199004)(189003)(81156014)(50226002)(16586007)(81166006)(316002)(15650500001)(2906002)(450100002)(305945005)(8936002)(47776003)(6666004)(446003)(478600001)(476003)(86362001)(486006)(36756003)(426003)(11346002)(2616005)(70586007)(70206006)(356004)(49486002)(8676002)(4326008)(336012)(53936002)(126002)(50466002)(1076003)(76176011)(54906003)(51416003)(5660300002)(5024004)(14444005)(26005)(110136005)(186003)(48376002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR12MB2719; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 22900b48-e869-4359-a62f-08d725a25903 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600148)(711020)(4605104)(1401327)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328); SRVR:SN6PR12MB2719; X-MS-TrafficTypeDiagnostic: SN6PR12MB2719: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-Forefront-PRVS: 013568035E X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: tIGTpnAfUSlpE2YV95mvSrlhIUdWhfXPLQ772Fy0KXoZGjsqwYCjt0hod7g90E4PSCrE8UY3olWipnv1Xla+OHM3Z94UenWRAz+H+EKaVAFfnkb/M1+rYxZ2ALM4vSUaZf3LT2aV2O0x3as3ThTHZB09qAizvzKMOaH3GLwhKpRl0I7C91Miib0JD6lKHFJCquzS85nZXapXqzx/J607Io+WapXRMWTpPL21Lbt1Ot5ceo9oGNdG0wiEUce9p4PbStmiswJDIyZ2U5fSuAJUl9nCMJZx6K778H97OoDJooZEwUldp08IuZIdwk52eWVgk/J5l+lUQSjbIYCHkB6VhXarzEkQHqPJAH55qcrxUXoH/eVN5mUIQ6oIxE86bQ37M+9nC9i5dsDtsmMNuiWsmb7qmHvu/AFE06SzdimXrY4= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2019 19:12:30.3004 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 22900b48-e869-4359-a62f-08d725a25903 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2719 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RUEEM2d6WZBmN3Dott5Eu5Hr40MSNGSkPWQ84FFXrgg=; b=gzFkNI9LIsiMILYvKv1AXwruJfs1dGRqByjOrgJtYLw8GeDVg1R0F5TTvGlfolQIoUPs1sQV+DEQmBQjRJvFeBHGa3C5iMSJ0I6URIear0qzFTdoY9vvjvSQpgOdWdc43bV6j2myTgRENcTVCSYh4SYgCP7+bNK39rh2+NamGm4= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Francis , Wenjing Liu , Nikola Cornij Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The first step in MST DSC is checking MST endpoints to see how DSC can be enabled Case 1: DP-to-DP peer device if the branch immediately upstream has - PDT = DP_PEER_DEVICE_DP_MST_BRANCHING (2) - DPCD rev. >= DP 1.4 - Exactly one input and one output - The output has PDT = DP_PEER_DEVICE_SST_SINK (3) In this case, DSC could be possible either on the endpoint or the peer device. Prefer the endpoint, which is possible if - The endpoint has DP_DSC_DECOMPRESSION_IS_SUPPORTED bit set - The endpoint has DP_FEC_CAPABLE bit set - The peer device has DSC_PASSTHROUGH_CAPABILITY bit set (from DP v2.0) Otherwise, use the peer device Case 2: DP-to-HDMI peer device If the output port has - PDT = DP_PEER_DEVICE_DP_LEGACY_CONV (4) - DPCD rev. >= DP 1.4 - LDPS = true - MCS = false In this case, DSC can only be attempted on the peer device (the output port) Case 3: Virtual DP Sink (Internal Display Panel) If the output port has - DPCD rev. >= DP 1.4 - port_num >= 8 In this case, DSC can only be attempted on the peer device (the output port) Case 4: Synaptix Workaround If the output has - link DPCD rev. >= DP 1.4 - link branch_dev_id = 0x90CC24 (Synaptix) - There is exactly one branch device between the link and output In this case, DSC can be attempted, but only using the *link* aux device's caps. This is a quirk. Test for these cases as modes are enumerated for an MST endpoint. We cannot do this during link attach because the dc_sink object will not have been created yet If no DSC is attempted, zero the DSC caps Cc: Wenjing Liu Cc: Nikola Cornij Signed-off-by: David Francis --- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 123 +++++++++++++++++- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 3 + 2 files changed, 125 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index 16218a202b59..58571844f6d5 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c @@ -25,6 +25,7 @@ #include #include +#include #include "dm_services.h" #include "amdgpu.h" #include "amdgpu_dm.h" @@ -189,6 +190,120 @@ static const struct drm_connector_funcs dm_dp_mst_connector_funcs = { .early_unregister = amdgpu_dm_mst_connector_early_unregister, }; +bool is_virtual_dpcd(struct drm_dp_mst_port *port) +{ + struct drm_dp_mst_port *downstream_port; + + if (!port) + return false; + + if (port->port_num >= 8 && + port->dpcd_rev >= DP_DPCD_REV_14) { + /* Virtual DP Sink (Internal Display Panel) */ + return true; + } else if (port->pdt == DP_PEER_DEVICE_DP_LEGACY_CONV && + !port->mcs && + port->ldps && + port->dpcd_rev >= DP_DPCD_REV_14) { + /* DP-to-HDMI Protocol Converter */ + return true; + } else if (port->pdt == DP_PEER_DEVICE_MST_BRANCHING && + port->mstb && + port->dpcd_rev >= DP_DPCD_REV_14) { + /* DP-to-DP */ + if (port->mstb->num_ports == 2) { + list_for_each_entry(downstream_port, &port->mstb->ports, next) { + if (!downstream_port->input && + downstream_port->pdt == DP_PEER_DEVICE_SST_SINK) + return true; + } + } + } + return false; +} + +bool synaptix_workaround(struct amdgpu_dm_connector *aconnector) +{ + struct drm_dp_mst_port *port = aconnector->port; + struct dc_link *link = aconnector->dc_sink->link; + u8 down_stream_port_data; + + if (port->mgr->mst_primary == port->parent && + link->dpcd_caps.branch_dev_id == 0x90CC24 && + link->dpcd_caps.dpcd_rev.raw >= DP_DPCD_REV_14) { + drm_dp_mst_dpcd_read(&port->aux, DP_DOWNSTREAMPORT_PRESENT, &down_stream_port_data, 1); + if ((down_stream_port_data & 7) != 3) + return true; + } + return false; +} + +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT +static bool validate_dsc_caps_on_connector(struct amdgpu_dm_connector *aconnector) +{ + u8 upstream_dsc_caps[16] = { 0 }; + u8 endpoint_dsc_caps[16] = { 0 }; + u8 endpoint_fec_caps = 0; + struct dc_sink *dc_sink = aconnector->dc_sink; + struct drm_dp_mst_port *output_port = aconnector->port; + struct drm_dp_mst_port *immediate_upstream_port; + struct drm_dp_mst_port *fec_port; + + if (aconnector->port && aconnector->port->parent) + immediate_upstream_port = aconnector->port->parent->port_parent; + else + immediate_upstream_port = NULL; + + fec_port = immediate_upstream_port; + while (fec_port) { + if (!fec_port->fec_capable) + return false; + + fec_port = fec_port->parent->port_parent; + } + + if (immediate_upstream_port) + drm_dp_mst_dpcd_read(&immediate_upstream_port->aux, DP_DSC_SUPPORT, upstream_dsc_caps, 16); + drm_dp_mst_dpcd_read(&output_port->aux, DP_DSC_SUPPORT, endpoint_dsc_caps, 16); + drm_dp_mst_dpcd_read(&output_port->aux, DP_FEC_CAPABILITY, &endpoint_fec_caps, 1); + + if (is_virtual_dpcd(immediate_upstream_port) + && (upstream_dsc_caps[0] & 0x2) /* DSC passthrough capability */ + && (endpoint_fec_caps & DP_FEC_CAPABLE) + && (endpoint_dsc_caps[0] & DP_DSC_DECOMPRESSION_IS_SUPPORTED)) { + /* Enpoint decompression with DP-to-DP peer device */ + if (!dc_dsc_parse_dsc_dpcd(endpoint_dsc_caps, NULL, &dc_sink->sink_dsc_caps.dsc_dec_caps)) + return false; + + dc_sink->sink_dsc_caps.is_virtual_dpcd_dsc = false; + } else if (is_virtual_dpcd(immediate_upstream_port)) { + /* Virtual DPCD decompression with DP-to-DP peer device */ + if (!dc_dsc_parse_dsc_dpcd(upstream_dsc_caps, NULL, &dc_sink->sink_dsc_caps.dsc_dec_caps)) + return false; + + dc_sink->sink_dsc_caps.is_virtual_dpcd_dsc = true; + } else if (is_virtual_dpcd(output_port)) { + /* Virtual DPCD decompression with DP-to-HDMI or Virtual DP Sink */ + if (!dc_dsc_parse_dsc_dpcd(endpoint_dsc_caps, NULL, &dc_sink->sink_dsc_caps.dsc_dec_caps)) + return false; + + dc_sink->sink_dsc_caps.is_virtual_dpcd_dsc = true; + } else if (synaptix_workaround(aconnector)) { + /* Synaptix workaround */ + aconnector = dc_sink->link->priv; + drm_dp_dpcd_read(&aconnector->dm_dp_aux.aux, DP_DSC_SUPPORT, upstream_dsc_caps, 16); + if (!dc_dsc_parse_dsc_dpcd(upstream_dsc_caps, NULL, &dc_sink->sink_dsc_caps.dsc_dec_caps)) + return false; + + dc_sink->sink_dsc_caps.is_virtual_dpcd_dsc = true; + } else { + return false; + } + + return true; +} +#endif + static int dm_dp_mst_get_modes(struct drm_connector *connector) { struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector); @@ -231,10 +346,16 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector) /* dc_link_add_remote_sink returns a new reference */ aconnector->dc_sink = dc_sink; - if (aconnector->dc_sink) + if (aconnector->dc_sink) { amdgpu_dm_update_freesync_caps( connector, aconnector->edid); +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT + if (!validate_dsc_caps_on_connector(aconnector)) + memset(&aconnector->dc_sink->sink_dsc_caps, + 0, sizeof(aconnector->dc_sink->sink_dsc_caps)); +#endif + } } drm_connector_update_edid_property( diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h index 2da851b40042..8de3d8c30f8d 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h @@ -32,4 +32,7 @@ struct amdgpu_dm_connector; void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, struct amdgpu_dm_connector *aconnector); +bool is_virtual_dpcd(struct drm_dp_mst_port *port); +bool synaptix_workaround(struct amdgpu_dm_connector *aconnector); + #endif From patchwork Tue Aug 20 19:12:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Francis X-Patchwork-Id: 11104545 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 56B6113B1 for ; Tue, 20 Aug 2019 19:12:53 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3EEE222DD3 for ; Tue, 20 Aug 2019 19:12:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3EEE222DD3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 978B76E873; Tue, 20 Aug 2019 19:12:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-eopbgr750040.outbound.protection.outlook.com [40.107.75.40]) by gabe.freedesktop.org (Postfix) with ESMTPS id C3EEF6E873; Tue, 20 Aug 2019 19:12:35 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mQZxA7UK7noKihKXuYdQ8e78vRVvB/IgYETThp49lhrfA1rDRzh2nR+HbqkRmlQNe7MH8gwz/SuKcChuX8Phyn7O3Q41TRiE3i+blzWIbAAv4qbyc9TJ/3xTPZ0K0+lGh0/mPXJWJKk/pZtJj0OfD/V9QRgPggJO2qCBi5B8zxE9+b6++8iP4CaKT0piEoRa3frqWevyxbTJWtrhuYBAWOtzwP277U8KxxQiQkox8jaUZJSCvVTFUr/ZvV9Mluce3Nf1WuWkfkk1paL3CtzlIU+lvoK3Q2DbPOFJHZGmoKo+FpJHccdJSRVF8k7QjFnmHL4+U8lckBx8j+r2G/HmoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mQrBmvdVpL7x5gTc0IXWqcmB61E5qzh1r5PUSj9kOJs=; b=nlwAKUUYvN83yrN0wlHIdfpTWA49T9sjx2X2u8kvz4vw48v3UOHWhz5bNo7SvThY/u5eqfs5IeKVFbyADTJuFq3CkRySPXRva6nhUFsuUZiqupNfOXlnDUgDZ1XTqAGO2OCGOBG6xG6Z59HEDwChDjbAUR8ulRO5bDa0CCrxeLkx6ovh4GsVflBM1Gyytt+rwT3uT83g4Ov24toe90+ejcJ6qKujopnQ2bvORlzxTu6pHbRBrcGTdDaSqLsDCvVXECHjZphRI657ATshfRTtH2NDs7FonN98Tnaro9sHOxIj00It9TzozWO+8kDzOcvN41yVUBXF8fSxEGgEQw1IXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from MWHPR1201CA0010.namprd12.prod.outlook.com (2603:10b6:301:4a::20) by MWHPR12MB1533.namprd12.prod.outlook.com (2603:10b6:301:f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16; Tue, 20 Aug 2019 19:12:31 +0000 Received: from BY2NAM03FT012.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::205) by MWHPR1201CA0010.outlook.office365.com (2603:10b6:301:4a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:31 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by BY2NAM03FT012.mail.protection.outlook.com (10.152.84.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:31 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Aug 2019 14:12:28 -0500 From: David Francis To: , Subject: [PATCH v2 12/14] drm/amd/display: Write DSC enable to MST DPCD Date: Tue, 20 Aug 2019 15:12:01 -0400 Message-ID: <20190820191203.25807-13-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820191203.25807-1-David.Francis@amd.com> References: <20190820191203.25807-1-David.Francis@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(979002)(4636009)(39860400002)(136003)(346002)(376002)(396003)(2980300002)(428003)(189003)(199004)(6666004)(356004)(47776003)(8936002)(4326008)(50226002)(186003)(70206006)(14444005)(11346002)(49486002)(426003)(2616005)(446003)(486006)(86362001)(336012)(476003)(126002)(305945005)(36756003)(50466002)(2906002)(26005)(76176011)(16586007)(110136005)(70586007)(51416003)(54906003)(478600001)(450100002)(53936002)(5660300002)(81156014)(48376002)(1076003)(8676002)(316002)(81166006)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR12MB1533; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 19072e1e-7d29-4c22-5e03-08d725a25986 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328); SRVR:MWHPR12MB1533; X-MS-TrafficTypeDiagnostic: MWHPR12MB1533: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2582; X-Forefront-PRVS: 013568035E X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: LlgU+ERjuwFAhc/1eGvis0xJv+ztYMWrBqkzIG0lQ7rNkAbtDFA0j+i8ZOVm6/HcbCVbJ6aOJYfirLWZH+J3xxk8f6PnhOyyFX3M2p6C28pNyajtreHsW+9IhtrxAcQ77mTEVZoJ8LgFyytBVyvB7AFP52jV5zHnQARQ8ktCDKxGnzXq8btwsGJlFk9SjrC57M1SLSHChL2V9hYVUJBSkmn9sEia/Dm3SjtQ0Xxcn4Sdzmp48IK4cFRuHztFr7HJWL3RxieMLpziAY2nhAw/zmnfHrpJkZkCaABe+aOSW/O+oqxvj9YvVHI+0CsdIIfC8Ppsp0YlCXQMgndOKCd4CqsOsG79OARVcdXMmrebcTec7eBrnei37K2oLMFKhDgubPdhoe97eK2Z293yeW96XlRDr2BElHv0GIPyBBzXvsc= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2019 19:12:31.1471 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 19072e1e-7d29-4c22-5e03-08d725a25986 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1533 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mQrBmvdVpL7x5gTc0IXWqcmB61E5qzh1r5PUSj9kOJs=; b=0SK7FapcfbmrDn1vtJ1kQ1pLnmKz31B2AtGh8XJIioVnF53FuBNyyJY0cdMcMXAJnmihU/cbLBwva4p8eNbKmGWN2gMkW7k826b50nao5dVvzU3hINDf+0PgSGQhbvPdtUx9Yzf3ZMQvJVUIRpHPU+SLgkArXl0gXMqVc3al3Xs= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Francis , Wenjing Liu , Nikola Cornij Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Rework the dm_helpers_write_dsc_enable callback to handle the MST case Depending on how DSC is done, the DP_DSC_ENABLE bit needs to be set on a different point For SST, use the link aux For endpoint DSC over DP-to-DP peer devices, use the output port For peer device DSC over DP-to-DP peer devices, use the upstream (peer) device For DP-to-HDMI or virtual DP peer devices, use the output port For the Synaptix workaround, use the link aux Cc: Wenjing Liu Cc: Nikola Cornij Signed-off-by: David Francis --- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index dfa99e0d6e64..62731c2bf2bf 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c @@ -38,6 +38,7 @@ #include "dc.h" #include "amdgpu_dm.h" #include "amdgpu_dm_irq.h" +#include "amdgpu_dm_mst_types.h" #include "dm_helpers.h" @@ -556,8 +557,35 @@ bool dm_helpers_dp_write_dsc_enable( ) { uint8_t enable_dsc = enable ? 1 : 0; + struct amdgpu_dm_connector *aconnector; + + if (!stream) + return false; + + if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST) { + aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context; + + if (!aconnector || !aconnector->dc_sink) + return false; + + if (!aconnector->dc_sink->sink_dsc_caps.is_virtual_dpcd_dsc) + return drm_dp_mst_dpcd_write(&aconnector->port->aux, + DP_DSC_ENABLE, &enable_dsc, 1) >= 0; + else if (is_virtual_dpcd(aconnector->port->parent->port_parent)) + return drm_dp_mst_dpcd_write(&aconnector->port->parent->port_parent->aux, + DP_DSC_ENABLE, &enable_dsc, 1) >= 0; + else if (is_virtual_dpcd(aconnector->port)) + return drm_dp_mst_dpcd_write(&aconnector->port->aux, + DP_DSC_ENABLE, &enable_dsc, 1) >= 0; + else if (synaptix_workaround(aconnector)) + return dm_helpers_dp_write_dpcd(ctx, stream->link, + DP_DSC_ENABLE, &enable_dsc, 1); + } + + if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT) + return dm_helpers_dp_write_dpcd(ctx, stream->link, DP_DSC_ENABLE, &enable_dsc, 1); - return dm_helpers_dp_write_dpcd(ctx, stream->sink->link, DP_DSC_ENABLE, &enable_dsc, 1); + return false; } #endif From patchwork Tue Aug 20 19:12:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Francis X-Patchwork-Id: 11104541 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CC791112C for ; Tue, 20 Aug 2019 19:12:49 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B47902082F for ; Tue, 20 Aug 2019 19:12:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B47902082F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 409AF6E86F; Tue, 20 Aug 2019 19:12:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM04-CO1-obe.outbound.protection.outlook.com (mail-co1nam04on0611.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe4d::611]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6738B6E86D; Tue, 20 Aug 2019 19:12:35 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TaazgtSxLQl4m2T8EPOrb0mOpBeRAXSC6Cqw2fkYl4Qz4JiA5z2hkznH02U8v0Uqntdcaksb47H1RU9YNBBFAdDMTxxryljuRwY25gChrnc2kQz7vkCdgtzMC30lhnu5ISdWPNVBt1AbaYQEUnb/8wF/zYi1UJYgLFL3inpv3hp6WYEtb79x3tnPIgIMhs3oarlpst+LxTE2l4qUr47aPMTCtcAmBw7HX7ROuB5FMH0wpjl968+xzjxPD/9jQaI+G8uvBtXt8JhS6mPO0jDSqNpZivsTkWZKGW0chQtlWHxVEROZb7QQzrLBLpI7a4bBy7XNwmp1NCD6bnkAdg83cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BmvJTV6rkffFHCcFcplQhmwzbnVabRxJRAyRWHCo6KQ=; b=EHSRYHpIt3u7gJDmCnHwR0orh68YGcvMLn/TtYUOJX/XMjUSuX8v3ODfhKHpz9pecDN4imAaMxR2j/tsTHp0vW+Ur2FNgZHnai8puo7+ix+/xDL4nZur2arvC4WH1TYfCvGkKR2P51Aq9tovWEwjZSd+vg7dBFVN3RecPuc9PzHUssGdslcCNMsTEyHTJf45s58nlb00PS2nR7do1vARLQcc5se7HAI9fJc++/7Ox0wJj+sWe0g6NyIKT+Yq0VuIxszSORmPCsUqDHWcRVIFiHp7RU/IfzX8oEG6sTW4zR7DuJN+iuDG4uNaGe9sVHJAKXdh2soUt9/OInwjf0gFBQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from MWHPR1201CA0010.namprd12.prod.outlook.com (2603:10b6:301:4a::20) by BN6PR12MB1521.namprd12.prod.outlook.com (2603:10b6:405:f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16; Tue, 20 Aug 2019 19:12:32 +0000 Received: from BY2NAM03FT012.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::205) by MWHPR1201CA0010.outlook.office365.com (2603:10b6:301:4a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:32 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by BY2NAM03FT012.mail.protection.outlook.com (10.152.84.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:31 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Aug 2019 14:12:29 -0500 From: David Francis To: , Subject: [PATCH v2 13/14] drm/amd/display: MST DSC compute fair share Date: Tue, 20 Aug 2019 15:12:02 -0400 Message-ID: <20190820191203.25807-14-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820191203.25807-1-David.Francis@amd.com> References: <20190820191203.25807-1-David.Francis@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(136003)(39860400002)(376002)(346002)(396003)(2980300002)(428003)(199004)(189003)(53936002)(49486002)(54906003)(36756003)(336012)(1076003)(2906002)(50226002)(70206006)(4326008)(81166006)(8676002)(81156014)(8936002)(450100002)(30864003)(5660300002)(51416003)(14444005)(186003)(76176011)(26005)(70586007)(6666004)(86362001)(305945005)(356004)(476003)(2616005)(446003)(11346002)(50466002)(16586007)(48376002)(478600001)(316002)(426003)(126002)(486006)(110136005)(47776003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1521; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7d6c8164-7caf-4a23-ae74-08d725a259ec X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328); SRVR:BN6PR12MB1521; X-MS-TrafficTypeDiagnostic: BN6PR12MB1521: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1265; X-Forefront-PRVS: 013568035E X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: IVbpVudycDTvLXjwdt9CcqvxWWxttwGIF6CuWGBzNJ/exGqAuGW6rmZ7fjITMftkGwkiAGPh+jac2sOQPLJJ3IRGIevGi3pbvFdhRkya3bxf4U0N7dEcymHxg8E1izP+9boA7bqQkynmgt7/dj+4uZcq8noId1Jr6DEmtQDDDzsBmtbGqzzDjB6N+WdPzpnjdGiMDIwFYsOEu6WmisUpr8NfnhS5pRedT6qC9+3YXvh8xJQxIZ0inionJivO1m9hpDwSNBzspZ4naJaNNCpFcNzBAATil2BCJcCQpvu/KMOBa+hDRKU5USZ3NjnIZTOmUQEwLUSaO+DCX/5sAmXFsyB6e2huQEVE1FdYFuQ1FJOCIm71ZBcjKhMs1LoNDSQGwvgM01O2CREwKWrKSjvUMbYk8nJINb/3DpiqvURaYeI= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2019 19:12:31.8126 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7d6c8164-7caf-4a23-ae74-08d725a259ec X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1521 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BmvJTV6rkffFHCcFcplQhmwzbnVabRxJRAyRWHCo6KQ=; b=bB4OxqEpoQhUVtHxgYhEGoO2pN3oJQQxTltl5RnjBSDXE7RO6sU11R2WNT7ThDx3mHTG/8W5X+TVkbBsNCuzK3SZPvmyJ7+gaZ0pW/+UwdUP/CFeZgj+Ah/8urgPAnbuHplx3txYJRJU11li9PMoMZFGsiGrfg7HOrTlfnaKX8Q= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Francis , Wenjing Liu , Nikola Cornij Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" If there is limited link bandwidth on a MST network, it must be divided fairly between the streams on that network Implement an algorithm to determine the correct DSC config for each stream The algorithm: This [ ] ( ) represents the range of bandwidths possible for a given stream. The [] area represents the range of DSC configs, and the () represents no DSC. The bandwidth used increases from left to right. First, try disabling DSC on all streams [ ] (|) [ ] (|) Check this against the bandwidth limits of the link and each branch (including each endpoint). If it passes, the job is done Second, try maximum DSC compression on all streams that support DSC [| ] ( ) [| ] ( ) If this does not pass, then enabling this combination of streams is impossible Otherwise, divide the remaining bandwidth evenly amongst the streams [ | ] ( ) [ | ] ( ) If one or more of the streams reach minimum compression, evenly divide the reamining bandwidth amongst the remaining streams [ |] ( ) [ |] ( ) [ | ] ( ) [ | ] ( ) If all streams can reach minimum compression, disable compression greedily [ |] ( ) [ |] ( ) [ ] (|) Perform this algorithm on each full update, on each MST link with at least one DSC stream on it After the configs are computed, call dcn20_add_dsc_to_stream_resource on each stream with DSC enabled. It is only after all streams are created that we can know which of them will need DSC. Do all of this at the end of amdgpu atomic check. If it fails, fail check; This combination of timings cannot be supported. Cc: Wenjing Liu Cc: Nikola Cornij Signed-off-by: David Francis --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 + .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 375 ++++++++++++++++++ .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 4 +- .../drm/amd/display/dc/dcn20/dcn20_resource.c | 7 +- .../drm/amd/display/dc/dcn20/dcn20_resource.h | 1 + 5 files changed, 388 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 84249057e181..145fd73025dc 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -7331,6 +7331,10 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, if (ret) goto fail; +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT + if (!compute_mst_dsc_configs_for_state(dm_state->context)) + goto fail; +#endif if (dc_validate_global_state(dc, dm_state->context, false) != DC_OK) { ret = -EINVAL; goto fail; diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index 58571844f6d5..0b6bfa093e83 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c @@ -38,6 +38,8 @@ #include "i2caux_interface.h" +#include "dc/dcn20/dcn20_resource.h" + /* #define TRACE_DPCD */ #ifdef TRACE_DPCD @@ -548,3 +550,376 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, aconnector->connector_id); } +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT +struct dsc_mst_fairness_params { + struct dc_crtc_timing *timing; + struct dc_sink *sink; + struct dc_dsc_bw_range bw_range; + bool compression_possible; + struct drm_dp_mst_port *port; +}; + +struct dsc_mst_fairness_vars { + int pbn; + bool dsc_enabled; + int bpp_x16; +}; + +static bool port_downstream_of_branch(struct drm_dp_mst_port *port, + struct drm_dp_mst_branch *branch) +{ + while (port->parent) { + if (port->parent == branch) + return true; + + if (port->parent->port_parent) + port = port->parent->port_parent; + else + break; + } + return false; +} + +static bool check_pbn_limit_on_branch(struct drm_dp_mst_branch *branch, + struct dsc_mst_fairness_params *params, + struct dsc_mst_fairness_vars *vars, int count) +{ + struct drm_dp_mst_port *port; + int i; + int pbn_limit = 0; + int pbn_used = 0; + + list_for_each_entry(port, &branch->ports, next) { + if (port->mstb) + if (!check_pbn_limit_on_branch(port->mstb, params, vars, count)) + return false; + + if (port->available_pbn > 0) + pbn_limit = port->available_pbn; + } + + for (i = 0; i < count; i++) { + if (port_downstream_of_branch(params[i].port, branch)) + pbn_used += vars[i].pbn; + } + + if (pbn_used > pbn_limit) + return false; + + return true; +} + +static bool check_bandwidth_limits(struct dc_link *dc_link, + struct dsc_mst_fairness_params *params, + struct dsc_mst_fairness_vars *vars, + int count) +{ + int link_timeslot_limit = 63; + int link_timeslots_used = 0; + int pbn_per_timeslot; + int i; + struct drm_dp_mst_topology_mgr *mst_mgr; + + /* kbits to pbn, dividing by 64 */ + pbn_per_timeslot = dc_link_bandwidth_kbps(dc_link, + dc_link_get_link_cap(dc_link)) / (8 * 1000 * 54); + + /* Check link bandwidth limit */ + for (i = 0; i < count; i++) + link_timeslots_used += DIV_ROUND_UP(vars[i].pbn, pbn_per_timeslot); + + if (link_timeslots_used > link_timeslot_limit) + return false; + + /* Check branch bandwidth limit for each port on each branch */ + mst_mgr = params[0].port->mgr; + if (!check_pbn_limit_on_branch(mst_mgr->mst_primary, params, vars, count)) + return false; + + return true; +} + +static int kbps_to_peak_pbn(int kbps) +{ + u64 peak_kbps = kbps; + + peak_kbps *= 1006; + peak_kbps /= 1000; + return (int) DIV_ROUND_UP(peak_kbps * 64, (54 * 8 * 1000)); +} + +static void set_dsc_configs_from_fairness_vars(struct dsc_mst_fairness_params *params, + struct dsc_mst_fairness_vars *vars, + int count) +{ + int i; + + for (i = 0; i < count; i++) { + memset(¶ms[i].timing->dsc_cfg, 0, sizeof(params[i].timing->dsc_cfg)); + if (vars[i].dsc_enabled && dc_dsc_compute_config(params[i].sink->ctx->dc, + ¶ms[i].sink->sink_dsc_caps.dsc_dec_caps, + 0, + params[i].timing, + ¶ms[i].timing->dsc_cfg)) { + params[i].timing->flags.DSC = 1; + params[i].timing->dsc_cfg.bits_per_pixel = vars[i].bpp_x16; + } else { + params[i].timing->flags.DSC = 0; + } + + } + +} + +static int bpp_x16_from_pbn(struct dsc_mst_fairness_params param, int pbn) +{ + struct dc_dsc_config dsc_config; + u64 kbps; + + kbps = (u64)pbn * 994 * 8 * 54 / 64; + dc_dsc_compute_config(param.sink->ctx->dc, + ¶m.sink->sink_dsc_caps.dsc_dec_caps, + (int) kbps, param.timing, &dsc_config); + + return dsc_config.bits_per_pixel; +} + +static void increase_dsc_bpp(struct dc_link *dc_link, + struct dsc_mst_fairness_params *params, + struct dsc_mst_fairness_vars *vars, + int count) +{ + int i; + bool bpp_increased[MAX_PIPES]; + int initial_slack[MAX_PIPES]; + int min_initial_slack; + int next_index; + int remaining_to_increase = 0; + int pbn_per_timeslot; + int link_timeslots_used; + int fair_pbn_alloc; + + for (i = 0; i < count; i++) { + if (vars[i].dsc_enabled) { + initial_slack[i] = kbps_to_peak_pbn(params[i].bw_range.max_kbps) - vars[i].pbn; + bpp_increased[i] = false; + remaining_to_increase += 1; + } else { + initial_slack[i] = 0; + bpp_increased[i] = true; + } + } + + pbn_per_timeslot = dc_link_bandwidth_kbps(dc_link, + dc_link_get_link_cap(dc_link)) / (8 * 1000 * 54); + + while (remaining_to_increase) { + next_index = -1; + min_initial_slack = -1; + for (i = 0; i < count; i++) { + if (!bpp_increased[i]) { + if (min_initial_slack == -1 || min_initial_slack > initial_slack[i]) { + min_initial_slack = initial_slack[i]; + next_index = i; + } + } + } + + if (next_index == -1) + break; + + link_timeslots_used = 0; + + for (i = 0; i < count; i++) + link_timeslots_used += DIV_ROUND_UP(vars[i].pbn, pbn_per_timeslot); + + fair_pbn_alloc = (63 - link_timeslots_used) / remaining_to_increase * pbn_per_timeslot; + + if (initial_slack[next_index] > fair_pbn_alloc) { + vars[next_index].pbn += fair_pbn_alloc; + if (check_bandwidth_limits(dc_link, params, vars, count)) + vars[next_index].bpp_x16 = bpp_x16_from_pbn(params[next_index], vars[next_index].pbn); + else + vars[next_index].pbn -= fair_pbn_alloc; + } else { + vars[next_index].pbn += initial_slack[next_index]; + if (check_bandwidth_limits(dc_link, params, vars, count)) + vars[next_index].bpp_x16 = params[next_index].bw_range.max_target_bpp_x16; + else + vars[next_index].pbn -= initial_slack[next_index]; + } + + bpp_increased[next_index] = true; + remaining_to_increase--; + } +} + +static void try_disable_dsc(struct dc_link *dc_link, + struct dsc_mst_fairness_params *params, + struct dsc_mst_fairness_vars *vars, + int count) +{ + int i; + bool tried[MAX_PIPES]; + int kbps_increase[MAX_PIPES]; + int max_kbps_increase; + int next_index; + int remaining_to_try = 0; + + for (i = 0; i < count; i++) { + if (vars[i].dsc_enabled && vars[i].bpp_x16 == params[i].bw_range.max_target_bpp_x16) { + kbps_increase[i] = params[i].bw_range.stream_kbps - params[i].bw_range.max_kbps; + tried[i] = false; + remaining_to_try += 1; + } else { + kbps_increase[i] = 0; + tried[i] = true; + } + } + + while (remaining_to_try) { + next_index = -1; + max_kbps_increase = -1; + for (i = 0; i < count; i++) { + if (!tried[i]) { + if (max_kbps_increase == -1 || max_kbps_increase < kbps_increase[i]) { + max_kbps_increase = kbps_increase[i]; + next_index = i; + } + } + } + + if (next_index == -1) + break; + + vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.stream_kbps); + + if (check_bandwidth_limits(dc_link, params, vars, count)) { + vars[next_index].dsc_enabled = false; + vars[next_index].bpp_x16 = 0; + } else { + vars[next_index].pbn = kbps_to_peak_pbn(params[next_index].bw_range.max_kbps); + } + + tried[next_index] = true; + remaining_to_try--; + } +} + +static bool compute_mst_dsc_configs_for_link(struct dc_state *dc_state, struct dc_link *dc_link) +{ + int i; + struct dc_stream_state *stream; + struct dsc_mst_fairness_params params[MAX_PIPES]; + struct dsc_mst_fairness_vars vars[MAX_PIPES]; + struct amdgpu_dm_connector *aconnector; + int count = 0; + + memset(params, 0, sizeof(params)); + + /* Set up params */ + for (i = 0; i < dc_state->stream_count; i++) { + stream = dc_state->streams[i]; + + if (stream->link != dc_link) + continue; + + stream->timing.flags.DSC = 0; + + params[count].timing = &stream->timing; + params[count].sink = stream->sink; + aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context; + params[count].port = aconnector->port; + params[count].compression_possible = stream->sink->sink_dsc_caps.dsc_dec_caps.is_dsc_supported; + if (!dc_dsc_compute_bandwidth_range(stream->sink->ctx->dc, 8, 16, + &stream->sink->sink_dsc_caps.dsc_dec_caps, + &stream->timing, ¶ms[count].bw_range)) + params[count].bw_range.stream_kbps = dc_bandwidth_in_kbps_from_timing(&stream->timing); + + count++; + } + + /* Try no compression */ + for (i = 0; i < count; i++) { + vars[i].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps); + vars[i].dsc_enabled = false; + vars[i].bpp_x16 = 0; + } + + if (check_bandwidth_limits(dc_link, params, vars, count)) { + set_dsc_configs_from_fairness_vars(params, vars, count); + return true; + } + + /* Try max compression */ + for (i = 0; i < count; i++) { + if (params[i].compression_possible) { + vars[i].pbn = kbps_to_peak_pbn(params[i].bw_range.min_kbps); + vars[i].dsc_enabled = true; + vars[i].bpp_x16 = params[i].bw_range.min_target_bpp_x16; + } else { + vars[i].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps); + vars[i].dsc_enabled = false; + vars[i].bpp_x16 = 0; + } + } + + if (!check_bandwidth_limits(dc_link, params, vars, count)) + return false; + + /* Optimize degree of compression */ + increase_dsc_bpp(dc_link, params, vars, count); + + try_disable_dsc(dc_link, params, vars, count); + + set_dsc_configs_from_fairness_vars(params, vars, count); + + return true; +} + +bool compute_mst_dsc_configs_for_state(struct dc_state *dc_state) +{ + int i, j; + struct dc_stream_state *stream; + bool computed_streams[MAX_PIPES]; + struct amdgpu_dm_connector *aconnector; + + for (i = 0; i < dc_state->stream_count; i++) + computed_streams[i] = false; + + for (i = 0; i < dc_state->stream_count; i++) { + stream = dc_state->streams[i]; + + if (stream->signal != SIGNAL_TYPE_DISPLAY_PORT_MST) + continue; + + aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context; + + if (!aconnector || !aconnector->dc_sink) + continue; + + if (!aconnector->dc_sink->sink_dsc_caps.dsc_dec_caps.is_dsc_supported) + continue; + + if (computed_streams[i]) + continue; + + if (!compute_mst_dsc_configs_for_link(dc_state, stream->link)) + return false; + + for (j = 0; j < dc_state->stream_count; j++) { + if (dc_state->streams[j]->link == stream->link) + computed_streams[j] = true; + } + } + + for (i = 0; i < dc_state->stream_count; i++) { + stream = dc_state->streams[i]; + + if (stream->timing.flags.DSC == 1) + dcn20_add_dsc_to_stream_resource(stream->ctx->dc, dc_state, stream); + } + + return true; +} +#endif diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h index 8de3d8c30f8d..b7d2e4e70185 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h @@ -34,5 +34,7 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, bool is_virtual_dpcd(struct drm_dp_mst_port *port); bool synaptix_workaround(struct amdgpu_dm_connector *aconnector); - +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT +bool compute_mst_dsc_configs_for_state(struct dc_state *dc_state); +#endif #endif diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c index c59f31dcdc0d..22511b047837 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c @@ -1439,7 +1439,7 @@ static void release_dsc(struct resource_context *res_ctx, #ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT -static enum dc_status add_dsc_to_stream_resource(struct dc *dc, +enum dc_status dcn20_add_dsc_to_stream_resource(struct dc *dc, struct dc_state *dc_ctx, struct dc_stream_state *dc_stream) { @@ -1454,6 +1454,9 @@ static enum dc_status add_dsc_to_stream_resource(struct dc *dc, if (pipe_ctx->stream != dc_stream) continue; + if (pipe_ctx->stream_res.dsc) + continue; + acquire_dsc(&dc_ctx->res_ctx, pool, &pipe_ctx->stream_res.dsc); /* The number of DSCs can be less than the number of pipes */ @@ -1511,7 +1514,7 @@ enum dc_status dcn20_add_stream_to_ctx(struct dc *dc, struct dc_state *new_ctx, #ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT /* Get a DSC if required and available */ if (result == DC_OK && dc_stream->timing.flags.DSC) - result = add_dsc_to_stream_resource(dc, new_ctx, dc_stream); + result = dcn20_add_dsc_to_stream_resource(dc, new_ctx, dc_stream); #endif if (result == DC_OK) diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h index 44f95aa0d61e..2209ebda6ef6 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h @@ -131,6 +131,7 @@ void dcn20_calculate_dlg_params( enum dc_status dcn20_build_mapped_resource(const struct dc *dc, struct dc_state *context, struct dc_stream_state *stream); enum dc_status dcn20_add_stream_to_ctx(struct dc *dc, struct dc_state *new_ctx, struct dc_stream_state *dc_stream); +enum dc_status dcn20_add_dsc_to_stream_resource(struct dc *dc, struct dc_state *dc_ctx, struct dc_stream_state *dc_stream); enum dc_status dcn20_remove_stream_from_ctx(struct dc *dc, struct dc_state *new_ctx, struct dc_stream_state *dc_stream); enum dc_status dcn20_get_default_swizzle_mode(struct dc_plane_state *plane_state); From patchwork Tue Aug 20 19:12:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Francis X-Patchwork-Id: 11104547 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9052E112C for ; Tue, 20 Aug 2019 19:12:55 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 781962332A for ; Tue, 20 Aug 2019 19:12:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 781962332A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E68986E876; Tue, 20 Aug 2019 19:12:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-eopbgr750040.outbound.protection.outlook.com [40.107.75.40]) by gabe.freedesktop.org (Postfix) with ESMTPS id 387236E869; Tue, 20 Aug 2019 19:12:36 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E/PUSWstQa3xStCshcmSscd+1wofxjXjjokhxTrdSHfB5iUewPUoJBbVO/tsQOjJ+gFF+Cv79l0IyTE/M10QHOyAAfdrjH3JPDhPa2znmSdxWT7yrEO7nRBwnWhuPef60zolTHzi3Dl5EcNKBdcsspWIKy6gYVSZpGmdXfzAfO3cUy6OUV8pQefcVx7h42wTD3siuBtnV9pTgbXDxJ0UZJbNWacRHbemoqk9vnZ6KKlY7q2BE7ruPij45FMASXZ4c3PLbmAQcZ4whjRlDYt8GIJ9Ql7kvNVhvFx28hgDG/3iQd4TTn1ax7DAzG48RLzYL2nHNIvjCgdzz8iZ1nCs+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oOZrI9tcIvAzywlZL4IwEUISgUIiR80sWhNBq8yuZEc=; b=HaugrIk1Lbobiic+xJlGsYQ7bzeEwGqkKBjTMnv8600l3QUZ7TlXUy9T91B0wHlNnQBU1F4pxC50xQGQvIKJ9b0cbx75/Z5cBgb2WxVbmGPHKTuiQo+cpAyqCFwgYmBYETGACQG6oKu7uXFcPIvRkPJiH9mcbpPEzQpStXmLsQXDRbAzlPov4XtqnwjtUPT9zGHcD85v+dfPkcByWZG+lxtoxhLsEkEaZ+8FU/mXNJvwqUK0sgmwkm91CWLS3Kyw8EQqTB9tOwQZQvoZY1dZfTFzRpMwwT+DKTotTEF38FSv1Xi+QYM9qCrcsOE4REWBtDwbSWGKihaFj6Hwjb+oRw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from MWHPR1201CA0010.namprd12.prod.outlook.com (2603:10b6:301:4a::20) by MWHPR12MB1533.namprd12.prod.outlook.com (2603:10b6:301:f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16; Tue, 20 Aug 2019 19:12:33 +0000 Received: from BY2NAM03FT012.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::205) by MWHPR1201CA0010.outlook.office365.com (2603:10b6:301:4a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:33 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by BY2NAM03FT012.mail.protection.outlook.com (10.152.84.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Tue, 20 Aug 2019 19:12:32 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Aug 2019 14:12:31 -0500 From: David Francis To: , Subject: [PATCH v2 14/14] drm/amd/display: Trigger modesets on MST DSC connectors Date: Tue, 20 Aug 2019 15:12:03 -0400 Message-ID: <20190820191203.25807-15-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820191203.25807-1-David.Francis@amd.com> References: <20190820191203.25807-1-David.Francis@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(136003)(346002)(376002)(396003)(2980300002)(428003)(189003)(199004)(6666004)(356004)(47776003)(8936002)(4326008)(50226002)(5024004)(186003)(70206006)(14444005)(11346002)(49486002)(426003)(2616005)(446003)(486006)(86362001)(336012)(476003)(126002)(305945005)(36756003)(50466002)(2906002)(26005)(76176011)(16586007)(110136005)(70586007)(51416003)(54906003)(478600001)(450100002)(53936002)(5660300002)(81156014)(48376002)(1076003)(8676002)(316002)(81166006); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR12MB1533; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 863c4f37-4d5d-48b5-1580-08d725a25a85 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328); SRVR:MWHPR12MB1533; X-MS-TrafficTypeDiagnostic: MWHPR12MB1533: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-Forefront-PRVS: 013568035E X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: iBbLKR/JdLBfnytsQq01+w51VPkLXQRMfO3ZNCSFkHtDMUf6YoEF0zhyf9xbH2DB19tKKyUV/mxbKZ1EP5++9nlkZ407qs1jx6jBZJGjV+xPp9WjV0p102jONVQ6ldqRW+itSWCZGKJkpuF0ukAbXr/UBEW7By5gPglviZpq7Q08p0Fh0rTcSjAEBqH4TWQj5jqBowm74N+d7IfCiL467dFTKVVjz4N+RCg1DvcjGNTlFI1GBUSTFHChLxyJgMCqEzmsDLLGccjsc65Nqf3xwrymxL8QsLnktcSr8uVb2yxEGUWtoLEQHSojip9Kb+xY+lDCMMMMEVczu4AhsOjLoV5YPyhO7K/5lry6S5gzdE78NpbD6tr0Vbk40qQr5gRaS6jih1KPP8OOJmGR4MprNZ8L0uvzh4Ugog1hC3KYUmM= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2019 19:12:32.8154 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 863c4f37-4d5d-48b5-1580-08d725a25a85 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1533 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oOZrI9tcIvAzywlZL4IwEUISgUIiR80sWhNBq8yuZEc=; b=APjzD3Eap/NP8buRBmazkmIkxpimOTi79VZJUQerByA/lgOYzukKDx/U7aVLUHWESzrxI1I2LlN08w+RmeFpUtd55Dik0TeFWx3ykMM37IGnvZBaz/w5IKelsNV3RCJ68IzbWePj9WqDVygCz8hzTLPcVNeQoPT8PiTvrxTadjc= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leo Li , David Francis , Nicholas Kazlauskas Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Whenever a connector on an MST network is attached, detached, or undergoes a modeset, the DSC configs for each stream on that topology will be recalculated. This can change their required bandwidth, requiring a full reprogramming, as though a modeset was performed, even if that stream did not change timing. Therefore, whenever a crtc has drm_atomic_crtc_needs_modeset, for each crtc that shares a MST topology with that stream and supports DSC, add that crtc (and all affected connectors and planes) to the atomic state and set mode_changed on its state v2: Do this check only on Navi and before adding connectors and planes on modesetting crtcs Cc: Leo Li Cc: Nicholas Kazlauskas Signed-off-by: David Francis --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 145fd73025dc..e64f2a6eb71a 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6475,7 +6475,70 @@ static int do_aquire_global_lock(struct drm_device *dev, return ret < 0 ? ret : 0; } +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT +static int add_affected_mst_dsc_crtcs(struct drm_atomic_state *state, struct drm_crtc *crtc) +{ + struct drm_connector *connector; + struct drm_connector_state *conn_state; + struct drm_connector_list_iter conn_iter; + struct drm_crtc_state *new_crtc_state; + struct amdgpu_dm_connector *aconnector = NULL, *aconnector_to_add; + int i, j; + struct drm_crtc *crtcs_affected[AMDGPU_MAX_CRTCS] = { 0 }; + + for_each_new_connector_in_state(state, connector, conn_state, i) { + if (conn_state->crtc != crtc) + continue; + + aconnector = to_amdgpu_dm_connector(connector); + if (!aconnector->port) + aconnector = NULL; + else + break; + } + + if (!aconnector) + return 0; + + i = 0; + drm_connector_list_iter_begin(state->dev, &conn_iter); + drm_for_each_connector_iter(connector, &conn_iter) { + if (!connector->state || !connector->state->crtc) + continue; + + aconnector_to_add = to_amdgpu_dm_connector(connector); + if (!aconnector_to_add->port) + continue; + + if (aconnector_to_add->port->mgr != aconnector->port->mgr) + continue; + if (!aconnector_to_add->dc_sink) + continue; + + if (!aconnector_to_add->dc_sink->sink_dsc_caps.dsc_dec_caps.is_dsc_supported) + continue; + + if (i >= AMDGPU_MAX_CRTCS) + continue; + + crtcs_affected[i] = connector->state->crtc; + i++; + } + drm_connector_list_iter_end(&conn_iter); + + for (j = 0; j < i; j++) { + new_crtc_state = drm_atomic_get_crtc_state(state, crtcs_affected[j]); + if (IS_ERR(new_crtc_state)) + return PTR_ERR(new_crtc_state); + + new_crtc_state->mode_changed = true; + } + + return 0; + +} +#endif static void get_freesync_config_for_crtc( struct dm_crtc_state *new_crtc_state, struct dm_connector_state *new_con_state) @@ -7160,6 +7223,17 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, if (ret) goto fail; +#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT + if (adev->asic_type >= CHIP_NAVI10) { + for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) { + if (drm_atomic_crtc_needs_modeset(new_crtc_state)) { + ret = add_affected_mst_dsc_crtcs(state, crtc); + if (ret) + goto fail; + } + } + } +#endif for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) { if (!drm_atomic_crtc_needs_modeset(new_crtc_state) && !new_crtc_state->color_mgmt_changed &&