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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95504C433FE for ; Mon, 7 Mar 2022 17:21:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235178AbiCGRW0 (ORCPT ); Mon, 7 Mar 2022 12:22:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239392AbiCGRWU (ORCPT ); Mon, 7 Mar 2022 12:22:20 -0500 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2063.outbound.protection.outlook.com [40.107.220.63]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE18990FE1; Mon, 7 Mar 2022 09:21:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k07QqPg6adqA9aXin4ZqxbjNCwI9DOfmkB37B60ieNGy09sGiqFcCyVeaMI6s2G5mtwzz3uv3nx9O9FKT/5+mvFVNFZBmSat6QjCyP0VPdpIpWBJNceG1svyXXDbKHWFw+C4fsUBsJzywC1Dp5kdq5SdQ+//hLnxvdSrNROwJ3lXadMbMU/d3x5gW54QnY7LTJJlm8rX0SrV51g5ipDW17aB5vINbnCDEHj1C4h72NI0pe0sbN65C+6P/S/Q2t1s5KdDQqGVkXK6IzPd+NykGpn64ZAuYyjwl9rt8p2MiT9pr0M6o+85WeGHAKLQbKui+nLHpHbVUrKEyhsuixfWsQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4mBGk7bBNNCh1rfwEbXnFJXwXePqjQaEGbilApArW4M=; b=fXt0LHV4gwXcNpB/FwQDuGyXnS2KhWrVES30Z01kfJqpaiJD1XdaDU6XEQL40Vc660SOElqGpf+qjPsS7FNktnlARZFlJtFj1/0jd6kqGfjcOEvzRuxAj3sF1Q5LcoYY4IB6e08HMGVVheChErgRvPAnKQ3IKmJBFVF/76ETdd1+Wd1xp3UH11CA7i/o9jY91RKoChmFr9bH2j27nYTp5MCu6Ul7U5XC7vSupe4/dNl6FoUpfd6WXuRKw0jXty9D1cxAzkgmipPYQK9s0/dv9D3hi6cowFa8sR2n3v81QZGoOWmixsoyPcFTw+2dnbjkP+FAWjc2fl+SS2HXArxXdA== 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=4mBGk7bBNNCh1rfwEbXnFJXwXePqjQaEGbilApArW4M=; b=fjSOo9oGCnro00vpgLxiyB2a3wsOsv+O8ox8s4F5VnGJ87AtPPmdnNOwNoFzYDDeqdMR8o+FqqxTvWM4k3dEmK1GGKRF4GxKcWdDHSYEi6vNatfFeDjtMGEQdQIgq+dqNtunzKUFkymQSOzRhcjsdv9XO+ATkeyOL6XSOm3S+Bo= Received: from BL1PR12MB5144.namprd12.prod.outlook.com (2603:10b6:208:316::6) by MN2PR12MB4078.namprd12.prod.outlook.com (2603:10b6:208:1de::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Mon, 7 Mar 2022 17:21:19 +0000 Received: from BL1PR12MB5144.namprd12.prod.outlook.com ([fe80::2877:73e4:31e7:cecf]) by BL1PR12MB5144.namprd12.prod.outlook.com ([fe80::2877:73e4:31e7:cecf%7]) with mapi id 15.20.5038.026; Mon, 7 Mar 2022 17:21:19 +0000 From: "Deucher, Alexander" To: Greg Kroah-Hartman , "linux-kernel@vger.kernel.org" CC: "stable@vger.kernel.org" , "Koenig, Christian" , "Wu, Hersen" , Anson Jacob , "Wentland, Harry" , "Siqueira, Rodrigo" , "Gutierrez, Agustin" , "Wheeler, Daniel" , "Zhuo, Qingqing (Lillian)" , Sasha Levin Subject: RE: [PATCH 5.15 100/262] drm/amd/display: move FPU associated DSC code to DML folder Thread-Topic: [PATCH 5.15 100/262] drm/amd/display: move FPU associated DSC code to DML folder Thread-Index: AQHYMgdOSuVNXIR9nku4dCgcxKRASqy0KkvQgAAA4VA= Date: Mon, 7 Mar 2022 17:21:18 +0000 Message-ID: References: <20220307091702.378509770@linuxfoundation.org> <20220307091705.301226097@linuxfoundation.org> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_d4243a53-6221-4f75-8154-e4b33a5707a1_Enabled=true; MSIP_Label_d4243a53-6221-4f75-8154-e4b33a5707a1_SetDate=2022-03-07T17:17:20Z; MSIP_Label_d4243a53-6221-4f75-8154-e4b33a5707a1_Method=Privileged; MSIP_Label_d4243a53-6221-4f75-8154-e4b33a5707a1_Name=Public-AIP 2.0; MSIP_Label_d4243a53-6221-4f75-8154-e4b33a5707a1_SiteId=3dd8961f-e488-4e60-8e11-a82d994e183d; MSIP_Label_d4243a53-6221-4f75-8154-e4b33a5707a1_ActionId=84aee0ba-83c1-4c6e-ae74-a9af3b8c052d; MSIP_Label_d4243a53-6221-4f75-8154-e4b33a5707a1_ContentBits=1 msip_label_d4243a53-6221-4f75-8154-e4b33a5707a1_enabled: true msip_label_d4243a53-6221-4f75-8154-e4b33a5707a1_setdate: 2022-03-07T17:21:14Z msip_label_d4243a53-6221-4f75-8154-e4b33a5707a1_method: Privileged msip_label_d4243a53-6221-4f75-8154-e4b33a5707a1_name: Public-AIP 2.0 msip_label_d4243a53-6221-4f75-8154-e4b33a5707a1_siteid: 3dd8961f-e488-4e60-8e11-a82d994e183d msip_label_d4243a53-6221-4f75-8154-e4b33a5707a1_actionid: 999435ac-e21e-45fc-840a-09d0b6a97a9a msip_label_d4243a53-6221-4f75-8154-e4b33a5707a1_contentbits: 0 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=amd.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f69a0ca5-267e-414d-a4c0-08da005ee4cd x-ms-traffictypediagnostic: MN2PR12MB4078:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: vJToAv+Nh3/D/zX6YTd7ebJoz79eARHsHjcyUR5cxcbSdO9+Zd4Z81MzPMPXja7qJ88H03+t6D3EzzgjPwMsp2KF6fWSLVN8Anzx6I8mrfWlnwPoZNHhO3jq7F6AEXSfpJHiEBy4BBzGZMi7cG+0DxgIiOjjNlX8c1uIWuE/P/HoELw8PlzXcad5w0/wc8gj63w/7y7VOfeGdWiHmYcztbx4rfPU7MARMTDOduPEN4MmDdQYoUT9+m5DOfpomebenoHnWoDPGOZJ4xPWMIA6tBS2n8ctyMfu57LkeaYLCcGbWJJOVyAvCvgV/pynCo80wkXCUVi1Kt5XAm8W784CLdA6Azu8AzI/5rHWB5k7hNZ/4MFJr2Ws9r1vDfbsa2DMQFpxR8W+KIF1iFFs32tjqgBFsVZKyIISX3RZhazjXTVRhl+aPwYwq+ny/uzM94IR4qNCNMNsaOVYlLQRR1WZ7Rx/osU9xKa9AMd6mgGIM3f05tGzbZTXo2CL5y5eEnmw/swN90yRAYKNMtxz401p7qkNk8moVggB2Xq3nVqOuaGF/x54mc8D/+FfibBUuY5lw1WPKv/mu6SK5xVWMVJp/dXLLT2F+kHAHhHfL/UrH2tOVFlodD2bcBzVykNCk3WEEy6iv5MOSp36+IRitko4KOgOKkumEBFSzYcASqi4xUsZI2OcuXRdlEHNPv65wx6Rca4KB3HcZqC+biAxl0jQnCv/EvRUisA5o+HLUHPF0Pk+6xzgEZVDrahG/zzXz954OQR97DTKSuB0qhYbTEhUQq6inzYSeapQA36wrkHdpszOwnWBRumcfUUq2VaT8988 x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL1PR12MB5144.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(122000001)(55016003)(966005)(110136005)(38070700005)(38100700002)(66574015)(54906003)(83380400001)(316002)(71200400001)(45080400002)(30864003)(66446008)(66556008)(66946007)(5660300002)(86362001)(508600001)(6506007)(7696005)(52536014)(8936002)(33656002)(53546011)(186003)(26005)(2906002)(64756008)(76116006)(66476007)(8676002)(4326008)(2940100002)(9686003)(461764006)(559001)(579004);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?qGtJdDwj6Wy7eWv/PE3satEIbqhC84CV7Uw1itzdy17SJlJltrHxc3LF6v?= =?iso-8859-1?Q?DuyzjDqQY2qNFKCGq7y1bqIPzdXQWEoxN+ufSv1Z1e1BEd/UDXWuvrSiDw?= =?iso-8859-1?Q?B33UqhWgv4kV6s1578x3Bc02wP4fhjfmUmZ/uuehoi9bLegfCSeKnkXzbb?= =?iso-8859-1?Q?qK/S0N7sr8oqQzL1DqXJK2afucpUV9ffNjN3n5UTP/fmpCYx9qdJyLjjfa?= =?iso-8859-1?Q?hXJaGKtl0UgAumsb3OiQw3aXpMM31jsY4Txexc0sD68dtSCMtFwux+v+O5?= =?iso-8859-1?Q?QCjeuidpICTxn6MSx5s5E/a/yx1hqt8GizXOyacldVLZd9O9WZHDajkmUg?= =?iso-8859-1?Q?GMsamt91xmLDXyMU3A2rlNYHdAe3CJXjTAnhYyLvU71grbbCsyosDGCsrX?= =?iso-8859-1?Q?cuVZlYYAYNdWtW/L3RHSf0PGbeuAXrRU5nA1q9nZR8oGNh6QePrUxrXWSx?= =?iso-8859-1?Q?Ovs4ryGZF15gf+WL3B0/P/u1BTfLRYC2BY0F/ljlV4BHKHR1S4lu7ilBZh?= =?iso-8859-1?Q?aW+I8YI3ay38b3jvnc5b97oL0XLzD8Hw7WjA9Lzs4oSf59Ip+lBPyF80V3?= =?iso-8859-1?Q?cBhWEsTTSJ1arSdAF5Mk/fWEU2QKI2GtJE+4E9dWvzRWsmTPgIX53rxsAN?= =?iso-8859-1?Q?flK6q9rQU2QHyZaYND28mKus34DaS3ihPUbLSnA/7AeuzD1bAHtG9oOreQ?= =?iso-8859-1?Q?Kkjo9EAY2ESwgQ9ogLtZ2uIgPMb7OBVUf9jLFDD2c/OkcKhHPw+3NXd9Sb?= =?iso-8859-1?Q?y4SPZYbHvJAOl/EvaatqsKwtXNxts15HTDuZg0NnMbFh1nSB7NQIchMxzf?= =?iso-8859-1?Q?gg6DC6o80VgkBhYVmZsnVtkkGcNPhBn1moraGRJnSOqrocI4EpeXAmpmAf?= =?iso-8859-1?Q?td8QHXGnJli/whDTVRZ4jV2k0MT2bvmJM291p3HgwObIspiNd3G+RvakB4?= =?iso-8859-1?Q?UdINK5LoQ6tn6r7fc+9UQ+7FgsuGWz5vd4joqSfiPIptuRHra1dRsmRngT?= =?iso-8859-1?Q?08O6wJZHivplRhiQmATJdOCpCGtBlT+e1lAC70FjEGmTJEL9ZO7LKDZ++R?= =?iso-8859-1?Q?uwPMa7MVp3rF8klqwJNx4am+l13JD9tbp48AgcmyAqJ+mP/8q2YHavmRDg?= =?iso-8859-1?Q?MBMRcJaUEAV5YLL5LLeCP7WtFRo5cvDqwfuHGN5yE0aKlPN+ktvbslJMMy?= =?iso-8859-1?Q?F4Jd72XNqEKazDp5DPF6J4wsLqjfpiILeMSkRDTlweC6GAwLNRVRJr/qxP?= =?iso-8859-1?Q?k35ykDlY8E30+njZ0HdANVsU1wEZYj2e855SORC4jSu6a3VpTbYwrInVEE?= =?iso-8859-1?Q?xI5CAChHWnQIMyWpQWXLXNF1FaPvJek/1yJuAZO5JDz/ViWGmdV2Xue2ft?= =?iso-8859-1?Q?EZSHRm+Ioyr+h5JmkGV8ddKG+f3ziMduWLR6cKdg1nqR9HaDHrmeOZ3RDr?= =?iso-8859-1?Q?DKsKFQIZQwygVp4ZJl4O1F5V6lAdNybJNjoJd5dyUa5/k4jjjm0Z2alReC?= =?iso-8859-1?Q?NzI/3/erk3IPaoPhrB8GLHJZOCjxrWKQevOJ5wafqHhCEZe8toLD0XSX6U?= =?iso-8859-1?Q?KhKbxj+vmZ9OT6LSribLXU5+7K0wWYFsrKMVW64ZkXbbOAvsZqRL1UMrwg?= =?iso-8859-1?Q?ws0mVoKAoKWYNYBIvGo7ItydqvCQU1wzJeqmd1w9mmi0d/QCNGNJAtHoq3?= =?iso-8859-1?Q?KlGhbfe3Ry4sc016ye8=3D?= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BL1PR12MB5144.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f69a0ca5-267e-414d-a4c0-08da005ee4cd X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Mar 2022 17:21:18.9142 (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: S9V1vwVMSimWc7bshUkFjIjNY3e2lefQ182l9le1peDtTYfqhgyoec0A0Ef5UnvrOtWWjLFdBnayRvQn+noe9A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4078 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [Public] > -----Original Message----- > From: Deucher, Alexander > Sent: Monday, March 7, 2022 12:19 PM > To: Greg Kroah-Hartman ; linux- > kernel@vger.kernel.org > Cc: stable@vger.kernel.org; Koenig, Christian ; > Wu, Hersen ; Anson Jacob > ; Wentland, Harry ; > Siqueira, Rodrigo ; Gutierrez, Agustin > ; Wheeler, Daniel > ; Zhuo, Qingqing (Lillian) > ; Sasha Levin > Subject: RE: [PATCH 5.15 100/262] drm/amd/display: move FPU associated > DSC code to DML folder >=20 > [Public] >=20 > > -----Original Message----- > > From: Greg Kroah-Hartman > > Sent: Monday, March 7, 2022 4:17 AM > > To: linux-kernel@vger.kernel.org > > Cc: Greg Kroah-Hartman ; > > stable@vger.kernel.org; Koenig, Christian ; > > Wu, Hersen ; Anson Jacob > ; > > Wentland, Harry ; Siqueira, Rodrigo > > ; Gutierrez, Agustin > > ; Wheeler, Daniel > ; > > Zhuo, Qingqing (Lillian) ; Deucher, Alexander > > ; Sasha Levin > > Subject: [PATCH 5.15 100/262] drm/amd/display: move FPU associated DSC > > code to DML folder > > > > From: Qingqing Zhuo > > > > [ Upstream commit d738db6883df3e3c513f9e777c842262693f951b ] > > > > [Why & How] > > As part of the FPU isolation work documented in > > > https://nam11.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Fpatc > > > hwork.freedesktop.org%2Fseries%2F93042%2F&data=3D04%7C01%7Calex > > > ander.deucher%40amd.com%7Cf4f4d5bfb9f74edfb8b108da001e6d8f%7C3dd > > > 8961fe4884e608e11a82d994e183d%7C0%7C0%7C637822427968538535%7CUn > > > known%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6 > > > Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=3D2Mm24%2FPkRkih%2BToJ > > oBGx2wpeth0Z0Rv3dG77D06fHbw%3D&reserved=3D0, isolate code that > uses > > FPU in DSC to DML, where all FPU code should locate. > > > > This change does not refactor any functions but move code around. > > >=20 > This is not a really bug fix, just general reworking of the FP code. I d= on't > know that this is stable material. Same goes for all of the other patches related to this rework as noted in t= he URL in the commit message. Alex >=20 > Alex >=20 >=20 > > Cc: Christian K=F6nig > > Cc: Hersen Wu > > Cc: Anson Jacob > > Cc: Harry Wentland > > Reviewed-by: Rodrigo Siqueira > > Acked-by: Agustin Gutierrez > > Tested-by: Anson Jacob > > Tested-by: Daniel Wheeler > > Signed-off-by: Qingqing Zhuo > > Acked-by: Christian K=F6nig > > Signed-off-by: Alex Deucher > > Signed-off-by: Sasha Levin > > --- > > drivers/gpu/drm/amd/display/dc/dml/Makefile | 3 + > > .../amd/display/dc/{ =3D> dml}/dsc/qp_tables.h | 0 > > .../drm/amd/display/dc/dml/dsc/rc_calc_fpu.c | 291 > > ++++++++++++++++++ .../drm/amd/display/dc/dml/dsc/rc_calc_fpu.h | > > ++++++++++++++++++ 94 > > ++++++ > > drivers/gpu/drm/amd/display/dc/dsc/Makefile | 29 -- > > drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 259 ---------------- > > 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, 389 insertions(+), 338 deletions(-) rename > > drivers/gpu/drm/amd/display/dc/{ =3D> 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 56055df2e8d2e..9009b92490f34 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 :=3D > > $(dml_ccflags) $(fram > > CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_rq_dlg_calc_30.o :=3D > > $(dml_ccflags) > > CFLAGS_$(AMDDALPATH)/dc/dml/dcn31/display_mode_vba_31.o :=3D > > $(dml_ccflags) $(frame_warn_flag) > > CFLAGS_$(AMDDALPATH)/dc/dml/dcn31/display_rq_dlg_calc_31.o :=3D > > $(dml_ccflags) > > +CFLAGS_$(AMDDALPATH)/dc/dml/dsc/rc_calc_fpu.o :=3D $(dml_ccflags) > > CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o :=3D $(dml_ccflags) > > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_vba.o :=3D > > $(dml_rcflags) > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn2x/dcn2x.o > > :=3D $(dml_rcflags) @@ -84,6 +85,7 @@ > > > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn30/display_rq_dlg_calc_30. > > o :=3D $(dml_rcfla > > > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn31/display_mode_vba_31.o > > :=3D $(dml_rcflags) > > > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn31/display_rq_dlg_calc_31. > > o :=3D $(dml_rcflags) > > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_lib.o :=3D > > $(dml_rcflags) > > +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dsc/rc_calc_fpu.o :=3D > > $(dml_rcflags) > > endif > > CFLAGS_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o :=3D > > $(dml_ccflags) > CFLAGS_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o > > :=3D $(dml_ccflags) @@ -99,6 +101,7 @@ DML +=3D > > dcn20/display_rq_dlg_calc_20v2.o dcn20/display_mode_vba_20v2.o DML > > +=3D dcn21/display_rq_dlg_calc_21.o dcn21/display_mode_vba_21.o DML > +=3D > > dcn30/display_mode_vba_30.o dcn30/display_rq_dlg_calc_30.o DML +=3D > > dcn31/display_mode_vba_31.o dcn31/display_rq_dlg_calc_31.o > > +DML +=3D dsc/rc_calc_fpu.o > > endif > > > > AMD_DAL_DML =3D $(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 0000000000000..3ee858f311d12 > > --- /dev/null > > +++ b/drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c > > @@ -0,0 +1,291 @@ > > +/* > > + * 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 =3D=3D CM_444 || cm =3D=3D CM_RGB) ? (val444) : (cm =3D=3D CM_422= ? > > (val422) : > > +(val420)) > > + > > + > > +#define TABLE_CASE(mode, bpc, max) case (table_hash(mode, > > BPC_##bpc, max)): \ > > + table =3D qp_table_##mode##_##bpc##bpc_##max; \ > > + table_size =3D > > > sizeof(qp_table_##mode##_##bpc##bpc_##max)/sizeof(*qp_table_##mo > > de##_##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 =3D num - 0.5; > > + else > > + num =3D num + 0.5; > > + > > + return (int)(num); > > +} > > + > > +static double dsc_ceil(double num) > > +{ > > + double retval =3D (int)num; > > + > > + if (retval !=3D num && num > 0) > > + retval =3D 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 =3D MODE_SELECT(444, 422, 420); > > + int sel =3D table_hash(mode, bpc, max_min); > > + int table_size =3D 0; > > + int index; > > + const struct qp_entry *table =3D 0L; > > + > > + // alias enum > > + enum { min =3D DAL_MM_MIN, max =3D 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 =3D=3D 0) > > + return; > > + > > + index =3D (bpp - table[0].bpp) * 2; > > + > > + /* requested size is bigger than the table */ > > + if (index >=3D 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 =3D ofs; > > + > > + if (mode =3D=3D CM_444 || mode =3D=3D CM_RGB) { > > + *p++ =3D (bpp <=3D 6) ? (0) : ((((bpp >=3D 8) && (bpp <=3D 12))) ?= (2) > > : ((bpp >=3D 15) ? (10) : ((((bpp > 6) && (bpp < 8))) ? (0 + > > dsc_roundf((bpp - 6) * > > (2 / 2.0))) : (2 + dsc_roundf((bpp - 12) * (8 / 3.0)))))); > > + *p++ =3D (bpp <=3D 6) ? (-2) : ((((bpp >=3D 8) && (bpp <=3D 12))) = ? (0) > > : ((bpp >=3D 15) ? (8) : ((((bpp > 6) && (bpp < 8))) ? (-2 + > > dsc_roundf((bpp - 6) * > > (2 / 2.0))) : (0 + dsc_roundf((bpp - 12) * (8 / 3.0)))))); > > + *p++ =3D (bpp <=3D 6) ? (-2) : ((((bpp >=3D 8) && (bpp <=3D 12))) = ? (0) > > : ((bpp >=3D 15) ? (6) : ((((bpp > 6) && (bpp < 8))) ? (-2 + > > dsc_roundf((bpp - 6) * > > (2 / 2.0))) : (0 + dsc_roundf((bpp - 12) * (6 / 3.0)))))); > > + *p++ =3D (bpp <=3D 6) ? (-4) : ((((bpp >=3D 8) && (bpp <=3D 12))) = ? (- > > 2) : ((bpp >=3D 15) ? (4) : ((((bpp > 6) && (bpp < 8))) ? (-4 + > > dsc_roundf((bpp - > > 6) * (2 / 2.0))) : (-2 + dsc_roundf((bpp - 12) * (6 / 3.0)))))); > > + *p++ =3D (bpp <=3D 6) ? (-6) : ((((bpp >=3D 8) && (bpp <=3D 12))) = ? (- > > 4) : ((bpp >=3D 15) ? (2) : ((((bpp > 6) && (bpp < 8))) ? (-6 + > > dsc_roundf((bpp - > > 6) * (2 / 2.0))) : (-4 + dsc_roundf((bpp - 12) * (6 / 3.0)))))); > > + *p++ =3D (bpp <=3D 12) ? (-6) : ((bpp >=3D 15) ? (0) : (-6 + > > dsc_roundf((bpp - 12) * (6 / 3.0)))); > > + *p++ =3D (bpp <=3D 12) ? (-8) : ((bpp >=3D 15) ? (-2) : (-8 + > > dsc_roundf((bpp - 12) * (6 / 3.0)))); > > + *p++ =3D (bpp <=3D 12) ? (-8) : ((bpp >=3D 15) ? (-4) : (-8 + > > dsc_roundf((bpp - 12) * (4 / 3.0)))); > > + *p++ =3D (bpp <=3D 12) ? (-8) : ((bpp >=3D 15) ? (-6) : (-8 + > > dsc_roundf((bpp - 12) * (2 / 3.0)))); > > + *p++ =3D (bpp <=3D 12) ? (-10) : ((bpp >=3D 15) ? (-8) : (-10 + > > dsc_roundf((bpp - 12) * (2 / 3.0)))); > > + *p++ =3D -10; > > + *p++ =3D (bpp <=3D 6) ? (-12) : ((bpp >=3D 8) ? (-10) : (-12 + > > dsc_roundf((bpp - 6) * (2 / 2.0)))); > > + *p++ =3D -12; > > + *p++ =3D -12; > > + *p++ =3D -12; > > + } else if (mode =3D=3D CM_422) { > > + *p++ =3D (bpp <=3D 8) ? (2) : ((bpp >=3D 10) ? (10) : (2 + > > dsc_roundf((bpp - 8) * (8 / 2.0)))); > > + *p++ =3D (bpp <=3D 8) ? (0) : ((bpp >=3D 10) ? (8) : (0 + > > dsc_roundf((bpp - 8) * (8 / 2.0)))); > > + *p++ =3D (bpp <=3D 8) ? (0) : ((bpp >=3D 10) ? (6) : (0 + > > dsc_roundf((bpp - 8) * (6 / 2.0)))); > > + *p++ =3D (bpp <=3D 8) ? (-2) : ((bpp >=3D 10) ? (4) : (-2 + > > dsc_roundf((bpp - 8) * (6 / 2.0)))); > > + *p++ =3D (bpp <=3D 8) ? (-4) : ((bpp >=3D 10) ? (2) : (-4 + > > dsc_roundf((bpp - 8) * (6 / 2.0)))); > > + *p++ =3D (bpp <=3D 8) ? (-6) : ((bpp >=3D 10) ? (0) : (-6 + > > dsc_roundf((bpp - 8) * (6 / 2.0)))); > > + *p++ =3D (bpp <=3D 8) ? (-8) : ((bpp >=3D 10) ? (-2) : (-8 + > > dsc_roundf((bpp - 8) * (6 / 2.0)))); > > + *p++ =3D (bpp <=3D 8) ? (-8) : ((bpp >=3D 10) ? (-4) : (-8 + > > dsc_roundf((bpp - 8) * (4 / 2.0)))); > > + *p++ =3D (bpp <=3D 8) ? (-8) : ((bpp >=3D 10) ? (-6) : (-8 + > > dsc_roundf((bpp - 8) * (2 / 2.0)))); > > + *p++ =3D (bpp <=3D 8) ? (-10) : ((bpp >=3D 10) ? (-8) : (-10 + > > dsc_roundf((bpp - 8) * (2 / 2.0)))); > > + *p++ =3D -10; > > + *p++ =3D (bpp <=3D 6) ? (-12) : ((bpp >=3D 7) ? (-10) : (-12 + > > dsc_roundf((bpp - 6) * (2.0 / 1)))); > > + *p++ =3D -12; > > + *p++ =3D -12; > > + *p++ =3D -12; > > + } else { > > + *p++ =3D (bpp <=3D 6) ? (2) : ((bpp >=3D 8) ? (10) : (2 + > > dsc_roundf((bpp - 6) * (8 / 2.0)))); > > + *p++ =3D (bpp <=3D 6) ? (0) : ((bpp >=3D 8) ? (8) : (0 + > > dsc_roundf((bpp - 6) * (8 / 2.0)))); > > + *p++ =3D (bpp <=3D 6) ? (0) : ((bpp >=3D 8) ? (6) : (0 + > > dsc_roundf((bpp - 6) * (6 / 2.0)))); > > + *p++ =3D (bpp <=3D 6) ? (-2) : ((bpp >=3D 8) ? (4) : (-2 + > > dsc_roundf((bpp - 6) * (6 / 2.0)))); > > + *p++ =3D (bpp <=3D 6) ? (-4) : ((bpp >=3D 8) ? (2) : (-4 + > > dsc_roundf((bpp - 6) * (6 / 2.0)))); > > + *p++ =3D (bpp <=3D 6) ? (-6) : ((bpp >=3D 8) ? (0) : (-6 + > > dsc_roundf((bpp - 6) * (6 / 2.0)))); > > + *p++ =3D (bpp <=3D 6) ? (-8) : ((bpp >=3D 8) ? (-2) : (-8 + > > dsc_roundf((bpp - 6) * (6 / 2.0)))); > > + *p++ =3D (bpp <=3D 6) ? (-8) : ((bpp >=3D 8) ? (-4) : (-8 + > > dsc_roundf((bpp - 6) * (4 / 2.0)))); > > + *p++ =3D (bpp <=3D 6) ? (-8) : ((bpp >=3D 8) ? (-6) : (-8 + > > dsc_roundf((bpp - 6) * (2 / 2.0)))); > > + *p++ =3D (bpp <=3D 6) ? (-10) : ((bpp >=3D 8) ? (-8) : (-10 + > > dsc_roundf((bpp - 6) * (2 / 2.0)))); > > + *p++ =3D -10; > > + *p++ =3D (bpp <=3D 4) ? (-12) : ((bpp >=3D 5) ? (-10) : (-12 + > > dsc_roundf((bpp - 4) * (2 / 1.0)))); > > + *p++ =3D -12; > > + *p++ =3D -12; > > + *p++ =3D -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 =3D ((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 /=3D 2.0; > > + > > + rc->rc_quant_incr_limit0 =3D ((bpc =3D=3D BPC_8) ? 11 : (bpc =3D=3D B= PC_10 ? > > +15 > > : 19)) - ((minor_version =3D=3D 1 && cm =3D=3D CM_444) ? 1 : 0); > > + rc->rc_quant_incr_limit1 =3D ((bpc =3D=3D BPC_8) ? 11 : (bpc =3D=3D B= PC_10 ? > > +15 > > +: 19)) - ((minor_version =3D=3D 1 && cm =3D=3D CM_444) ? 1 : 0); > > + > > + bpp_group =3D MODE_SELECT(bpp, bpp * 2.0, bpp * 2.0); > > + > > + switch (cm) { > > + case CM_420: > > + rc->initial_fullness_offset =3D (bpp >=3D 6) ? (2048) : ((bpp <=3D = 4) > > ? (6144) : ((((bpp > 4) && (bpp <=3D 5))) ? (6144 - dsc_roundf((bpp - > > 4) * > > (512))) : (5632 - dsc_roundf((bpp - 5) * (3584))))); > > + rc->first_line_bpg_offset =3D median3(0, (12 + (int) (0.09 * > > min(34, slice_height - 8))), (int)((3 * bpc * 3) - (3 * bpp_group))); > > + rc->second_line_bpg_offset =3D median3(0, 12, (int)((3 * bpc * > > 3) - (3 * bpp_group))); > > + break; > > + case CM_422: > > + rc->initial_fullness_offset =3D (bpp >=3D 8) ? (2048) : ((bpp <=3D = 7) > > ? (5632) : (5632 - dsc_roundf((bpp - 7) * (3584)))); > > + rc->first_line_bpg_offset =3D median3(0, (12 + (int) (0.09 * > > min(34, slice_height - 8))), (int)((3 * bpc * 4) - (3 * bpp_group))); > > + rc->second_line_bpg_offset =3D 0; > > + break; > > + case CM_444: > > + case CM_RGB: > > + rc->initial_fullness_offset =3D (bpp >=3D 12) ? (2048) : ((bpp <=3D = 8) > > ? (6144) : ((((bpp > 8) && (bpp <=3D 10))) ? (6144 - dsc_roundf((bpp - > > 8) * (512 / > > 2))) : (5632 - dsc_roundf((bpp - 10) * (3584 / 2))))); > > + rc->first_line_bpg_offset =3D median3(0, (12 + (int) (0.09 * > > min(34, slice_height - 8))), (int)(((3 * bpc + (cm =3D=3D CM_444 ? 0 : = 2)) > > * 3) - (3 * bpp_group))); > > + rc->second_line_bpg_offset =3D 0; > > + break; > > + } > > + > > + initial_xmit_delay_factor =3D (cm =3D=3D CM_444 || cm =3D=3D CM_RGB) = ? 1.0 : > > 2.0; > > + rc->initial_xmit_delay =3D > > +dsc_roundf(8192.0/2.0/bpp/initial_xmit_delay_factor); > > + > > + if (cm =3D=3D CM_422 || cm =3D=3D CM_420) > > + slice_width /=3D 2; > > + > > + padding_pixels =3D ((slice_width % 3) !=3D 0) ? (3 - (slice_width % 3= )) > > +* > > (rc->initial_xmit_delay / slice_width) : 0; > > + if (3 * bpp_group >=3D (((rc->initial_xmit_delay + 2) / 3) * (3 + (cm > > +=3D=3D > > CM_422)))) { > > + if ((rc->initial_xmit_delay + padding_pixels) % 3 =3D=3D 1) > > + rc->initial_xmit_delay++; > > + } > > + > > + rc->flatness_min_qp =3D ((bpc =3D=3D BPC_8) ? (3) : ((bpc =3D=3D= BPC_10) ? > > (7) : (11))) - ((minor_version =3D=3D 1 && cm =3D=3D CM_444) ? 1 : 0); > > + rc->flatness_max_qp =3D ((bpc =3D=3D BPC_8) ? (12) : ((bpc =3D=3D= BPC_10) ? > > (16) : (20))) - ((minor_version =3D=3D 1 && cm =3D=3D CM_444) ? 1 : 0); > > + rc->flatness_det_thresh =3D 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 =3D=3D CM_444 && minor_version =3D=3D 1) { > > + for (i =3D 0; i < QP_SET_SIZE; ++i) { > > + rc->qp_min[i] =3D rc->qp_min[i] > 0 ? rc->qp_min[i] - 1 : > > 0; > > + rc->qp_max[i] =3D rc->qp_max[i] > 0 ? rc->qp_max[i] - > > 1 : 0; > > + } > > + } > > + get_ofs_set(rc->ofs, cm, bpp); > > + > > + /* fixed parameters */ > > + rc->rc_model_size =3D 8192; > > + rc->rc_edge_factor =3D 6; > > + rc->rc_tgt_offset_hi =3D 3; > > + rc->rc_tgt_offset_lo =3D 3; > > + > > + rc->rc_buf_thresh[0] =3D 896; > > + rc->rc_buf_thresh[1] =3D 1792; > > + rc->rc_buf_thresh[2] =3D 2688; > > + rc->rc_buf_thresh[3] =3D 3584; > > + rc->rc_buf_thresh[4] =3D 4480; > > + rc->rc_buf_thresh[5] =3D 5376; > > + rc->rc_buf_thresh[6] =3D 6272; > > + rc->rc_buf_thresh[7] =3D 6720; > > + rc->rc_buf_thresh[8] =3D 7168; > > + rc->rc_buf_thresh[9] =3D 7616; > > + rc->rc_buf_thresh[10] =3D 7744; > > + rc->rc_buf_thresh[11] =3D 7872; > > + rc->rc_buf_thresh[12] =3D 8000; > > + rc->rc_buf_thresh[13] =3D 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 =3D ((float)drm_bpp / 16.0); > > + d_bytes_per_pixel =3D dsc_ceil(bpp * slice_width / 8.0) / slice_width= ; > > + // TODO: Make sure the formula for calculating this is precise (ceili= ng > > + // vs. floor, and at what point they should be applied) > > + if (is_navite_422_or_420) > > + d_bytes_per_pixel /=3D 2; > > + > > + bytes_per_pixel =3D (u32)dsc_ceil(d_bytes_per_pixel * 0x10000000); > > + > > + return bytes_per_pixel; > > +} > > 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 0000000000000..b93b95409fbe2 > > --- /dev/null > > +++ b/drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.h > > @@ -0,0 +1,94 @@ > > +/* > > + * 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" > > +#include > > + > > +#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 =3D 8, > > + BPC_10 =3D 10, > > + BPC_12 =3D 12 > > +}; > > + > > +enum max_min { > > + DAL_MM_MIN =3D 0, > > + DAL_MM_MAX =3D 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 > > diff --git a/drivers/gpu/drm/amd/display/dc/dsc/Makefile > > b/drivers/gpu/drm/amd/display/dc/dsc/Makefile > > index 8d31eb75c6a6e..a2537229ee88b 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 :=3D -mhard-float -msse > > -endif > > - > > -ifdef CONFIG_PPC64 > > -dsc_ccflags :=3D -mhard-float -maltivec -endif > > - > > -ifdef CONFIG_CC_IS_GCC > > -ifeq ($(call cc-ifversion, -lt, 0701, y), y) -IS_OLD_GCC =3D 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=3D3 -# (8B stack alignment). > > -dsc_ccflags +=3D -mpreferred-stack-boundary=3D4 -else -dsc_ccflags += =3D > > -msse2 - endif -endif > > - > > -CFLAGS_$(AMDDALPATH)/dc/dsc/rc_calc.o :=3D $(dsc_ccflags) - > > CFLAGS_REMOVE_$(AMDDALPATH)/dc/dsc/rc_calc.o :=3D $(dsc_rcflags) > > - > > DSC =3D dc_dsc.o rc_calc.o rc_calc_dpi.o > > > > AMD_DAL_DSC =3D $(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 7b294f637881a..b19d3aeb5962c 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c > > +++ b/drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c > > @@ -23,266 +23,7 @@ > > * Authors: AMD > > * > > */ > > -#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 =3D=3D CM_444 || cm =3D=3D CM_RGB) ? (val444) : (cm =3D=3D CM_422= ? > > (val422) : (val420)) > > - > > - > > -#define TABLE_CASE(mode, bpc, max) case (table_hash(mode, > > BPC_##bpc, max)): \ > > - table =3D qp_table_##mode##_##bpc##bpc_##max; \ > > - table_size =3D > > > sizeof(qp_table_##mode##_##bpc##bpc_##max)/sizeof(*qp_table_##mo > > de##_##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 =3D MODE_SELECT(444, 422, 420); > > - int sel =3D table_hash(mode, bpc, max_min); > > - int table_size =3D 0; > > - int index; > > - const struct qp_entry *table =3D 0L; > > - > > - // alias enum > > - enum { min =3D DAL_MM_MIN, max =3D 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 =3D=3D 0) > > - return; > > - > > - index =3D (bpp - table[0].bpp) * 2; > > - > > - /* requested size is bigger than the table */ > > - if (index >=3D 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 =3D num - 0.5; > > - else > > - num =3D num + 0.5; > > - > > - return (int)(num); > > -} > > - > > -static double dsc_ceil(double num) > > -{ > > - double retval =3D (int)num; > > - > > - if (retval !=3D num && num > 0) > > - retval =3D num + 1; > > - > > - return (int)retval; > > -} > > - > > -static void get_ofs_set(qp_set ofs, enum colour_mode mode, float bpp) = - > { > > - int *p =3D ofs; > > - > > - if (mode =3D=3D CM_444 || mode =3D=3D CM_RGB) { > > - *p++ =3D (bpp <=3D 6) ? (0) : ((((bpp >=3D 8) && (bpp <=3D 12))) ?= (2) > > : ((bpp >=3D 15) ? (10) : ((((bpp > 6) && (bpp < 8))) ? (0 + > > dsc_roundf((bpp - 6) * > > (2 / 2.0))) : (2 + dsc_roundf((bpp - 12) * (8 / 3.0)))))); > > - *p++ =3D (bpp <=3D 6) ? (-2) : ((((bpp >=3D 8) && (bpp <=3D 12))) = ? (0) > > : ((bpp >=3D 15) ? (8) : ((((bpp > 6) && (bpp < 8))) ? (-2 + > > dsc_roundf((bpp - 6) * > > (2 / 2.0))) : (0 + dsc_roundf((bpp - 12) * (8 / 3.0)))))); > > - *p++ =3D (bpp <=3D 6) ? (-2) : ((((bpp >=3D 8) && (bpp <=3D 12))) = ? (0) > > : ((bpp >=3D 15) ? (6) : ((((bpp > 6) && (bpp < 8))) ? (-2 + > > dsc_roundf((bpp - 6) * > > (2 / 2.0))) : (0 + dsc_roundf((bpp - 12) * (6 / 3.0)))))); > > - *p++ =3D (bpp <=3D 6) ? (-4) : ((((bpp >=3D 8) && (bpp <=3D 12))) = ? (- > > 2) : ((bpp >=3D 15) ? (4) : ((((bpp > 6) && (bpp < 8))) ? (-4 + > > dsc_roundf((bpp - > > 6) * (2 / 2.0))) : (-2 + dsc_roundf((bpp - 12) * (6 / 3.0)))))); > > - *p++ =3D (bpp <=3D 6) ? (-6) : ((((bpp >=3D 8) && (bpp <=3D 12))) = ? (- > > 4) : ((bpp >=3D 15) ? (2) : ((((bpp > 6) && (bpp < 8))) ? (-6 + > > dsc_roundf((bpp - > > 6) * (2 / 2.0))) : (-4 + dsc_roundf((bpp - 12) * (6 / 3.0)))))); > > - *p++ =3D (bpp <=3D 12) ? (-6) : ((bpp >=3D 15) ? (0) : (-6 + > > dsc_roundf((bpp - 12) * (6 / 3.0)))); > > - *p++ =3D (bpp <=3D 12) ? (-8) : ((bpp >=3D 15) ? (-2) : (-8 + > > dsc_roundf((bpp - 12) * (6 / 3.0)))); > > - *p++ =3D (bpp <=3D 12) ? (-8) : ((bpp >=3D 15) ? (-4) : (-8 + > > dsc_roundf((bpp - 12) * (4 / 3.0)))); > > - *p++ =3D (bpp <=3D 12) ? (-8) : ((bpp >=3D 15) ? (-6) : (-8 + > > dsc_roundf((bpp - 12) * (2 / 3.0)))); > > - *p++ =3D (bpp <=3D 12) ? (-10) : ((bpp >=3D 15) ? (-8) : (-10 + > > dsc_roundf((bpp - 12) * (2 / 3.0)))); > > - *p++ =3D -10; > > - *p++ =3D (bpp <=3D 6) ? (-12) : ((bpp >=3D 8) ? (-10) : (-12 + > > dsc_roundf((bpp - 6) * (2 / 2.0)))); > > - *p++ =3D -12; > > - *p++ =3D -12; > > - *p++ =3D -12; > > - } else if (mode =3D=3D CM_422) { > > - *p++ =3D (bpp <=3D 8) ? (2) : ((bpp >=3D 10) ? (10) : (2 + > > dsc_roundf((bpp - 8) * (8 / 2.0)))); > > - *p++ =3D (bpp <=3D 8) ? (0) : ((bpp >=3D 10) ? (8) : (0 + > > dsc_roundf((bpp - 8) * (8 / 2.0)))); > > - *p++ =3D (bpp <=3D 8) ? (0) : ((bpp >=3D 10) ? (6) : (0 + > > dsc_roundf((bpp - 8) * (6 / 2.0)))); > > - *p++ =3D (bpp <=3D 8) ? (-2) : ((bpp >=3D 10) ? (4) : (-2 + > > dsc_roundf((bpp - 8) * (6 / 2.0)))); > > - *p++ =3D (bpp <=3D 8) ? (-4) : ((bpp >=3D 10) ? (2) : (-4 + > > dsc_roundf((bpp - 8) * (6 / 2.0)))); > > - *p++ =3D (bpp <=3D 8) ? (-6) : ((bpp >=3D 10) ? (0) : (-6 + > > dsc_roundf((bpp - 8) * (6 / 2.0)))); > > - *p++ =3D (bpp <=3D 8) ? (-8) : ((bpp >=3D 10) ? (-2) : (-8 + > > dsc_roundf((bpp - 8) * (6 / 2.0)))); > > - *p++ =3D (bpp <=3D 8) ? (-8) : ((bpp >=3D 10) ? (-4) : (-8 + > > dsc_roundf((bpp - 8) * (4 / 2.0)))); > > - *p++ =3D (bpp <=3D 8) ? (-8) : ((bpp >=3D 10) ? (-6) : (-8 + > > dsc_roundf((bpp - 8) * (2 / 2.0)))); > > - *p++ =3D (bpp <=3D 8) ? (-10) : ((bpp >=3D 10) ? (-8) : (-10 + > > dsc_roundf((bpp - 8) * (2 / 2.0)))); > > - *p++ =3D -10; > > - *p++ =3D (bpp <=3D 6) ? (-12) : ((bpp >=3D 7) ? (-10) : (-12 + > > dsc_roundf((bpp - 6) * (2.0 / 1)))); > > - *p++ =3D -12; > > - *p++ =3D -12; > > - *p++ =3D -12; > > - } else { > > - *p++ =3D (bpp <=3D 6) ? (2) : ((bpp >=3D 8) ? (10) : (2 + > > dsc_roundf((bpp - 6) * (8 / 2.0)))); > > - *p++ =3D (bpp <=3D 6) ? (0) : ((bpp >=3D 8) ? (8) : (0 + > > dsc_roundf((bpp - 6) * (8 / 2.0)))); > > - *p++ =3D (bpp <=3D 6) ? (0) : ((bpp >=3D 8) ? (6) : (0 + > > dsc_roundf((bpp - 6) * (6 / 2.0)))); > > - *p++ =3D (bpp <=3D 6) ? (-2) : ((bpp >=3D 8) ? (4) : (-2 + > > dsc_roundf((bpp - 6) * (6 / 2.0)))); > > - *p++ =3D (bpp <=3D 6) ? (-4) : ((bpp >=3D 8) ? (2) : (-4 + > > dsc_roundf((bpp - 6) * (6 / 2.0)))); > > - *p++ =3D (bpp <=3D 6) ? (-6) : ((bpp >=3D 8) ? (0) : (-6 + > > dsc_roundf((bpp - 6) * (6 / 2.0)))); > > - *p++ =3D (bpp <=3D 6) ? (-8) : ((bpp >=3D 8) ? (-2) : (-8 + > > dsc_roundf((bpp - 6) * (6 / 2.0)))); > > - *p++ =3D (bpp <=3D 6) ? (-8) : ((bpp >=3D 8) ? (-4) : (-8 + > > dsc_roundf((bpp - 6) * (4 / 2.0)))); > > - *p++ =3D (bpp <=3D 6) ? (-8) : ((bpp >=3D 8) ? (-6) : (-8 + > > dsc_roundf((bpp - 6) * (2 / 2.0)))); > > - *p++ =3D (bpp <=3D 6) ? (-10) : ((bpp >=3D 8) ? (-8) : (-10 + > > dsc_roundf((bpp - 6) * (2 / 2.0)))); > > - *p++ =3D -10; > > - *p++ =3D (bpp <=3D 4) ? (-12) : ((bpp >=3D 5) ? (-10) : (-12 + > > dsc_roundf((bpp - 4) * (2 / 1.0)))); > > - *p++ =3D -12; > > - *p++ =3D -12; > > - *p++ =3D -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 =3D ((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 /=3D 2.0; > > - > > - rc->rc_quant_incr_limit0 =3D ((bpc =3D=3D BPC_8) ? 11 : (bpc =3D=3D B= PC_10 ? 15 > > : 19)) - ((minor_version =3D=3D 1 && cm =3D=3D CM_444) ? 1 : 0); > > - rc->rc_quant_incr_limit1 =3D ((bpc =3D=3D BPC_8) ? 11 : (bpc =3D=3D B= PC_10 ? 15 > > : 19)) - ((minor_version =3D=3D 1 && cm =3D=3D CM_444) ? 1 : 0); > > - > > - bpp_group =3D MODE_SELECT(bpp, bpp * 2.0, bpp * 2.0); > > - > > - switch (cm) { > > - case CM_420: > > - rc->initial_fullness_offset =3D (bpp >=3D 6) ? (2048) : ((bpp <=3D = 4) > > ? (6144) : ((((bpp > 4) && (bpp <=3D 5))) ? (6144 - dsc_roundf((bpp - > > 4) * > > (512))) : (5632 - dsc_roundf((bpp - 5) * (3584))))); > > - rc->first_line_bpg_offset =3D median3(0, (12 + (int) (0.09 * > > min(34, slice_height - 8))), (int)((3 * bpc * 3) - (3 * bpp_group))); > > - rc->second_line_bpg_offset =3D median3(0, 12, (int)((3 * bpc * > > 3) - (3 * bpp_group))); > > - break; > > - case CM_422: > > - rc->initial_fullness_offset =3D (bpp >=3D 8) ? (2048) : ((bpp <=3D = 7) > > ? (5632) : (5632 - dsc_roundf((bpp - 7) * (3584)))); > > - rc->first_line_bpg_offset =3D median3(0, (12 + (int) (0.09 * > > min(34, slice_height - 8))), (int)((3 * bpc * 4) - (3 * bpp_group))); > > - rc->second_line_bpg_offset =3D 0; > > - break; > > - case CM_444: > > - case CM_RGB: > > - rc->initial_fullness_offset =3D (bpp >=3D 12) ? (2048) : ((bpp <=3D = 8) > > ? (6144) : ((((bpp > 8) && (bpp <=3D 10))) ? (6144 - dsc_roundf((bpp - > > 8) * (512 / > > 2))) : (5632 - dsc_roundf((bpp - 10) * (3584 / 2))))); > > - rc->first_line_bpg_offset =3D median3(0, (12 + (int) (0.09 * > > min(34, slice_height - 8))), (int)(((3 * bpc + (cm =3D=3D CM_444 ? 0 : = 2)) > > * 3) - (3 * bpp_group))); > > - rc->second_line_bpg_offset =3D 0; > > - break; > > - } > > - > > - initial_xmit_delay_factor =3D (cm =3D=3D CM_444 || cm =3D=3D CM_RGB) = ? 1.0 : > > 2.0; > > - rc->initial_xmit_delay =3D > > dsc_roundf(8192.0/2.0/bpp/initial_xmit_delay_factor); > > - > > - if (cm =3D=3D CM_422 || cm =3D=3D CM_420) > > - slice_width /=3D 2; > > - > > - padding_pixels =3D ((slice_width % 3) !=3D 0) ? (3 - (slice_width % 3= )) * > > (rc->initial_xmit_delay / slice_width) : 0; > > - if (3 * bpp_group >=3D (((rc->initial_xmit_delay + 2) / 3) * (3 + (cm= =3D=3D > > CM_422)))) { > > - if ((rc->initial_xmit_delay + padding_pixels) % 3 =3D=3D 1) > > - rc->initial_xmit_delay++; > > - } > > - > > - rc->flatness_min_qp =3D ((bpc =3D=3D BPC_8) ? (3) : ((bpc =3D=3D= BPC_10) ? > > (7) : (11))) - ((minor_version =3D=3D 1 && cm =3D=3D CM_444) ? 1 : 0); > > - rc->flatness_max_qp =3D ((bpc =3D=3D BPC_8) ? (12) : ((bpc =3D=3D= BPC_10) ? > > (16) : (20))) - ((minor_version =3D=3D 1 && cm =3D=3D CM_444) ? 1 : 0); > > - rc->flatness_det_thresh =3D 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 =3D=3D CM_444 && minor_version =3D=3D 1) { > > - for (i =3D 0; i < QP_SET_SIZE; ++i) { > > - rc->qp_min[i] =3D rc->qp_min[i] > 0 ? rc->qp_min[i] - 1 : > > 0; > > - rc->qp_max[i] =3D rc->qp_max[i] > 0 ? rc->qp_max[i] - > > 1 : 0; > > - } > > - } > > - get_ofs_set(rc->ofs, cm, bpp); > > - > > - /* fixed parameters */ > > - rc->rc_model_size =3D 8192; > > - rc->rc_edge_factor =3D 6; > > - rc->rc_tgt_offset_hi =3D 3; > > - rc->rc_tgt_offset_lo =3D 3; > > - > > - rc->rc_buf_thresh[0] =3D 896; > > - rc->rc_buf_thresh[1] =3D 1792; > > - rc->rc_buf_thresh[2] =3D 2688; > > - rc->rc_buf_thresh[3] =3D 3584; > > - rc->rc_buf_thresh[4] =3D 4480; > > - rc->rc_buf_thresh[5] =3D 5376; > > - rc->rc_buf_thresh[6] =3D 6272; > > - rc->rc_buf_thresh[7] =3D 6720; > > - rc->rc_buf_thresh[8] =3D 7168; > > - rc->rc_buf_thresh[9] =3D 7616; > > - rc->rc_buf_thresh[10] =3D 7744; > > - rc->rc_buf_thresh[11] =3D 7872; > > - rc->rc_buf_thresh[12] =3D 8000; > > - rc->rc_buf_thresh[13] =3D 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 =3D ((float)drm_bpp / 16.0); > > - d_bytes_per_pixel =3D dsc_ceil(bpp * slice_width / 8.0) / slice_width= ; > > - // TODO: Make sure the formula for calculating this is precise (ceili= ng > > - // vs. floor, and at what point they should be applied) > > - if (is_navite_422_or_420) > > - d_bytes_per_pixel /=3D 2; > > - > > - bytes_per_pixel =3D (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 262f06afcbf95..c2340e001b578 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 =3D 8, > > - BPC_10 =3D 10, > > - BPC_12 =3D 12 > > -}; > > - > > -enum max_min { > > - DAL_MM_MIN =3D 0, > > - DAL_MM_MAX =3D 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 ef830aded5b1c..1e19dd674e5a2 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" > > -- > > 2.34.1 > > > >