From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5E2BC433EF for ; Fri, 24 Sep 2021 06:16: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 97E2461211 for ; Fri, 24 Sep 2021 06:16:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 97E2461211 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 12C096EDEA; Fri, 24 Sep 2021 06:16:26 +0000 (UTC) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2085.outbound.protection.outlook.com [40.107.212.85]) by gabe.freedesktop.org (Postfix) with ESMTPS id D8CC26EDEA for ; Fri, 24 Sep 2021 06:16:24 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OxU247dh9QqWfyB3QlC0LZff9hWExPhKu3nyrFh61Pu4ct7MlTwURtVdCCZOzb31NpiWQQEqH+Ux7a6NQTMw7y9Xsv87IPBbrPKlrOP/E793UCj1d4kxofUX7+vStEVBQys1bu91AjVip4Efw4+/TzMqF9tiWZHGepeV/lukoOy12MAAOcjXfwHsHmx6Mt/P4M64Ou18nQmEw+KVdS9OJFazYaWiGyTjj3Oyj39FJqli0KqP1NjaHw2ZzSqva63wU3azxkJFfblmShMCxrV9Y8QVbbukYgy3eqanX3v5yNLUUlwvbWvkIUjHrQePi/vSiwUqhMcZhpr3O6umcSlZ8w== 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; bh=PXmrXMhMR8VWCgTbS6p4N5f9cOBljE4Pv+pdKZyUmrs=; b=d3NsPyEXzuT4DJBpXX/Bqkdo6ix6NPi/Zse+qvvZ4cHSB+fHeKm2WO78wl/+/6u99u//ffTHh6GVogQpwC/uGYysXIYmyqXJ+I3LIRZLPcIKSZ8Vc4xDEgzgXGbFM3nN4L6ow1o6LCz/pTLPDoSncF+i61fmZDRiksiZMmbr/1xyT6L/MFCqSMeD7eVqKu6fsNm0AW7DBUI93CpPhs8tRDO9zFVzvWvFjMxYD70TYW+emsc1RdeDTny2Lnl4y0J7oCpi0iLO6SyAdzHzkkegvK+Z87r1w8lJc/U6wFYqvyRv1qQCIC7kTs47yIv7cvZJO9ZGrK/Bj0Mr8UesMKCeCg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PXmrXMhMR8VWCgTbS6p4N5f9cOBljE4Pv+pdKZyUmrs=; b=vuTK+Od1jrAx2Mg1jOwCgYHf/MGR2E/aALx+QOwHUtWb/F+QHYGsoKVllLOaI8Pryc9HbWBI+NFYGPrsFxE2qx1Sx7ZgEI1q36qseI/xZaKCtQhJmansdc8JNzVJq5669e9fRkbBYGrGArtKulCIzqpsdHehMpPbxCob78rPQ3Q= Authentication-Results: amd.com; dkim=none (message not signed) header.d=none;amd.com; dmarc=none action=none header.from=amd.com; Received: from MN2PR12MB3775.namprd12.prod.outlook.com (2603:10b6:208:159::19) by MN2PR12MB3773.namprd12.prod.outlook.com (2603:10b6:208:164::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.18; Fri, 24 Sep 2021 06:16:15 +0000 Received: from MN2PR12MB3775.namprd12.prod.outlook.com ([fe80::dce2:96e5:aba2:66fe]) by MN2PR12MB3775.namprd12.prod.outlook.com ([fe80::dce2:96e5:aba2:66fe%6]) with mapi id 15.20.4544.018; Fri, 24 Sep 2021 06:16:14 +0000 Subject: Re: [PATCH v3] drm/amd/display: move FPU associated DSC code to DML folder To: Qingqing Zhuo , amd-gfx@lists.freedesktop.org Cc: Anson Jacob , Hersen Wu , Harry Wentland , Rodrigo Siqueira References: <20210924061028.1099459-1-Qingqing.Zhuo@amd.com> From: =?UTF-8?Q?Christian_K=c3=b6nig?= Message-ID: <381799dd-3c29-1a99-7ff8-c383b22b5ee5@amd.com> Date: Fri, 24 Sep 2021 08:16:10 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 In-Reply-To: <20210924061028.1099459-1-Qingqing.Zhuo@amd.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-ClientProxiedBy: FR0P281CA0064.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::8) To MN2PR12MB3775.namprd12.prod.outlook.com (2603:10b6:208:159::19) MIME-Version: 1.0 Received: from [IPv6:2a02:908:1252:fb60:5264:89d9:5fe9:27b8] (2a02:908:1252:fb60:5264:89d9:5fe9:27b8) by FR0P281CA0064.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.7 via Frontend Transport; Fri, 24 Sep 2021 06:16:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ee982312-f5df-4124-bc2c-08d97f22cfdc X-MS-TrafficTypeDiagnostic: MN2PR12MB3773: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mjKkK5zgcFXSeSKhWxwde/eb+aqgXeIQ//3bG3yAqRTUARAw6NLCZqeN9keKR3ATdb91+0nMm8wG+EICVqx6F6CZjcGXsoxpNFEaA01vQZ9zwyv2LddP7VSYY8i1eLo6+r7LuR+DrAYz5GC5/pe63HTKwR/xNO6Itmy0L3g572eJ+xbujjmeDx/RibeLr+hn2axYnT/SLuowDidIL+qRGC54Jjk1PTBUILK1Yw95yHntNvb58EbLLUfn/iY3ZrqlfWQDusbc1Zy2JJ7tkz5dRxdPUwztu4LxquhTyhvPstUbx4UKNnLHk1kKKN1sImwxziYyxUJGWzozdOMahiYVQsyShD3fTB5wX9kAntYn8JpquFOWdlkOEcBzqwMuytnU2jUCaZXYCw9S/6mkw9CmUOCUIAletIyGRfP1cIbqFkP43iolalzHWiLEw7FaJh8CjsDoEabHxlA2Vimv1rrHi/KiOxj6tFqhThM7SWdy4iabl5LrvJ4jcPYBk6yDjhAlTdAKpKQv41PKgkAu9TDhnpjyXAdTOhckHla32gce2DZ+cQawjocL0DfgC2XOLSZyQJjH1PzzqvIwYz9JvLEvP+B+i05k1UECelr6UcC5jAx1sYoZhsLy+Xb7cVxD1M/3RbiUaLvIWTPPrrykaP/L9T2arwtYDm8p8M909mJfnm1S57ZuFCcmnsvKJQGw+7wp7+mscoYRDPEOrOWqIi1ZPbSRPFxsap8Vj2c6g5RjBxXgju0lEGMMg3Uzl56C9lSXtU0rsMj2UEHcgv8+8TDeOA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR12MB3775.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8676002)(966005)(86362001)(31696002)(6486002)(2616005)(508600001)(38100700002)(8936002)(83380400001)(5660300002)(4326008)(66946007)(36756003)(2906002)(186003)(66556008)(66476007)(30864003)(66574015)(31686004)(54906003)(316002)(461764006)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TFA5bXFnSUtiOEd1TXZocEt4M0pwZzBTSWMySmtmZTJvVFA4TzhNVTJOTWl6?= =?utf-8?B?NDZJWWlSTFFJdmhGeEE0WVJqTkVDUnQyc0NleldsSjhwQzlOVThYckd0RTds?= =?utf-8?B?TjFTcnBZUksrQUNQa21mOEEwb0dkMGk4TXdkTEkveG1lQjQranNvb0xFYUgv?= =?utf-8?B?b3NjV09hUjhDNnRRcVF5aEVCNGxnM0FXSTRTbGhqRk9WVlNuMGk1YzlUZVE4?= =?utf-8?B?R3Vwc3hwenhYSFRRbzdzMWRQNnZZUmliQXMxaG1LNU1oUVJmbURuRG5BWFBL?= =?utf-8?B?SEJrOXpZU01pMFFGdFh5V3h5a3docHVkMnoxdktRbElpcHpRWWhGT215QlM5?= =?utf-8?B?MlMvTWd3cXFURG9WNnZESFY1d3hOaWx3akxpMlhaL0tIcVpVUzBoYlZpdjV0?= =?utf-8?B?RFFnY0dFdmhpblhDQlN6YWd4cHFDSGdLWklBd1lLS0d6YTZJV1lRRU91MGxt?= =?utf-8?B?ajBoN2x1V0RjNkk3SWlwOVJLR1hZZDVCNGV5UlVwRitCVVRaZlBGOXFucmsz?= =?utf-8?B?VXdzTFdXSzRQQ2hkY2hqNy8ySkNZTyt2QWNseTRKZ1ZPWjB3cmhZWTlQaWxx?= =?utf-8?B?SzErRFo5VEVEbS85bExtc0lnd21qSnREekxrMjhrR1MvYUNxRTVlUDhNdm11?= =?utf-8?B?dCszYWRQcEFhRUVBNDc1dHF0cmNZOFBuenkwZHlnTTlOMkNXbTcvMGhUalFj?= =?utf-8?B?TEFjbWoxemtxNDVwdzI1aHcrcUZsaEtiaStEVy9CUHpzZmJmUFRaUVZRK1BZ?= =?utf-8?B?RjFkOVNZTW1oaHpWcGdndHNleDdoRXFnK1NOaHk2QlhWWjVXZ2g5NzRGZUlY?= =?utf-8?B?aS9wTk9EOHpRbDRSaGRkR1phRE0weWFJTFliZmZ0SEY2ODljZUN3N0xGQXEx?= =?utf-8?B?ZG5DQ3orcXM2L2FoV0IydXE5OHIrd2pQenFRbTgyMEZlN3RZUldJbHhURnlK?= =?utf-8?B?YlZYZ1Z2blp3Q3l6N3hENkZ3dHdHYmhod0lNdmcwZTgzaUd1aC9DUXplUnNO?= =?utf-8?B?RXJ2U0VWcFdCbzZWbk1IcGhxcWFXNko2LzRmVzNzODRPT1RYamJDR1p4d3ll?= =?utf-8?B?SGxtbEJob253L05WRFU2eDN3aXdKOUxPUUdTSVBkSGZkNVZoc01tU29IU3NZ?= =?utf-8?B?Rm4wTFZDVTB5U2tPK2dibFU4dE02M3Z2V1JVNThIQmliZEd5ZUxEY0xLVk5k?= =?utf-8?B?NGIweVJON04zSFp0QlV2U1FJd0FSb2ZJTC9HeHdMUGxKV211ekxmNVlzZHlE?= =?utf-8?B?VHpaNzR3M2JsWWxHUU1HSWRrV3pzYTZwR1VnSGQyYnpQMmFKYzJabkhNaHly?= =?utf-8?B?dTlNSmFTZE9GZ3Erdy9yZ3hibHBuNHQwV3Z4aEZpM1pZalZNaUgwNVF0akRI?= =?utf-8?B?Vk1uaHlxVUt5MHl0aXpwdjA0SnVRbklkUDFRZnZpdzkvKzJBRnNFMjV1eWJZ?= =?utf-8?B?TXl4RkR5WCtsVUJGQ0E0Rjg5Y1dDaC9YSXVkK0lESHllYm9hSk5xNTJUSEVz?= =?utf-8?B?YVJxd0hCeUd1bzN1ZDloSUxQT1hqNm5aTGxqUEJiVDVIYVlFaDdRbEtpYytY?= =?utf-8?B?a29LcUw0amJLSWcxSVo5OWVDQU5uRC9kaUNqZmt6MWVmaGUxanhCMWNGTEx1?= =?utf-8?B?TkVNQkRrRmtIcHRFTk9oWFNyTnlsVElCSXd5RXRLeVRrcnpYVHRtZmNXRlNL?= =?utf-8?B?VmpOTUFyenB4aVZoVXYyQmdVbjRheTZUZWRVaExDSFJkcUhvV0dKYndkYVpE?= =?utf-8?B?MlMrbUdWNlUzVEFDT0ZoT1pUM00veENLS3poaVpJdG84T1dyakJPNVMwWk1w?= =?utf-8?B?bWdhWFdHck1TblR5ODFsSGI3cVVLU0Vla0NSZFlRazJCd1FTMFVWZGx5eGp6?= =?utf-8?Q?6CsHtyR/Sa0Im?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee982312-f5df-4124-bc2c-08d97f22cfdc X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB3775.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2021 06:16:14.7248 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Luo48ae9cUQHWo6sLSmnmXdqC32gV+5ITZKWOjQSjui4EEWBVXN1O9EOHTD/JHn/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3773 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" Am 24.09.21 um 08:10 schrieb Qingqing Zhuo: > As part of the FPU isolation work documented in > https://patchwork.freedesktop.org/series/93042/, isolate > code that uses FPU in DSC to DML, where all FPU code > should locate. > > This change does not refactor any fuctions but move code > around. > > v2: remove more floating point related flags in dml/Makefile > > v3: fix messed up diff. > > Cc: Anson Jacob > Cc: Christian König > Cc: Hersen Wu > Cc: Harry Wentland > Cc: Rodrigo Siqueira > Signed-off-by: Qingqing Zhuo Acked-by: Christian König > --- > drivers/gpu/drm/amd/display/dc/dml/Makefile | 3 + > .../amd/display/dc/{ => dml}/dsc/qp_tables.h | 0 > .../drm/amd/display/dc/dml/dsc/rc_calc_fpu.c | 287 ++++++++++++++++++ > .../drm/amd/display/dc/dml/dsc/rc_calc_fpu.h | 89 ++++++ > drivers/gpu/drm/amd/display/dc/dsc/Makefile | 29 -- > drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 257 ---------------- > drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h | 50 +-- > .../gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 1 - > 8 files changed, 380 insertions(+), 336 deletions(-) > rename drivers/gpu/drm/amd/display/dc/{ => dml}/dsc/qp_tables.h (100%) > create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c > create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.h > > diff --git a/drivers/gpu/drm/amd/display/dc/dml/Makefile b/drivers/gpu/drm/amd/display/dc/dml/Makefile > index 56055df2e8d2..9009b92490f3 100644 > --- a/drivers/gpu/drm/amd/display/dc/dml/Makefile > +++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile > @@ -70,6 +70,7 @@ CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_mode_vba_30.o := $(dml_ccflags) $(fram > CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_rq_dlg_calc_30.o := $(dml_ccflags) > CFLAGS_$(AMDDALPATH)/dc/dml/dcn31/display_mode_vba_31.o := $(dml_ccflags) $(frame_warn_flag) > CFLAGS_$(AMDDALPATH)/dc/dml/dcn31/display_rq_dlg_calc_31.o := $(dml_ccflags) > +CFLAGS_$(AMDDALPATH)/dc/dml/dsc/rc_calc_fpu.o := $(dml_ccflags) > CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_ccflags) > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_rcflags) > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn2x/dcn2x.o := $(dml_rcflags) > @@ -84,6 +85,7 @@ CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn30/display_rq_dlg_calc_30.o := $(dml_rcfla > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn31/display_mode_vba_31.o := $(dml_rcflags) > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn31/display_rq_dlg_calc_31.o := $(dml_rcflags) > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_rcflags) > +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dsc/rc_calc_fpu.o := $(dml_rcflags) > endif > CFLAGS_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_ccflags) > CFLAGS_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o := $(dml_ccflags) > @@ -99,6 +101,7 @@ DML += dcn20/display_rq_dlg_calc_20v2.o dcn20/display_mode_vba_20v2.o > DML += dcn21/display_rq_dlg_calc_21.o dcn21/display_mode_vba_21.o > DML += dcn30/display_mode_vba_30.o dcn30/display_rq_dlg_calc_30.o > DML += dcn31/display_mode_vba_31.o dcn31/display_rq_dlg_calc_31.o > +DML += dsc/rc_calc_fpu.o > endif > > AMD_DAL_DML = $(addprefix $(AMDDALPATH)/dc/dml/,$(DML)) > diff --git a/drivers/gpu/drm/amd/display/dc/dsc/qp_tables.h b/drivers/gpu/drm/amd/display/dc/dml/dsc/qp_tables.h > similarity index 100% > rename from drivers/gpu/drm/amd/display/dc/dsc/qp_tables.h > rename to drivers/gpu/drm/amd/display/dc/dml/dsc/qp_tables.h > diff --git a/drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c b/drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c > new file mode 100644 > index 000000000000..0436fc64948f > --- /dev/null > +++ b/drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c > @@ -0,0 +1,287 @@ > +/* > + * Copyright 2021 Advanced Micro Devices, Inc. > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + * > + * Authors: AMD > + * > + */ > + > +#include "rc_calc_fpu.h" > + > +#include "qp_tables.h" > +#include "amdgpu_dm/dc_fpu.h" > + > +#define table_hash(mode, bpc, max_min) ((mode << 16) | (bpc << 8) | max_min) > + > +#define MODE_SELECT(val444, val422, val420) \ > + (cm == CM_444 || cm == CM_RGB) ? (val444) : (cm == CM_422 ? (val422) : (val420)) > + > + > +#define TABLE_CASE(mode, bpc, max) case (table_hash(mode, BPC_##bpc, max)): \ > + table = qp_table_##mode##_##bpc##bpc_##max; \ > + table_size = sizeof(qp_table_##mode##_##bpc##bpc_##max)/sizeof(*qp_table_##mode##_##bpc##bpc_##max); \ > + break > + > +static int median3(int a, int b, int c) > +{ > + if (a > b) > + swap(a, b); > + if (b > c) > + swap(b, c); > + if (a > b) > + swap(b, c); > + > + return b; > +} > + > +static double dsc_roundf(double num) > +{ > + if (num < 0.0) > + num = num - 0.5; > + else > + num = num + 0.5; > + > + return (int)(num); > +} > + > +static double dsc_ceil(double num) > +{ > + double retval = (int)num; > + > + if (retval != num && num > 0) > + retval = num + 1; > + > + return (int)retval; > +} > + > +static void get_qp_set(qp_set qps, enum colour_mode cm, enum bits_per_comp bpc, > + enum max_min max_min, float bpp) > +{ > + int mode = MODE_SELECT(444, 422, 420); > + int sel = table_hash(mode, bpc, max_min); > + int table_size = 0; > + int index; > + const struct qp_entry *table = 0L; > + > + // alias enum > + enum { min = DAL_MM_MIN, max = DAL_MM_MAX }; > + switch (sel) { > + TABLE_CASE(444, 8, max); > + TABLE_CASE(444, 8, min); > + TABLE_CASE(444, 10, max); > + TABLE_CASE(444, 10, min); > + TABLE_CASE(444, 12, max); > + TABLE_CASE(444, 12, min); > + TABLE_CASE(422, 8, max); > + TABLE_CASE(422, 8, min); > + TABLE_CASE(422, 10, max); > + TABLE_CASE(422, 10, min); > + TABLE_CASE(422, 12, max); > + TABLE_CASE(422, 12, min); > + TABLE_CASE(420, 8, max); > + TABLE_CASE(420, 8, min); > + TABLE_CASE(420, 10, max); > + TABLE_CASE(420, 10, min); > + TABLE_CASE(420, 12, max); > + TABLE_CASE(420, 12, min); > + } > + > + if (table == 0) > + return; > + > + index = (bpp - table[0].bpp) * 2; > + > + /* requested size is bigger than the table */ > + if (index >= table_size) { > + dm_error("ERROR: Requested rc_calc to find a bpp entry that exceeds the table size\n"); > + return; > + } > + > + memcpy(qps, table[index].qps, sizeof(qp_set)); > +} > + > +static void get_ofs_set(qp_set ofs, enum colour_mode mode, float bpp) > +{ > + int *p = ofs; > + > + if (mode == CM_444 || mode == CM_RGB) { > + *p++ = (bpp <= 6) ? (0) : ((((bpp >= 8) && (bpp <= 12))) ? (2) : ((bpp >= 15) ? (10) : ((((bpp > 6) && (bpp < 8))) ? (0 + dsc_roundf((bpp - 6) * (2 / 2.0))) : (2 + dsc_roundf((bpp - 12) * (8 / 3.0)))))); > + *p++ = (bpp <= 6) ? (-2) : ((((bpp >= 8) && (bpp <= 12))) ? (0) : ((bpp >= 15) ? (8) : ((((bpp > 6) && (bpp < 8))) ? (-2 + dsc_roundf((bpp - 6) * (2 / 2.0))) : (0 + dsc_roundf((bpp - 12) * (8 / 3.0)))))); > + *p++ = (bpp <= 6) ? (-2) : ((((bpp >= 8) && (bpp <= 12))) ? (0) : ((bpp >= 15) ? (6) : ((((bpp > 6) && (bpp < 8))) ? (-2 + dsc_roundf((bpp - 6) * (2 / 2.0))) : (0 + dsc_roundf((bpp - 12) * (6 / 3.0)))))); > + *p++ = (bpp <= 6) ? (-4) : ((((bpp >= 8) && (bpp <= 12))) ? (-2) : ((bpp >= 15) ? (4) : ((((bpp > 6) && (bpp < 8))) ? (-4 + dsc_roundf((bpp - 6) * (2 / 2.0))) : (-2 + dsc_roundf((bpp - 12) * (6 / 3.0)))))); > + *p++ = (bpp <= 6) ? (-6) : ((((bpp >= 8) && (bpp <= 12))) ? (-4) : ((bpp >= 15) ? (2) : ((((bpp > 6) && (bpp < 8))) ? (-6 + dsc_roundf((bpp - 6) * (2 / 2.0))) : (-4 + dsc_roundf((bpp - 12) * (6 / 3.0)))))); > + *p++ = (bpp <= 12) ? (-6) : ((bpp >= 15) ? (0) : (-6 + dsc_roundf((bpp - 12) * (6 / 3.0)))); > + *p++ = (bpp <= 12) ? (-8) : ((bpp >= 15) ? (-2) : (-8 + dsc_roundf((bpp - 12) * (6 / 3.0)))); > + *p++ = (bpp <= 12) ? (-8) : ((bpp >= 15) ? (-4) : (-8 + dsc_roundf((bpp - 12) * (4 / 3.0)))); > + *p++ = (bpp <= 12) ? (-8) : ((bpp >= 15) ? (-6) : (-8 + dsc_roundf((bpp - 12) * (2 / 3.0)))); > + *p++ = (bpp <= 12) ? (-10) : ((bpp >= 15) ? (-8) : (-10 + dsc_roundf((bpp - 12) * (2 / 3.0)))); > + *p++ = -10; > + *p++ = (bpp <= 6) ? (-12) : ((bpp >= 8) ? (-10) : (-12 + dsc_roundf((bpp - 6) * (2 / 2.0)))); > + *p++ = -12; > + *p++ = -12; > + *p++ = -12; > + } else if (mode == CM_422) { > + *p++ = (bpp <= 8) ? (2) : ((bpp >= 10) ? (10) : (2 + dsc_roundf((bpp - 8) * (8 / 2.0)))); > + *p++ = (bpp <= 8) ? (0) : ((bpp >= 10) ? (8) : (0 + dsc_roundf((bpp - 8) * (8 / 2.0)))); > + *p++ = (bpp <= 8) ? (0) : ((bpp >= 10) ? (6) : (0 + dsc_roundf((bpp - 8) * (6 / 2.0)))); > + *p++ = (bpp <= 8) ? (-2) : ((bpp >= 10) ? (4) : (-2 + dsc_roundf((bpp - 8) * (6 / 2.0)))); > + *p++ = (bpp <= 8) ? (-4) : ((bpp >= 10) ? (2) : (-4 + dsc_roundf((bpp - 8) * (6 / 2.0)))); > + *p++ = (bpp <= 8) ? (-6) : ((bpp >= 10) ? (0) : (-6 + dsc_roundf((bpp - 8) * (6 / 2.0)))); > + *p++ = (bpp <= 8) ? (-8) : ((bpp >= 10) ? (-2) : (-8 + dsc_roundf((bpp - 8) * (6 / 2.0)))); > + *p++ = (bpp <= 8) ? (-8) : ((bpp >= 10) ? (-4) : (-8 + dsc_roundf((bpp - 8) * (4 / 2.0)))); > + *p++ = (bpp <= 8) ? (-8) : ((bpp >= 10) ? (-6) : (-8 + dsc_roundf((bpp - 8) * (2 / 2.0)))); > + *p++ = (bpp <= 8) ? (-10) : ((bpp >= 10) ? (-8) : (-10 + dsc_roundf((bpp - 8) * (2 / 2.0)))); > + *p++ = -10; > + *p++ = (bpp <= 6) ? (-12) : ((bpp >= 7) ? (-10) : (-12 + dsc_roundf((bpp - 6) * (2.0 / 1)))); > + *p++ = -12; > + *p++ = -12; > + *p++ = -12; > + } else { > + *p++ = (bpp <= 6) ? (2) : ((bpp >= 8) ? (10) : (2 + dsc_roundf((bpp - 6) * (8 / 2.0)))); > + *p++ = (bpp <= 6) ? (0) : ((bpp >= 8) ? (8) : (0 + dsc_roundf((bpp - 6) * (8 / 2.0)))); > + *p++ = (bpp <= 6) ? (0) : ((bpp >= 8) ? (6) : (0 + dsc_roundf((bpp - 6) * (6 / 2.0)))); > + *p++ = (bpp <= 6) ? (-2) : ((bpp >= 8) ? (4) : (-2 + dsc_roundf((bpp - 6) * (6 / 2.0)))); > + *p++ = (bpp <= 6) ? (-4) : ((bpp >= 8) ? (2) : (-4 + dsc_roundf((bpp - 6) * (6 / 2.0)))); > + *p++ = (bpp <= 6) ? (-6) : ((bpp >= 8) ? (0) : (-6 + dsc_roundf((bpp - 6) * (6 / 2.0)))); > + *p++ = (bpp <= 6) ? (-8) : ((bpp >= 8) ? (-2) : (-8 + dsc_roundf((bpp - 6) * (6 / 2.0)))); > + *p++ = (bpp <= 6) ? (-8) : ((bpp >= 8) ? (-4) : (-8 + dsc_roundf((bpp - 6) * (4 / 2.0)))); > + *p++ = (bpp <= 6) ? (-8) : ((bpp >= 8) ? (-6) : (-8 + dsc_roundf((bpp - 6) * (2 / 2.0)))); > + *p++ = (bpp <= 6) ? (-10) : ((bpp >= 8) ? (-8) : (-10 + dsc_roundf((bpp - 6) * (2 / 2.0)))); > + *p++ = -10; > + *p++ = (bpp <= 4) ? (-12) : ((bpp >= 5) ? (-10) : (-12 + dsc_roundf((bpp - 4) * (2 / 1.0)))); > + *p++ = -12; > + *p++ = -12; > + *p++ = -12; > + } > +} > + > +void _do_calc_rc_params(struct rc_params *rc, enum colour_mode cm, > + enum bits_per_comp bpc, u16 drm_bpp, > + bool is_navite_422_or_420, > + int slice_width, int slice_height, > + int minor_version) > +{ > + float bpp; > + float bpp_group; > + float initial_xmit_delay_factor; > + int padding_pixels; > + int i; > + > + dc_assert_fp_enabled(); > + > + bpp = ((float)drm_bpp / 16.0); > + /* in native_422 or native_420 modes, the bits_per_pixel is double the > + * target bpp (the latter is what calc_rc_params expects) > + */ > + if (is_navite_422_or_420) > + bpp /= 2.0; > + > + rc->rc_quant_incr_limit0 = ((bpc == BPC_8) ? 11 : (bpc == BPC_10 ? 15 : 19)) - ((minor_version == 1 && cm == CM_444) ? 1 : 0); > + rc->rc_quant_incr_limit1 = ((bpc == BPC_8) ? 11 : (bpc == BPC_10 ? 15 : 19)) - ((minor_version == 1 && cm == CM_444) ? 1 : 0); > + > + bpp_group = MODE_SELECT(bpp, bpp * 2.0, bpp * 2.0); > + > + switch (cm) { > + case CM_420: > + rc->initial_fullness_offset = (bpp >= 6) ? (2048) : ((bpp <= 4) ? (6144) : ((((bpp > 4) && (bpp <= 5))) ? (6144 - dsc_roundf((bpp - 4) * (512))) : (5632 - dsc_roundf((bpp - 5) * (3584))))); > + rc->first_line_bpg_offset = median3(0, (12 + (int) (0.09 * min(34, slice_height - 8))), (int)((3 * bpc * 3) - (3 * bpp_group))); > + rc->second_line_bpg_offset = median3(0, 12, (int)((3 * bpc * 3) - (3 * bpp_group))); > + break; > + case CM_422: > + rc->initial_fullness_offset = (bpp >= 8) ? (2048) : ((bpp <= 7) ? (5632) : (5632 - dsc_roundf((bpp - 7) * (3584)))); > + rc->first_line_bpg_offset = median3(0, (12 + (int) (0.09 * min(34, slice_height - 8))), (int)((3 * bpc * 4) - (3 * bpp_group))); > + rc->second_line_bpg_offset = 0; > + break; > + case CM_444: > + case CM_RGB: > + rc->initial_fullness_offset = (bpp >= 12) ? (2048) : ((bpp <= 8) ? (6144) : ((((bpp > 8) && (bpp <= 10))) ? (6144 - dsc_roundf((bpp - 8) * (512 / 2))) : (5632 - dsc_roundf((bpp - 10) * (3584 / 2))))); > + rc->first_line_bpg_offset = median3(0, (12 + (int) (0.09 * min(34, slice_height - 8))), (int)(((3 * bpc + (cm == CM_444 ? 0 : 2)) * 3) - (3 * bpp_group))); > + rc->second_line_bpg_offset = 0; > + break; > + } > + > + initial_xmit_delay_factor = (cm == CM_444 || cm == CM_RGB) ? 1.0 : 2.0; > + rc->initial_xmit_delay = dsc_roundf(8192.0/2.0/bpp/initial_xmit_delay_factor); > + > + if (cm == CM_422 || cm == CM_420) > + slice_width /= 2; > + > + padding_pixels = ((slice_width % 3) != 0) ? (3 - (slice_width % 3)) * (rc->initial_xmit_delay / slice_width) : 0; > + if (3 * bpp_group >= (((rc->initial_xmit_delay + 2) / 3) * (3 + (cm == CM_422)))) { > + if ((rc->initial_xmit_delay + padding_pixels) % 3 == 1) > + rc->initial_xmit_delay++; > + } > + > + rc->flatness_min_qp = ((bpc == BPC_8) ? (3) : ((bpc == BPC_10) ? (7) : (11))) - ((minor_version == 1 && cm == CM_444) ? 1 : 0); > + rc->flatness_max_qp = ((bpc == BPC_8) ? (12) : ((bpc == BPC_10) ? (16) : (20))) - ((minor_version == 1 && cm == CM_444) ? 1 : 0); > + rc->flatness_det_thresh = 2 << (bpc - 8); > + > + get_qp_set(rc->qp_min, cm, bpc, DAL_MM_MIN, bpp); > + get_qp_set(rc->qp_max, cm, bpc, DAL_MM_MAX, bpp); > + if (cm == CM_444 && minor_version == 1) { > + for (i = 0; i < QP_SET_SIZE; ++i) { > + rc->qp_min[i] = rc->qp_min[i] > 0 ? rc->qp_min[i] - 1 : 0; > + rc->qp_max[i] = rc->qp_max[i] > 0 ? rc->qp_max[i] - 1 : 0; > + } > + } > + get_ofs_set(rc->ofs, cm, bpp); > + > + /* fixed parameters */ > + rc->rc_model_size = 8192; > + rc->rc_edge_factor = 6; > + rc->rc_tgt_offset_hi = 3; > + rc->rc_tgt_offset_lo = 3; > + > + rc->rc_buf_thresh[0] = 896; > + rc->rc_buf_thresh[1] = 1792; > + rc->rc_buf_thresh[2] = 2688; > + rc->rc_buf_thresh[3] = 3584; > + rc->rc_buf_thresh[4] = 4480; > + rc->rc_buf_thresh[5] = 5376; > + rc->rc_buf_thresh[6] = 6272; > + rc->rc_buf_thresh[7] = 6720; > + rc->rc_buf_thresh[8] = 7168; > + rc->rc_buf_thresh[9] = 7616; > + rc->rc_buf_thresh[10] = 7744; > + rc->rc_buf_thresh[11] = 7872; > + rc->rc_buf_thresh[12] = 8000; > + rc->rc_buf_thresh[13] = 8064; > +} > + > +u32 _do_bytes_per_pixel_calc(int slice_width, u16 drm_bpp, > + bool is_navite_422_or_420) > +{ > + float bpp; > + u32 bytes_per_pixel; > + double d_bytes_per_pixel; > + > + dc_assert_fp_enabled(); > + > + bpp = ((float)drm_bpp / 16.0); > + d_bytes_per_pixel = dsc_ceil(bpp * slice_width / 8.0) / slice_width; > + // TODO: Make sure the formula for calculating this is precise (ceiling > + // vs. floor, and at what point they should be applied) > + if (is_navite_422_or_420) > + d_bytes_per_pixel /= 2; > + > + bytes_per_pixel = (u32)dsc_ceil(d_bytes_per_pixel * 0x10000000); > + > + return bytes_per_pixel; > +} > \ No newline at end of file > diff --git a/drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.h b/drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.h > new file mode 100644 > index 000000000000..d3900ff7fa89 > --- /dev/null > +++ b/drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.h > @@ -0,0 +1,89 @@ > +/* > + * Copyright 2021 Advanced Micro Devices, Inc. > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + * > + * Authors: AMD > + * > + */ > + > +#ifndef __RC_CALC_FPU_H__ > +#define __RC_CALC_FPU_H__ > + > +#include "os_types.h" > + > +#define QP_SET_SIZE 15 > + > +typedef int qp_set[QP_SET_SIZE]; > + > +struct rc_params { > + int rc_quant_incr_limit0; > + int rc_quant_incr_limit1; > + int initial_fullness_offset; > + int initial_xmit_delay; > + int first_line_bpg_offset; > + int second_line_bpg_offset; > + int flatness_min_qp; > + int flatness_max_qp; > + int flatness_det_thresh; > + qp_set qp_min; > + qp_set qp_max; > + qp_set ofs; > + int rc_model_size; > + int rc_edge_factor; > + int rc_tgt_offset_hi; > + int rc_tgt_offset_lo; > + int rc_buf_thresh[QP_SET_SIZE - 1]; > +}; > + > +enum colour_mode { > + CM_RGB, /* 444 RGB */ > + CM_444, /* 444 YUV or simple 422 */ > + CM_422, /* native 422 */ > + CM_420 /* native 420 */ > +}; > + > +enum bits_per_comp { > + BPC_8 = 8, > + BPC_10 = 10, > + BPC_12 = 12 > +}; > + > +enum max_min { > + DAL_MM_MIN = 0, > + DAL_MM_MAX = 1 > +}; > + > +struct qp_entry { > + float bpp; > + const qp_set qps; > +}; > + > +typedef struct qp_entry qp_table[]; > + > +u32 _do_bytes_per_pixel_calc(int slice_width, u16 drm_bpp, > + bool is_navite_422_or_420); > + > +void _do_calc_rc_params(struct rc_params *rc, enum colour_mode cm, > + enum bits_per_comp bpc, u16 drm_bpp, > + bool is_navite_422_or_420, > + int slice_width, int slice_height, > + int minor_version); > + > +#endif > \ No newline at end of file > diff --git a/drivers/gpu/drm/amd/display/dc/dsc/Makefile b/drivers/gpu/drm/amd/display/dc/dsc/Makefile > index 8d31eb75c6a6..a2537229ee88 100644 > --- a/drivers/gpu/drm/amd/display/dc/dsc/Makefile > +++ b/drivers/gpu/drm/amd/display/dc/dsc/Makefile > @@ -1,35 +1,6 @@ > # SPDX-License-Identifier: MIT > # > # Makefile for the 'dsc' sub-component of DAL. > - > -ifdef CONFIG_X86 > -dsc_ccflags := -mhard-float -msse > -endif > - > -ifdef CONFIG_PPC64 > -dsc_ccflags := -mhard-float -maltivec > -endif > - > -ifdef CONFIG_CC_IS_GCC > -ifeq ($(call cc-ifversion, -lt, 0701, y), y) > -IS_OLD_GCC = 1 > -endif > -endif > - > -ifdef CONFIG_X86 > -ifdef IS_OLD_GCC > -# Stack alignment mismatch, proceed with caution. > -# GCC < 7.1 cannot compile code using `double` and -mpreferred-stack-boundary=3 > -# (8B stack alignment). > -dsc_ccflags += -mpreferred-stack-boundary=4 > -else > -dsc_ccflags += -msse2 > -endif > -endif > - > -CFLAGS_$(AMDDALPATH)/dc/dsc/rc_calc.o := $(dsc_ccflags) > -CFLAGS_REMOVE_$(AMDDALPATH)/dc/dsc/rc_calc.o := $(dsc_rcflags) > - > DSC = dc_dsc.o rc_calc.o rc_calc_dpi.o > > AMD_DAL_DSC = $(addprefix $(AMDDALPATH)/dc/dsc/,$(DSC)) > diff --git a/drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c b/drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c > index 7b294f637881..87acec33b8d8 100644 > --- a/drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c > +++ b/drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c > @@ -25,264 +25,7 @@ > */ > #include > > -#include "os_types.h" > #include "rc_calc.h" > -#include "qp_tables.h" > - > -#define table_hash(mode, bpc, max_min) ((mode << 16) | (bpc << 8) | max_min) > - > -#define MODE_SELECT(val444, val422, val420) \ > - (cm == CM_444 || cm == CM_RGB) ? (val444) : (cm == CM_422 ? (val422) : (val420)) > - > - > -#define TABLE_CASE(mode, bpc, max) case (table_hash(mode, BPC_##bpc, max)): \ > - table = qp_table_##mode##_##bpc##bpc_##max; \ > - table_size = sizeof(qp_table_##mode##_##bpc##bpc_##max)/sizeof(*qp_table_##mode##_##bpc##bpc_##max); \ > - break > - > - > -static void get_qp_set(qp_set qps, enum colour_mode cm, enum bits_per_comp bpc, > - enum max_min max_min, float bpp) > -{ > - int mode = MODE_SELECT(444, 422, 420); > - int sel = table_hash(mode, bpc, max_min); > - int table_size = 0; > - int index; > - const struct qp_entry *table = 0L; > - > - // alias enum > - enum { min = DAL_MM_MIN, max = DAL_MM_MAX }; > - switch (sel) { > - TABLE_CASE(444, 8, max); > - TABLE_CASE(444, 8, min); > - TABLE_CASE(444, 10, max); > - TABLE_CASE(444, 10, min); > - TABLE_CASE(444, 12, max); > - TABLE_CASE(444, 12, min); > - TABLE_CASE(422, 8, max); > - TABLE_CASE(422, 8, min); > - TABLE_CASE(422, 10, max); > - TABLE_CASE(422, 10, min); > - TABLE_CASE(422, 12, max); > - TABLE_CASE(422, 12, min); > - TABLE_CASE(420, 8, max); > - TABLE_CASE(420, 8, min); > - TABLE_CASE(420, 10, max); > - TABLE_CASE(420, 10, min); > - TABLE_CASE(420, 12, max); > - TABLE_CASE(420, 12, min); > - } > - > - if (table == 0) > - return; > - > - index = (bpp - table[0].bpp) * 2; > - > - /* requested size is bigger than the table */ > - if (index >= table_size) { > - dm_error("ERROR: Requested rc_calc to find a bpp entry that exceeds the table size\n"); > - return; > - } > - > - memcpy(qps, table[index].qps, sizeof(qp_set)); > -} > - > -static double dsc_roundf(double num) > -{ > - if (num < 0.0) > - num = num - 0.5; > - else > - num = num + 0.5; > - > - return (int)(num); > -} > - > -static double dsc_ceil(double num) > -{ > - double retval = (int)num; > - > - if (retval != num && num > 0) > - retval = num + 1; > - > - return (int)retval; > -} > - > -static void get_ofs_set(qp_set ofs, enum colour_mode mode, float bpp) > -{ > - int *p = ofs; > - > - if (mode == CM_444 || mode == CM_RGB) { > - *p++ = (bpp <= 6) ? (0) : ((((bpp >= 8) && (bpp <= 12))) ? (2) : ((bpp >= 15) ? (10) : ((((bpp > 6) && (bpp < 8))) ? (0 + dsc_roundf((bpp - 6) * (2 / 2.0))) : (2 + dsc_roundf((bpp - 12) * (8 / 3.0)))))); > - *p++ = (bpp <= 6) ? (-2) : ((((bpp >= 8) && (bpp <= 12))) ? (0) : ((bpp >= 15) ? (8) : ((((bpp > 6) && (bpp < 8))) ? (-2 + dsc_roundf((bpp - 6) * (2 / 2.0))) : (0 + dsc_roundf((bpp - 12) * (8 / 3.0)))))); > - *p++ = (bpp <= 6) ? (-2) : ((((bpp >= 8) && (bpp <= 12))) ? (0) : ((bpp >= 15) ? (6) : ((((bpp > 6) && (bpp < 8))) ? (-2 + dsc_roundf((bpp - 6) * (2 / 2.0))) : (0 + dsc_roundf((bpp - 12) * (6 / 3.0)))))); > - *p++ = (bpp <= 6) ? (-4) : ((((bpp >= 8) && (bpp <= 12))) ? (-2) : ((bpp >= 15) ? (4) : ((((bpp > 6) && (bpp < 8))) ? (-4 + dsc_roundf((bpp - 6) * (2 / 2.0))) : (-2 + dsc_roundf((bpp - 12) * (6 / 3.0)))))); > - *p++ = (bpp <= 6) ? (-6) : ((((bpp >= 8) && (bpp <= 12))) ? (-4) : ((bpp >= 15) ? (2) : ((((bpp > 6) && (bpp < 8))) ? (-6 + dsc_roundf((bpp - 6) * (2 / 2.0))) : (-4 + dsc_roundf((bpp - 12) * (6 / 3.0)))))); > - *p++ = (bpp <= 12) ? (-6) : ((bpp >= 15) ? (0) : (-6 + dsc_roundf((bpp - 12) * (6 / 3.0)))); > - *p++ = (bpp <= 12) ? (-8) : ((bpp >= 15) ? (-2) : (-8 + dsc_roundf((bpp - 12) * (6 / 3.0)))); > - *p++ = (bpp <= 12) ? (-8) : ((bpp >= 15) ? (-4) : (-8 + dsc_roundf((bpp - 12) * (4 / 3.0)))); > - *p++ = (bpp <= 12) ? (-8) : ((bpp >= 15) ? (-6) : (-8 + dsc_roundf((bpp - 12) * (2 / 3.0)))); > - *p++ = (bpp <= 12) ? (-10) : ((bpp >= 15) ? (-8) : (-10 + dsc_roundf((bpp - 12) * (2 / 3.0)))); > - *p++ = -10; > - *p++ = (bpp <= 6) ? (-12) : ((bpp >= 8) ? (-10) : (-12 + dsc_roundf((bpp - 6) * (2 / 2.0)))); > - *p++ = -12; > - *p++ = -12; > - *p++ = -12; > - } else if (mode == CM_422) { > - *p++ = (bpp <= 8) ? (2) : ((bpp >= 10) ? (10) : (2 + dsc_roundf((bpp - 8) * (8 / 2.0)))); > - *p++ = (bpp <= 8) ? (0) : ((bpp >= 10) ? (8) : (0 + dsc_roundf((bpp - 8) * (8 / 2.0)))); > - *p++ = (bpp <= 8) ? (0) : ((bpp >= 10) ? (6) : (0 + dsc_roundf((bpp - 8) * (6 / 2.0)))); > - *p++ = (bpp <= 8) ? (-2) : ((bpp >= 10) ? (4) : (-2 + dsc_roundf((bpp - 8) * (6 / 2.0)))); > - *p++ = (bpp <= 8) ? (-4) : ((bpp >= 10) ? (2) : (-4 + dsc_roundf((bpp - 8) * (6 / 2.0)))); > - *p++ = (bpp <= 8) ? (-6) : ((bpp >= 10) ? (0) : (-6 + dsc_roundf((bpp - 8) * (6 / 2.0)))); > - *p++ = (bpp <= 8) ? (-8) : ((bpp >= 10) ? (-2) : (-8 + dsc_roundf((bpp - 8) * (6 / 2.0)))); > - *p++ = (bpp <= 8) ? (-8) : ((bpp >= 10) ? (-4) : (-8 + dsc_roundf((bpp - 8) * (4 / 2.0)))); > - *p++ = (bpp <= 8) ? (-8) : ((bpp >= 10) ? (-6) : (-8 + dsc_roundf((bpp - 8) * (2 / 2.0)))); > - *p++ = (bpp <= 8) ? (-10) : ((bpp >= 10) ? (-8) : (-10 + dsc_roundf((bpp - 8) * (2 / 2.0)))); > - *p++ = -10; > - *p++ = (bpp <= 6) ? (-12) : ((bpp >= 7) ? (-10) : (-12 + dsc_roundf((bpp - 6) * (2.0 / 1)))); > - *p++ = -12; > - *p++ = -12; > - *p++ = -12; > - } else { > - *p++ = (bpp <= 6) ? (2) : ((bpp >= 8) ? (10) : (2 + dsc_roundf((bpp - 6) * (8 / 2.0)))); > - *p++ = (bpp <= 6) ? (0) : ((bpp >= 8) ? (8) : (0 + dsc_roundf((bpp - 6) * (8 / 2.0)))); > - *p++ = (bpp <= 6) ? (0) : ((bpp >= 8) ? (6) : (0 + dsc_roundf((bpp - 6) * (6 / 2.0)))); > - *p++ = (bpp <= 6) ? (-2) : ((bpp >= 8) ? (4) : (-2 + dsc_roundf((bpp - 6) * (6 / 2.0)))); > - *p++ = (bpp <= 6) ? (-4) : ((bpp >= 8) ? (2) : (-4 + dsc_roundf((bpp - 6) * (6 / 2.0)))); > - *p++ = (bpp <= 6) ? (-6) : ((bpp >= 8) ? (0) : (-6 + dsc_roundf((bpp - 6) * (6 / 2.0)))); > - *p++ = (bpp <= 6) ? (-8) : ((bpp >= 8) ? (-2) : (-8 + dsc_roundf((bpp - 6) * (6 / 2.0)))); > - *p++ = (bpp <= 6) ? (-8) : ((bpp >= 8) ? (-4) : (-8 + dsc_roundf((bpp - 6) * (4 / 2.0)))); > - *p++ = (bpp <= 6) ? (-8) : ((bpp >= 8) ? (-6) : (-8 + dsc_roundf((bpp - 6) * (2 / 2.0)))); > - *p++ = (bpp <= 6) ? (-10) : ((bpp >= 8) ? (-8) : (-10 + dsc_roundf((bpp - 6) * (2 / 2.0)))); > - *p++ = -10; > - *p++ = (bpp <= 4) ? (-12) : ((bpp >= 5) ? (-10) : (-12 + dsc_roundf((bpp - 4) * (2 / 1.0)))); > - *p++ = -12; > - *p++ = -12; > - *p++ = -12; > - } > -} > - > -static int median3(int a, int b, int c) > -{ > - if (a > b) > - swap(a, b); > - if (b > c) > - swap(b, c); > - if (a > b) > - swap(b, c); > - > - return b; > -} > - > -static void _do_calc_rc_params(struct rc_params *rc, enum colour_mode cm, > - enum bits_per_comp bpc, u16 drm_bpp, > - bool is_navite_422_or_420, > - int slice_width, int slice_height, > - int minor_version) > -{ > - float bpp; > - float bpp_group; > - float initial_xmit_delay_factor; > - int padding_pixels; > - int i; > - > - bpp = ((float)drm_bpp / 16.0); > - /* in native_422 or native_420 modes, the bits_per_pixel is double the > - * target bpp (the latter is what calc_rc_params expects) > - */ > - if (is_navite_422_or_420) > - bpp /= 2.0; > - > - rc->rc_quant_incr_limit0 = ((bpc == BPC_8) ? 11 : (bpc == BPC_10 ? 15 : 19)) - ((minor_version == 1 && cm == CM_444) ? 1 : 0); > - rc->rc_quant_incr_limit1 = ((bpc == BPC_8) ? 11 : (bpc == BPC_10 ? 15 : 19)) - ((minor_version == 1 && cm == CM_444) ? 1 : 0); > - > - bpp_group = MODE_SELECT(bpp, bpp * 2.0, bpp * 2.0); > - > - switch (cm) { > - case CM_420: > - rc->initial_fullness_offset = (bpp >= 6) ? (2048) : ((bpp <= 4) ? (6144) : ((((bpp > 4) && (bpp <= 5))) ? (6144 - dsc_roundf((bpp - 4) * (512))) : (5632 - dsc_roundf((bpp - 5) * (3584))))); > - rc->first_line_bpg_offset = median3(0, (12 + (int) (0.09 * min(34, slice_height - 8))), (int)((3 * bpc * 3) - (3 * bpp_group))); > - rc->second_line_bpg_offset = median3(0, 12, (int)((3 * bpc * 3) - (3 * bpp_group))); > - break; > - case CM_422: > - rc->initial_fullness_offset = (bpp >= 8) ? (2048) : ((bpp <= 7) ? (5632) : (5632 - dsc_roundf((bpp - 7) * (3584)))); > - rc->first_line_bpg_offset = median3(0, (12 + (int) (0.09 * min(34, slice_height - 8))), (int)((3 * bpc * 4) - (3 * bpp_group))); > - rc->second_line_bpg_offset = 0; > - break; > - case CM_444: > - case CM_RGB: > - rc->initial_fullness_offset = (bpp >= 12) ? (2048) : ((bpp <= 8) ? (6144) : ((((bpp > 8) && (bpp <= 10))) ? (6144 - dsc_roundf((bpp - 8) * (512 / 2))) : (5632 - dsc_roundf((bpp - 10) * (3584 / 2))))); > - rc->first_line_bpg_offset = median3(0, (12 + (int) (0.09 * min(34, slice_height - 8))), (int)(((3 * bpc + (cm == CM_444 ? 0 : 2)) * 3) - (3 * bpp_group))); > - rc->second_line_bpg_offset = 0; > - break; > - } > - > - initial_xmit_delay_factor = (cm == CM_444 || cm == CM_RGB) ? 1.0 : 2.0; > - rc->initial_xmit_delay = dsc_roundf(8192.0/2.0/bpp/initial_xmit_delay_factor); > - > - if (cm == CM_422 || cm == CM_420) > - slice_width /= 2; > - > - padding_pixels = ((slice_width % 3) != 0) ? (3 - (slice_width % 3)) * (rc->initial_xmit_delay / slice_width) : 0; > - if (3 * bpp_group >= (((rc->initial_xmit_delay + 2) / 3) * (3 + (cm == CM_422)))) { > - if ((rc->initial_xmit_delay + padding_pixels) % 3 == 1) > - rc->initial_xmit_delay++; > - } > - > - rc->flatness_min_qp = ((bpc == BPC_8) ? (3) : ((bpc == BPC_10) ? (7) : (11))) - ((minor_version == 1 && cm == CM_444) ? 1 : 0); > - rc->flatness_max_qp = ((bpc == BPC_8) ? (12) : ((bpc == BPC_10) ? (16) : (20))) - ((minor_version == 1 && cm == CM_444) ? 1 : 0); > - rc->flatness_det_thresh = 2 << (bpc - 8); > - > - get_qp_set(rc->qp_min, cm, bpc, DAL_MM_MIN, bpp); > - get_qp_set(rc->qp_max, cm, bpc, DAL_MM_MAX, bpp); > - if (cm == CM_444 && minor_version == 1) { > - for (i = 0; i < QP_SET_SIZE; ++i) { > - rc->qp_min[i] = rc->qp_min[i] > 0 ? rc->qp_min[i] - 1 : 0; > - rc->qp_max[i] = rc->qp_max[i] > 0 ? rc->qp_max[i] - 1 : 0; > - } > - } > - get_ofs_set(rc->ofs, cm, bpp); > - > - /* fixed parameters */ > - rc->rc_model_size = 8192; > - rc->rc_edge_factor = 6; > - rc->rc_tgt_offset_hi = 3; > - rc->rc_tgt_offset_lo = 3; > - > - rc->rc_buf_thresh[0] = 896; > - rc->rc_buf_thresh[1] = 1792; > - rc->rc_buf_thresh[2] = 2688; > - rc->rc_buf_thresh[3] = 3584; > - rc->rc_buf_thresh[4] = 4480; > - rc->rc_buf_thresh[5] = 5376; > - rc->rc_buf_thresh[6] = 6272; > - rc->rc_buf_thresh[7] = 6720; > - rc->rc_buf_thresh[8] = 7168; > - rc->rc_buf_thresh[9] = 7616; > - rc->rc_buf_thresh[10] = 7744; > - rc->rc_buf_thresh[11] = 7872; > - rc->rc_buf_thresh[12] = 8000; > - rc->rc_buf_thresh[13] = 8064; > -} > - > -static u32 _do_bytes_per_pixel_calc(int slice_width, u16 drm_bpp, > - bool is_navite_422_or_420) > -{ > - float bpp; > - u32 bytes_per_pixel; > - double d_bytes_per_pixel; > - > - bpp = ((float)drm_bpp / 16.0); > - d_bytes_per_pixel = dsc_ceil(bpp * slice_width / 8.0) / slice_width; > - // TODO: Make sure the formula for calculating this is precise (ceiling > - // vs. floor, and at what point they should be applied) > - if (is_navite_422_or_420) > - d_bytes_per_pixel /= 2; > - > - bytes_per_pixel = (u32)dsc_ceil(d_bytes_per_pixel * 0x10000000); > - > - return bytes_per_pixel; > -} > > /** > * calc_rc_params - reads the user's cmdline mode > diff --git a/drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h b/drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h > index 262f06afcbf9..c2340e001b57 100644 > --- a/drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h > +++ b/drivers/gpu/drm/amd/display/dc/dsc/rc_calc.h > @@ -27,55 +27,7 @@ > #ifndef __RC_CALC_H__ > #define __RC_CALC_H__ > > - > -#define QP_SET_SIZE 15 > - > -typedef int qp_set[QP_SET_SIZE]; > - > -struct rc_params { > - int rc_quant_incr_limit0; > - int rc_quant_incr_limit1; > - int initial_fullness_offset; > - int initial_xmit_delay; > - int first_line_bpg_offset; > - int second_line_bpg_offset; > - int flatness_min_qp; > - int flatness_max_qp; > - int flatness_det_thresh; > - qp_set qp_min; > - qp_set qp_max; > - qp_set ofs; > - int rc_model_size; > - int rc_edge_factor; > - int rc_tgt_offset_hi; > - int rc_tgt_offset_lo; > - int rc_buf_thresh[QP_SET_SIZE - 1]; > -}; > - > -enum colour_mode { > - CM_RGB, /* 444 RGB */ > - CM_444, /* 444 YUV or simple 422 */ > - CM_422, /* native 422 */ > - CM_420 /* native 420 */ > -}; > - > -enum bits_per_comp { > - BPC_8 = 8, > - BPC_10 = 10, > - BPC_12 = 12 > -}; > - > -enum max_min { > - DAL_MM_MIN = 0, > - DAL_MM_MAX = 1 > -}; > - > -struct qp_entry { > - float bpp; > - const qp_set qps; > -}; > - > -typedef struct qp_entry qp_table[]; > +#include "dml/dsc/rc_calc_fpu.h" > > void calc_rc_params(struct rc_params *rc, const struct drm_dsc_config *pps); > u32 calc_dsc_bytes_per_pixel(const struct drm_dsc_config *pps); > diff --git a/drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c b/drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c > index ef830aded5b1..1e19dd674e5a 100644 > --- a/drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c > +++ b/drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c > @@ -22,7 +22,6 @@ > * Authors: AMD > * > */ > -#include "os_types.h" > #include > #include "dscc_types.h" > #include "rc_calc.h"