From patchwork Thu Aug 22 13:57:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Francis X-Patchwork-Id: 11109349 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 912D613B1 for ; Thu, 22 Aug 2019 13:57: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 79A2E22CE3 for ; Thu, 22 Aug 2019 13:57:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 79A2E22CE3 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 B32C36EB3F; Thu, 22 Aug 2019 13:57:52 +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-eopbgr750089.outbound.protection.outlook.com [40.107.75.89]) by gabe.freedesktop.org (Postfix) with ESMTPS id CFD4E6EB40 for ; Thu, 22 Aug 2019 13:57:48 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HGnjEugw9Xcu2sPz7/b3ZT5Bcx+jrgeeRDg8pZ8DFUuIEbTDWnCfQee2snlGFMHw5rBXMdpkERN+pZS48+KxdrcA3L6HUziGlp8D3QypzXtaOZ1mBZB2wijof67eIs3Xc6bMtqxFOIM5O3HYogWkoJhJh1S5hPIm1JprFULP2H6ZZ1e187jaWRIpdkm8SQcsLab/8RPUZDFkSN/KDtKVY3JrKpQ3Rvkkr037VKEcvde6BZ8nxWRz2K94xeWM1hQHLbKEgTsatRNnu2GYeIuwLOdbi/J7jvkX2mbYGI9sLhBN46RUm2KT/+gjsF81Vj8BU7kraLLcYPJu68CF3MwG/w== 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=WD6PuSzOr8D1s3jt+KG3wrkteGxV5smKpWuuOkVbS7E=; b=S89zjrUkOrD7X1kFN2S2mePf46jTT0NJmn5846eBSIpHVYfCfz8SB+4GNAsO9To72GUoV82HQ/84jf3NXUn4qONhHgvsuE0Xhx77XaM9I5S1igWvBRpm39m5yUOsc6+AA5fuyL3EZgZL++MrBB3VLS2JFNhxWlhKHgv6JSX49OLYZYJlyesI4wkA82CfBmSly5Xjbr+bX+QFbUeDlcK5A9vGKdqpXwN+isiItKgAGOI2wTOtzPcFUONK9eGuaU4YvEHvOwbi+M2OPyOaP+feofCwjYSVmCSudnfVhtzqyTZUcZoJpaqrBTKDHpUVtCtdkIsf2AMUDGvRZPSP2bp5yQ== 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 DM3PR12CA0085.namprd12.prod.outlook.com (2603:10b6:0:57::29) by CY4PR12MB1269.namprd12.prod.outlook.com (2603:10b6:903:40::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16; Thu, 22 Aug 2019 13:57:47 +0000 Received: from CO1NAM03FT023.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::205) by DM3PR12CA0085.outlook.office365.com (2603:10b6:0:57::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2199.15 via Frontend Transport; Thu, 22 Aug 2019 13:57:47 +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 CO1NAM03FT023.mail.protection.outlook.com (10.152.80.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Thu, 22 Aug 2019 13:57:46 +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; Thu, 22 Aug 2019 08:57:44 -0500 From: David Francis To: Subject: [PATCH v4 1/5] drm/dp-mst: Add PBN calculation for DSC modes Date: Thu, 22 Aug 2019 09:57:37 -0400 Message-ID: <20190822135741.12923-2-David.Francis@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190822135741.12923-1-David.Francis@amd.com> References: <20190822135741.12923-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)(136003)(376002)(346002)(39860400002)(2980300002)(428003)(189003)(199004)(47776003)(2906002)(6666004)(6916009)(5660300002)(1076003)(186003)(53936002)(356004)(426003)(81156014)(81166006)(4326008)(16586007)(316002)(305945005)(36756003)(26005)(76176011)(126002)(478600001)(2351001)(2616005)(14444005)(476003)(336012)(48376002)(70206006)(50466002)(86362001)(11346002)(50226002)(70586007)(446003)(8936002)(51416003)(486006)(49486002)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1269; 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: 3ca30a03-619c-4046-0e67-08d72708b630 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600166)(711020)(4605104)(1401327)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328); SRVR:CY4PR12MB1269; X-MS-TrafficTypeDiagnostic: CY4PR12MB1269: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-Forefront-PRVS: 01371B902F X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: Mo+1/ItXL+A2kEAZpnLcSMHY85QQpFM28w1jLjT6YeIFaVRqrs52xbf899yVFCTGf9JbnLlDV/HdWEXlDxk1yaNOVWp4yJon++NjH/2DzhMpXG9OkR8JhbJ0MUJY8kvK1TcgN5S+M1lMuRsLHOfpRo8C7k6bwQaTO1tbP+Aa+krS7zPqva8XqjjsuSo46Z8+D0guxpfUgbN2AxVcqX+oiAGE4mt+GoN6h/GyKEkg/J342FpJ4F/LvmwaIQfdgqLFFqXv7btkXuLjhRMcT3D/GBGzJGRT8m1Hgp5VK/deihXWnGlD/xbr4xABcNBwtpXFxnQh9AEY3bVBclsdIFOYXJXrgPfNm74N5MQog3vEa1NNjFC30Vu8Q5x5ghEqFnASomgxDdGxxQKxBdPI/uob+Z7wfrrwRRSeJfc4Pd6UD3c= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2019 13:57:46.4057 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3ca30a03-619c-4046-0e67-08d72708b630 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: CY4PR12MB1269 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=WD6PuSzOr8D1s3jt+KG3wrkteGxV5smKpWuuOkVbS7E=; b=r+ifApXrnthDt5JEdbs/rr49rhDMRw0ljiY6iEloUMEAc+IAlhgd8ktIFJeZ1YLBazWH4Jykp2sGdw49sTuz6NolQRDW7DGY2Y/QhKnonLmnB4YzP6CglZxTm+4aF0sXqOEX3cEVed0mHngNp00SJDW54dzx9RMAz+JGqkd1/1A= 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" With DSC, bpp can be a multiple of 1/16, so drm_dp_calc_pbn_mode is insufficient. Add drm_dp_calc_pbn_mode_dsc, a function which is the same as drm_dp_calc_pbn_mode, but the bpp is in units of 1/16. Reviewed-by: Lyude Paul Signed-off-by: David Francis --- drivers/gpu/drm/drm_dp_mst_topology.c | 43 +++++++++++++++++++++++++++ include/drm/drm_dp_mst_helper.h | 2 +- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 82add736e17d..8e2e731c35c5 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -3591,6 +3591,49 @@ 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 + * Returns: + * PBN required for this mode + */ +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);