From patchwork Mon Aug 19 15:50:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Francis X-Patchwork-Id: 11101309 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 75F5D1395 for ; Mon, 19 Aug 2019 15:51:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B936286C7 for ; Mon, 19 Aug 2019 15:51:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 29CAE2879C; Mon, 19 Aug 2019 15:51:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BED9E2879C for ; Mon, 19 Aug 2019 15:51:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 066956E1E5; Mon, 19 Aug 2019 15:50:58 +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-eopbgr790089.outbound.protection.outlook.com [40.107.79.89]) by gabe.freedesktop.org (Postfix) with ESMTPS id DE9FC6E1F9; Mon, 19 Aug 2019 15:50:53 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GJcCY9oHwFUAzxF0B3CS1LBopAPQDrPb2bXr2L3OtQYgChBVNqj0CZpYpbPXfWthCzBTzrui2QrDXhDettuhsZQUOaJR052VkpSY7gDIr/QUG1CruKRWfKmvgI6Jlgsyxe5HeWNdcMNKead99cF0vUGv1/yOO9Hbv9h3kug0p+lmVDhH2RqjSg9YlsCn4XkTLOF44m09VJi8u9iIX9T2m3f89cmbXSp8JIVUzklzOjdpgU/fSbCM8hLGdVhv9QowG5FgMU4ftGrLZLFGWT/vqbpEnP2DSk4Tww3mZ8cW6FaQGnn3Gmp8BVI5Hpcr/4VnslXh3S8uennnDcUpAQk3Tw== 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=I9SqDzN0KHEnXFJLe24A3qNO7kc6IC+QNsHtsi/GD/k=; b=WQwwjVp3oKF+Ogw+Mo/4bfBv4aXUZBQZbDb7ZvKblR4EaZWb8XNKahEQsyOHW1NbJuQ6FpkzYK9eceui9W+wQ/TwNghEcfEe630TIFndQchl0E1ILzFtiCk1STe78NdEvB+wbKoXJYpgwM1BH0resYOiXrUEb1AxfdbMa8yFikRa8PbcDOP1HkdIvOrAz4GP0pNoCXDd8v0vQMJ92mm5a3YaPITNR1aGBtJfxXI4m1WWGI7eEr6TZ15wzndlFJ00ovW+WYZKkn1N42L2h1/C4/QvWgLqgafwhs+2b/s5SYVBYWP+VlMoBy4ydAkUYYXCmgvKeTtW6sLUKRpZMA4EQg== 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 DM3PR12CA0054.namprd12.prod.outlook.com (2603:10b6:0:56::22) by CY4PR12MB1528.namprd12.prod.outlook.com (2603:10b6:910:6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16; Mon, 19 Aug 2019 15:50:52 +0000 Received: from BY2NAM03FT027.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::202) by DM3PR12CA0054.outlook.office365.com (2603:10b6:0:56::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Mon, 19 Aug 2019 15:50:51 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT027.mail.protection.outlook.com (10.152.84.237) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Mon, 19 Aug 2019 15:50:51 +0000 Received: from localhost.localdomain (10.180.168.240) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Mon, 19 Aug 2019 10:50:48 -0500 From: David Francis To: , Subject: [PATCH 06/14] drm/amd/display: Use dc helpers to compute timeslot distribution Date: Mon, 19 Aug 2019 11:50:30 -0400 Message-ID: <20190819155038.1771-7-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190819155038.1771-1-David.Francis@amd.com> References: <20190819155038.1771-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)(396003)(376002)(346002)(39860400002)(136003)(2980300002)(428003)(199004)(189003)(70206006)(450100002)(50466002)(70586007)(305945005)(476003)(126002)(4326008)(6666004)(51416003)(49486002)(356004)(50226002)(8676002)(81166006)(1076003)(8936002)(2906002)(14444005)(48376002)(81156014)(5660300002)(76176011)(16586007)(53936002)(54906003)(110136005)(2616005)(11346002)(316002)(336012)(26005)(486006)(478600001)(446003)(426003)(47776003)(186003)(86362001)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1528; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5cef1a5e-017f-4369-62eb-08d724bd0323 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600148)(711020)(4605104)(1401327)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328); SRVR:CY4PR12MB1528; X-MS-TrafficTypeDiagnostic: CY4PR12MB1528: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-Forefront-PRVS: 0134AD334F X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: PNcFtFkMtW+HtVbf4y8WfAgcxL82r0Ictzng62XugFTl1I2rLGVyJgyhXDDE9BVWZZDW7539skKBsXHTcj0+CCH1Kj2VeUIzNK7VLY/F9Plf49pGRdZG2utt1jC2HnEuQywCb1m8Afx1pLY4KLjsCCwEP9t560HdBoKGLZ77Iwn7BdEf33PyfEw7s1TAJoJD8C3pep01B/TcTVQrazI/yiC7tW/m60WBNHme1UlMf0cRaAAOHngT88T6hIOsMaAcM8BijT8W0EoZV3ksc93AJZqAb4g5C22yLrSqcAuflJeaev0A08oH9bm/maRtrGC4FpIehRx6SZ9/02I6weuT8wi89mZhmmcb0szdseXIemyoWFsgeYZYhcjaurlmQ98vuyi7x9OQJt4k/P/bqLHGOA2zNkjuh1d/NVXoQAjHwpw= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Aug 2019 15:50:51.4632 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5cef1a5e-017f-4369-62eb-08d724bd0323 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=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1528 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=I9SqDzN0KHEnXFJLe24A3qNO7kc6IC+QNsHtsi/GD/k=; b=L3iPVJLaCRZ5F1/9vpaNouWjBbcgDiyBdE5kskF4KgENZW1OOP5J799FMcQIOXEkskSaoXClE4/r4/UR9mwHyYqdTKLk1KZcI4geqNlHqMBoMA42F9YiBMNsxnHwNU4wk8hxCxQqy9zCQ6FhLOLM9mfXDp2GRmpAxJk5lxYByYY= 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 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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) Use the DC helpers (dc_bandwidth_in_kbps_from_timing, dc_link_bandwidth_kbps) instead Cc: Jerry Zuo Signed-off-by: David Francis --- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 41 ++++--------------- 1 file changed, 8 insertions(+), 33 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..b32c0790399a 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; aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context; @@ -205,40 +205,15 @@ bool dm_helpers_dp_mst_write_payload_allocation_table( mst_port = aconnector->port; if (enable) { - clock = stream->timing.pix_clk_100hz / 10; - - switch (stream->timing.display_color_depth) { - - case COLOR_DEPTH_666: - bpp = 6; - break; - case COLOR_DEPTH_888: - bpp = 8; - break; - case COLOR_DEPTH_101010: - bpp = 10; - break; - case COLOR_DEPTH_121212: - bpp = 12; - break; - case COLOR_DEPTH_141414: - bpp = 14; - break; - case COLOR_DEPTH_161616: - bpp = 16; - break; - default: - ASSERT(bpp != 0); - break; - } - - bpp = bpp * 3; - - /* TODO need to know link rate */ + clock = dc_bandwidth_in_kbps_from_timing(&stream->timing); - pbn = drm_dp_calc_pbn_mode(clock, bpp); + /* dc_bandwidth_in_kbps_from_timing already takes bpp into account */ + pbn = drm_dp_calc_pbn_mode(clock, 1); - 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)