From nobody Sun Feb 8 18:18:36 2026 Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01on2041.outbound.protection.outlook.com [40.107.255.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8B0AB1D12EA for ; Thu, 22 Aug 2024 06:30:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.255.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724308245; cv=fail; b=SRIOrN+lVMexX1oOdRZnoEmwjEEnohRBcfvM2+2cCk/2YshGycA7TaWeVDEYphOS/ohR7nvrywftjYxD6iByA9C5RFubhHQlRO0i7TK4poyqlL4rANB8Po/ipwH625+j0Kg1R5hWjlHNizBwb/Fms5f8YBeHmdQIRovi5TOuKJc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724308245; c=relaxed/simple; bh=1dPOzVSO2WaKuQLekBUuy6XZqGKutGtDNi1NRhnhjbQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=fN8z5Gu/9EEtRCf2nqG7F7a2qr+VsiLZlW+I1tOOxiYvmrpyvIpe6lRmLhVsoSAI6pm75ou3rKQjCGqfER5YKVojSuZXhRkUeWqM1dhTPiFj9X84iICecw/6o4laolxFaRAMWmoUm9DReXvSeJGK85Wh7PyTKC/Av2GObjsvBdA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=Casx9A7o; arc=fail smtp.client-ip=40.107.255.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="Casx9A7o" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jIuY3Kiw3rPLakY+SxLvoNfaeSscY9Prponf2NQG2lHCHnK2c9RzoGAj6H5T6w48XffpWOFuL9ufr7v35Nc7ODb40lQha/nUjHr4BZp8LVU0ghcUio5amOpUI8EDU3bc31X4lPeV0I3zHtiPu9a6g/jjNGhEl3FXybe3ixQCabwEWx+eivkG8Hv7kcUMCf+G0W57p/EvefeyTQucPy0QP0C/BMyZNXh7LnPOWEFg7nYFm0bG+o2Wz8LFTE3gCOh+mKo/rc3qCef7Gdlmdu2tEuIOFjH4djwIntJhzzogLpNgzhpmhcnmcki0+pS5mU01zPXNghP/MmHH+fhe9O9QkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=AaG5MbNUU+PU5oj5mUfga4yQ1Xw2kXZCJD+gDoOUTgg=; b=QUl9U73AJwHEryC8rgDppbT6afUudD0s2LX+KwpTMrGZjdDfwo+uHz+CIl6FjW5Ev+56efVWhIN2n9FIKxAWf+Dix4kFTyG2NuoVhqQdXJemkLq3Eiyz6wNwNCtWfBJKXmptiS1b/LvjlX5kEtPG7xQuyMQ9RuoT7toem/R+ijMf7RUVmNZl8SH1u9nWBLXqJAUCB/EV3hjTdvmdaMc2jVRCWuHaR4BKA+TtT3pCVZiDytVhplyACyqRcp/fyJfBvlE5jyBJZxaA/ynMTmT+MoySTTnEQwog6LyGGKgS7W5c+WKW2NHQrTQpWwAu8vM1mu557T9m5uZRHRTP7IdNJA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AaG5MbNUU+PU5oj5mUfga4yQ1Xw2kXZCJD+gDoOUTgg=; b=Casx9A7og4bHBeg70StAf+tn9S/wAs75FgYFR8kAaU+MIbXEKloAhHoM8Fc243GhIkyQi4Pi4X8AcBpzORE0kr7SaJofDUX9+XmUCMWRA8m/biPCuAKLCX1YWfDdt8ZrzZU8Z2L1V9bPikMApOznUXIjXKzsY5acvK+VBbYvhntxG7mGNheWrtIi+jX0mcaOF7zi8bFK8dyfZ66jqfcsjABOST+1AUCMgcHLxYnXntAbK4iizM+910yzr3Kzt5v5RhqdV9sXyVt3Nl1IIi/Jf1Wwg9ReDuvxxCCc7LdJi1nwjpHlDPMIaF5GOX11NE1O7mr/ZVgh4KVqx0XuSshaDQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from TYZPR06MB4461.apcprd06.prod.outlook.com (2603:1096:400:82::8) by JH0PR06MB6344.apcprd06.prod.outlook.com (2603:1096:990:17::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21; Thu, 22 Aug 2024 06:30:36 +0000 Received: from TYZPR06MB4461.apcprd06.prod.outlook.com ([fe80::9c62:d1f5:ede3:1b70]) by TYZPR06MB4461.apcprd06.prod.outlook.com ([fe80::9c62:d1f5:ede3:1b70%7]) with mapi id 15.20.7897.014; Thu, 22 Aug 2024 06:30:35 +0000 From: Yu Jiaoliang To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , Xinhui Pan , David Airlie , Daniel Vetter , Hamza Mahfooz , Alex Hung , Dillon Varone , Hersen Wu , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: opensource.kernel@vivo.com Subject: [PATCH v1 1/6] drm/amd/display: Use max/min macro Date: Thu, 22 Aug 2024 14:29:27 +0800 Message-Id: <20240822062947.1318340-2-yujiaoliang@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240822062947.1318340-1-yujiaoliang@vivo.com> References: <20240822062947.1318340-1-yujiaoliang@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0040.apcprd02.prod.outlook.com (2603:1096:4:1f6::7) To TYZPR06MB4461.apcprd06.prod.outlook.com (2603:1096:400:82::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYZPR06MB4461:EE_|JH0PR06MB6344:EE_ X-MS-Office365-Filtering-Correlation-Id: c1205b15-e8e4-4c88-a444-08dcc273edfb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|7416014|1800799024|376014|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?xSdz/GEfs0DaUfGocYcR8GPvZTEXEZhDmrvloha36wc/q01YEuF6X9+9fh+z?= =?us-ascii?Q?ObkWPJ6OM6X/mOY22WY0fxY00iGjaVV4nB+VwKtocHWcSCx2QUIcsnWajJEy?= =?us-ascii?Q?4IYL0SaMXBA2vPh1wos9QIRHfoYxBH0XbG4V1tPdfCy0gTdAUBeednscXqWu?= =?us-ascii?Q?QizpZ0gqG5uU+MPxbidWsZXS0x/G2FagBZx6X3g5H2YjBJOpXqsiQjrBpm8q?= =?us-ascii?Q?1lW2a1NjV6BWI58FZef9xyQzPrjr7qLZqOucU49Ra6ky+KE/cq8Gjur0Czfo?= =?us-ascii?Q?kqX72XiJMGh2XFZdJA1x6yIYqArF0M0aV8rw3TpnILPNZXLzaH5pq/whlgUS?= =?us-ascii?Q?cG6mZnKFRn4s/j3jqZ2PdkpunA/+L0tSHeJ/f/LSQPbiE8PHDoMnayjWWnZn?= =?us-ascii?Q?TpCfvi8BtNOAtH3+HytOrputbwWbTWJhPYBqquSWV6F4MI+YsvohD62+b40E?= =?us-ascii?Q?o/pJCwBypc7nQmyfibQc9dqW0u/sPkzNltd7IkyNK67f6zCa+1co+HvrksKJ?= =?us-ascii?Q?hGlnJRb2I0cPQQohz1GFUFpMqDK/T5yq+mP1zSGIsdwqVoc2p7N6ZEAd9qC8?= =?us-ascii?Q?SDM3kTMGVNZ0m5KlFw4wnA19CJTO9xcD9mRqcQHZOLb5bO+597i8NDzEehWw?= =?us-ascii?Q?7YH0t21dp1gc4YrI6U3p9k/4bDmz3lUeoMc2zHKlDTg3FEZCh/xKJGkygQJL?= =?us-ascii?Q?mNqBzFksgBXVl4JJPGcIPSp6rbz+gr4rxUGY9aTIyEpSQRAmt0gjSsRBpWF5?= =?us-ascii?Q?P1+sc2QTp/YxIGsQR02zVkkMKLtRYPYvWF1fs4+nykbksOMbbVe9cGxBQ9es?= =?us-ascii?Q?k3FIw+3FaYeO7Ufkykds8hlPqM4rguMw80zyMdpy+tZ9nxBcwCRj0DkyaLLF?= =?us-ascii?Q?IwwFc5AgSXFy5xxUc8UFHr2EoRFQa/nMNCnZTw1bWCSpUf9hfv6yvMKc0vXd?= =?us-ascii?Q?zHD2iVNEUDt3t7KhoH8yHUyTWrrQ3gMbjRs/Dunm03JT4otHbIfCtCC+FY5e?= =?us-ascii?Q?XEk7FQZlgbUaAFPtAMA2WdIm8ULdW2tVWLa+/+nPVL4G04UybZ6e2anNa5jO?= =?us-ascii?Q?N5XIPwWdV1Sz13hOTc+/iPDRPe1cgDPYsxZHW5xWy9ESWOdAEpIWJ5nBpx+V?= =?us-ascii?Q?3ClaMr06fD/MF/+THFSHLSMDDvETUyb0CadLEgCXm+VUvrXLtqt46h8QpBIM?= =?us-ascii?Q?r2fOCQB/JM93+/NKdDX7qvG7ewihcjtrfDXHPgEi5bVxyePcA0JJB3vIRo3N?= =?us-ascii?Q?eLg0auRewObvpaFgxS/qjWeDP14lcAQaeTY6KZc2KLkiNi7eOMBwfmJuQ8g9?= =?us-ascii?Q?SqPTHhmzC21j1TcWbhiYLsdceh8KY9sEzEviJvt/3rlMIqGvnARv4TPkYYq7?= =?us-ascii?Q?+JINs+eMUcZUF1Dx8PnbLGEb9jBP0CFeXu3pEMi4b23clSL134z7OuB2JU/j?= =?us-ascii?Q?7YnjVpIXPCM=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYZPR06MB4461.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(7416014)(1800799024)(376014)(366016)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HpajFXXu7wxnbLRfKLSi6fNinUaJBI2nqmT0Ko0dMO78njzL8Pk4DWA9sFcU?= =?us-ascii?Q?PFz4Rsbd2i5l5E6Tqk1zdcshHNNF7ESSD1cAoNdtbLsGAe7mZhDkKSlFASEZ?= =?us-ascii?Q?ShHKdvpFZy6Sd+rWfoB7t52VDEyt+G5BL6+5PaJO7mHoqeoaSFPLtlcUZ4Um?= =?us-ascii?Q?Dtx1bZoqsl+ykhZSXd9G0nI7cQFWT+KGAtdRF1lo7tUNG1bx58DRpoRLDKfP?= =?us-ascii?Q?01j2iz27qH/Wfm7vz+l4IS89tUVKQEFO408Bpqnc0Be3p5YLY0StMzK/iZsI?= =?us-ascii?Q?JCV/R46/uVUnhE9p/0cO6JhfrlEaLagKmf5oqqCd5YKArYa616bSpR2pZpbk?= =?us-ascii?Q?/RrItiCTlOe2uuPpkDzTKk1NYDNWIvXVlF9v2pSMjRM2r5XQWwd1Gl11Kf/Y?= =?us-ascii?Q?83YK51zxYc/24TkjDiUDMv3MPn9+CKRd7MCXg8FKraHEgnOcM49q+qZyGgVL?= =?us-ascii?Q?EVPKAXiewqTVCGfJKYu4Q6UlC6ivvnvqO2fRQGgnAkSb1yyJbAdjvL5fkPys?= =?us-ascii?Q?aVSGecx/9/ChKr/r+AeGjWVlUQrKFsiqocOFjjT0fbmbTlNJVqhs+M8p4LLl?= =?us-ascii?Q?UFcq2MBPSnwY3AKJGUoKmHJ43P47M6HNIJRn7H0gtpUxsBpH/VRsmGNS1vrJ?= =?us-ascii?Q?aBsTVNe5uStgDtpNER8axsWC6w88XF1RLfCwZ4KwVWHqvmtDy1Mjy4E11R5T?= =?us-ascii?Q?8+cM2Jgh6HQf+a+J4U5k2+TyLFiWe8XUeCGvx+eYvhBI/dKV7Tz3Cj+I+Vz4?= =?us-ascii?Q?ykG56R8KXlnKfSWXEpz8EL/6wGWlS1+3bAnsVKVgScQFGFqIBoOvAoWKat8P?= =?us-ascii?Q?VcfVrcEtUCZkerZWJCao7BR4Weq1KcTFwNrU5XcYYfoRlUCA/Sjp8pOZNhDf?= =?us-ascii?Q?z7pMZ6hFEwGKsaaUgQs0BXgIbiSrPlWYUPogdD2YQ9rpnywSQp3Df9SgSikD?= =?us-ascii?Q?jIk8GEfeHE/tIDMdDpFfWEUZGExCQrO9YEK+PawUqwKdTMni5uT2K8LgP/+k?= =?us-ascii?Q?eKhEt8C8veImby4Rm8HWZTRoKiwzey9PSQKrVtjmoUkqA4TyrCgMKJrwhN8+?= =?us-ascii?Q?h48cqncsW4I+ya858ZRLYRWaMqiSqpCsqaLHy4ueOj/0vjlOMUO3Fr7IMeu4?= =?us-ascii?Q?xZzqikGVbS19XKYhKeWH775SzbgXPuklARMawbxscar7LaFFuQxObvnA951Q?= =?us-ascii?Q?nNWAdpsV7Ex4q3caNTne6lrb8OI6X4dN/AHnrs3ukI/K9wwKdFamYjIV+cKy?= =?us-ascii?Q?aPGp13sDAA2lrdrHVDqeShdpn3YrTmyg4xuP7jK7ICl75S78ecQyuxWsNIgT?= =?us-ascii?Q?eXKpZIeDr9lo+RymK5IIqtF+wqt3n2OmjdWTYO10PkD1By9h+M7LYEzykEld?= =?us-ascii?Q?atOtQubueBNU/pG9Vn9h8yofyUUHf5Sf2ZmCLp4r3LJjxPgR+VchGP6MWYYT?= =?us-ascii?Q?xkxytBBcBoiTbv7qvu8EC7Ffhi01UPtktdmq5ouTfjmaLLBLETt4m2XIIdFQ?= =?us-ascii?Q?614ES0qjCroZnBoGlvWvqYyhUqO/O6MlrCr20ENKhvL+IaREnLuAm+pvwKip?= =?us-ascii?Q?GuqQF15hK+66dx5WXZl3Uh2+yEZowyn9J4ONLqcJ?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: c1205b15-e8e4-4c88-a444-08dcc273edfb X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB4461.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 06:30:35.1624 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4L3WWfoW06rsKNiCKcah2LKPNhktKn4/zyUPM3MbxVMeevzX0h0rZTu6PgBKbu0vau6ppiRMDzgI0Z+rQZRNxg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: JH0PR06MB6344 Content-Type: text/plain; charset="utf-8" Use the macro instead of ternary operator. Signed-off-by: Yu Jiaoliang --- drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c b/drivers/gp= u/drm/amd/display/dc/bios/bios_parser.c index 3bacf470f7c5..f8c1650eb21f 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c +++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c @@ -2300,8 +2300,8 @@ static enum bp_result get_integrated_info_v8( le32_to_cpu(info_v8->ulNbpStateNClkFreq[0]); for (i =3D 1; i < 4; ++i) info->minimum_n_clk =3D - info->minimum_n_clk < le32_to_cpu(info_v8->ulNbpStateNClkFreq[i]) ? - info->minimum_n_clk : le32_to_cpu(info_v8->ulNbpStateNClkFreq[i]); + min(info->minimum_n_clk, + le32_to_cpu(info_v8->ulNbpStateNClkFreq[i])); =20 info->idle_n_clk =3D le32_to_cpu(info_v8->ulIdleNClk); info->ddr_dll_power_up_time =3D --=20 2.34.1 From nobody Sun Feb 8 18:18:36 2026 Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01on2041.outbound.protection.outlook.com [40.107.255.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 82D8F41A94 for ; Thu, 22 Aug 2024 06:30:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.255.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724308247; cv=fail; b=pf44RkSAJQ9Vj/7KcS6f/FWwYFwrdN4fZJCyrpDFhWyqGyXcNfMVJtD9ibfEb78n6kMTS/feHEfdckYDhQWA5MrMNmV66+0owD9DktF96CTFIXt2ecbEtFaOa8O+zLp4sIqKzaIu1HFhZdPy+Z85A1KxiDEUfBhv5R5eiPRkFC0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724308247; c=relaxed/simple; bh=+KhRbbpPLcKSWJ6HAX/NWIVQexesDXnBFIqq8ymjUK4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=WiJleFA1eJVZLb2iYNswW0OeeGcZUdm54fb5oLDgi6UChlFEuFboA+ZvcEgLNeDb3pFRMwO5JE9z1e18xR3RsG1pL6KHFzEUho/shOtWnk6LUKtvX2Rp5uYzEgdV6rGv0bBIPI7ek1JM03TK+WVRfLTEZGg3qQL6By3wuVs3Vqw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=FXmo/3tS; arc=fail smtp.client-ip=40.107.255.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="FXmo/3tS" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OCERfs96POD3M/O74g8SCTnbi84ZlVpq2yzYOF19SaBTlPGl+F9o3GuH828sMrXjzxLNzdSC1wPU+T3bsr5MU+nQHR7yUHbactsemdNo7zT9kXkmFg+0FPrtTpEmRsc8SfX2c45EXKH/piWbQXMEYDcjvtNz4Iozq0mK/uYfSTl7mNe8xiXhYCbRtRFqB1h/nsZK5YV0Sw1uExExc40p9srZ+akDN/U1BRqBTqYy6Ayj4EJ5v7Lf8An279gP8ntu5vdxis8l5upk0sDnfDf+yRcmDi/InKMBEFaSJY+ZXrDeLaczU0+rNI54EWYCPwKHvjnkH7qjjJymWHL+WLpxVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=KDzZO710rFLkj1elfDytM9c007FIqcUXwciJ5i4GCmw=; b=R+awt0WgdWwZ111rDg2npsQzNFfFjE0b7st26weGaCzQZD5pRdOkxaXcosFyQ2n8ey/3WsUdKDeRGaOhgQBqwDfme/ibCeZAuU1lWmbHjtk8akX8v0zcsoHaog58RQP0+Sr816605Rf9xaE1IpmY9VIarjYeVOiyR3E6oRyAjgst3plRbt1tirSTlOgGGz1VyQCtwHWQGANpC5Qoqz7w2Y+MZFOsu8D2Psoku24zQwC4gfW+esY2poGbg8PAX0tTBDcEoOZOFUDAfLv3q69kn2jChC6lWpf6NV5MYAdy2PEzZEgKljf75p9jAtKr8MZP0VoMF2a+iZQYAc4po6JMNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KDzZO710rFLkj1elfDytM9c007FIqcUXwciJ5i4GCmw=; b=FXmo/3tSEpJg5fUvlezlx7X6qdmwe83SKCSEPo8zcH9GO85fQ/ziXNH4mkR4mthVzYsOf4PA9BO5lL4Yy1esHCm9AgNiQNsjSxD+2T20Drcn+wJf9EzqSuq5NC53OsZyOw9yPTU7TyiMHlt/iZHA2ljmykzajYqs6ZmG4jyLrmBvqHt0ye2+UcdlBSG0QsdtjeZrpPixXKccrlToaUxNEqUycaBc6gkPfn9HEuczNEjWJ6MxZ/MydU4ozB6Z1qkWmxqAH8W0zCLGkx/u6Rv3RAp2FprEzCshI6IsUDirAoOLqKsbwSuHemIfsG/OWFijRGqgZjDP/sd/P9+WhiwWmA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from TYZPR06MB4461.apcprd06.prod.outlook.com (2603:1096:400:82::8) by JH0PR06MB6344.apcprd06.prod.outlook.com (2603:1096:990:17::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21; Thu, 22 Aug 2024 06:30:43 +0000 Received: from TYZPR06MB4461.apcprd06.prod.outlook.com ([fe80::9c62:d1f5:ede3:1b70]) by TYZPR06MB4461.apcprd06.prod.outlook.com ([fe80::9c62:d1f5:ede3:1b70%7]) with mapi id 15.20.7897.014; Thu, 22 Aug 2024 06:30:43 +0000 From: Yu Jiaoliang To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , Xinhui Pan , David Airlie , Daniel Vetter , Hamza Mahfooz , Alex Hung , Wayne Lin , Dillon Varone , Hersen Wu , Aurabindo Pillai , Samson Tam , Alvin Lee , Joshua Aberback , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: opensource.kernel@vivo.com Subject: [PATCH v1 2/6] drm/amd/display: Use max/min macro Date: Thu, 22 Aug 2024 14:29:28 +0800 Message-Id: <20240822062947.1318340-3-yujiaoliang@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240822062947.1318340-1-yujiaoliang@vivo.com> References: <20240822062947.1318340-1-yujiaoliang@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0040.apcprd02.prod.outlook.com (2603:1096:4:1f6::7) To TYZPR06MB4461.apcprd06.prod.outlook.com (2603:1096:400:82::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYZPR06MB4461:EE_|JH0PR06MB6344:EE_ X-MS-Office365-Filtering-Correlation-Id: 82a99653-18d1-4f26-1c7b-08dcc273f314 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|7416014|1800799024|376014|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?O1e7+QoSZI5tGaJo83rlmyp6IqisaxZ80nspoBss2Gxne4/xCXKzc/AmjeU9?= =?us-ascii?Q?q2DizbssWzluUE0OiF9CNxogx9Fi+qv+sSgp272Q5wBAsW4xcdIGltPCnRCg?= =?us-ascii?Q?5+Z/0q67dXFarASeOLqv1cPcdOHkbzxu4wHFcQwkHRyavOTo5y+6GJkzkvbR?= =?us-ascii?Q?ApNrw5ZKbKmSIf98LVef7Wf0EAk7XZPiXgS1lg85KMQSm4oGduxenjFQYgy4?= =?us-ascii?Q?+eep2o9jfd69jOUDV/euwVcVyNNkVs+3biP36cEs2rPg+QKbUVf3I6kMAfLG?= =?us-ascii?Q?+ohjou1LWfrAybc1GSB8r+hfQIrBlb3mNFFJXdhwR5aTxuK7NO/KzuMUu+Ol?= =?us-ascii?Q?IPPYU80nZDOqy+fQK6uaYiYPc7bsabK0nfhxav+6Z2pZUQhm6SUk+toFqtOT?= =?us-ascii?Q?Tyk+28S/NwEyp3dx5wynEiL8uxTtH+RHWbpg+biCP3BPMv7ANsTjWewyKv1k?= =?us-ascii?Q?NLfn5kjYdj59e09d+dj6YdJ1h6/A12GhyBis9CFEG68Yc1tvDppTcIoKYOoN?= =?us-ascii?Q?seZOnrFgryScF5NxVbyRkefLTY83gJjVs5BAojRgXsSQTX3Y+DHwKSDD7eGf?= =?us-ascii?Q?zowvLEGKZnS3wQZ6oFXNm3xViv7/WtYqjZeUGy2PMgH6ZySNhFjJgShhgiHY?= =?us-ascii?Q?XcPzPBRC3uwkYarOEp9JCR5AX1/WOTj1ZbnoelZm2IaMMCCw8gQTYrrH8Ej3?= =?us-ascii?Q?qeg91+F33gBQZ3LSvzx8hvSAcPlBgetzpzlOEq+8WKi9AKyVGvqmtZubjBSk?= =?us-ascii?Q?6eJgAG+B49/HCF1iNr9ks9oU5Y5NrV9/e5nCGLVWXXUibGFLIL3j/6sJT6e/?= =?us-ascii?Q?YCeGHxovtrrm2KSrSbfeM60dizJAjNOoFYMBgVpxAxvzBFkXNNrLKopKjd6v?= =?us-ascii?Q?erwclMYoFH2lvQ0ud9btx7ZmmFIxvt49+q37SCp9d2/SF+kRLs6N4qqLWppZ?= =?us-ascii?Q?tdASnCiKqnyz14LaCu/plfVyCrzVqRFr2/cqmjHGHmfivHYPL5aayE8l2uh6?= =?us-ascii?Q?6AyjvrY2sYHnGXTRwuS3wGG/+FfmyAvReeNAER6OcfMkrq/Vcxuo1Mp/scxc?= =?us-ascii?Q?i0FKAozjTRtgDlHUvA7xOQ9Z5o3zIQHgVjncw+DQCsGe3K84w8/y+WK27yiN?= =?us-ascii?Q?gu/G6nsgRdsuYJjgT8DKvXq7Tu+DRedR9wvAZTFFY3ANhRMz7E/BqHE/KJ2a?= =?us-ascii?Q?vF9gzTXmDWVnT238AJggzHzdD87xKuj4XcN4fDEVlpuAbHSgI0WT7eZhHnXa?= =?us-ascii?Q?+NiloA61lS1gzlPnb3GC49FZSRppidGoTsQYYn1qBs5PmUTR+7sYvvXj4vNs?= =?us-ascii?Q?HlActxjJWS6XGKs6IwXVhuMpniYto3/Iwz503PrC4WYs1750S+qYtE8ySaDA?= =?us-ascii?Q?nUEmXR5d3nL+fKi1VjzSpN2595RpiuzIGhJ0a3oaljCvETOv37F6Ve8Epk2O?= =?us-ascii?Q?/DN25Ln4Rsc=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYZPR06MB4461.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(7416014)(1800799024)(376014)(366016)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Z4p3ykxodpztXJfQqKckDuZ/4fZSmDeAGMdwPEfiZtfQGpJYDEV4lbWk4qgE?= =?us-ascii?Q?RrYdJPRBgrkC/zuEtX0p2RFjEUYLMG1j81SEWOBRqnw1XxwRP75hlMo6G4D5?= =?us-ascii?Q?0Gl5cDb6I7OvGsezKG9hijEBNnIJC4x3CfPNnk/GDIt1RGK4ZpCuckrd7vn9?= =?us-ascii?Q?tFyKhUotH49rqA3Xcz3fl/tTsJN5Ur5R+V3ub4n90NjBVR3EocKzYHElX9DM?= =?us-ascii?Q?zdDZau8mnCNx3/LWBuD/+jYNs/yFYnlWPRrAUPntY6uMY/p0ilNhSEpJ8MgS?= =?us-ascii?Q?6+AiobO2aHwIME3vsluYcE1vxj/IISyc3PT36zwPv3RnX9ftHFfg9vm5MAno?= =?us-ascii?Q?h3OrBXSjj6XFLYGdIExbdZEte8sCIgVvWR+Axf4Lni/jr3M+lpL5AAiZTGRH?= =?us-ascii?Q?tT+g4UOzVrftCnJKlbfQs+8nkkg4RsutNkZsT3TuhBAwLHwQg7T7lY654egG?= =?us-ascii?Q?iqgy2RXNNeGeu8uiEuo2ljpzHUS7vS/KHh3cbvBfwLbhCEP4yod6OE/xQiR2?= =?us-ascii?Q?gJuUbnFq3d83Py9sFfW1v9Li0tAcGTE1ECPH9hnnNzfpUVE3atSMdqNTqLXT?= =?us-ascii?Q?HoeROCUdvvKEK/fVHuifluny3tiecfUyw78tYPxkAJFa/hH6Rrz7ZI9FndB7?= =?us-ascii?Q?VXvQcVp4Z+iWoKTxyet1h0Lq+Ey4At4kew7HFqVUOJ/Xj5Fxf8G1zmb3rsWk?= =?us-ascii?Q?5weNOi3zIbEAN6ze0cx52rHfD1+z1Iq4fiqUdg3paG9YZmsB2/GTlyTHA7Hx?= =?us-ascii?Q?kGbZObPBy/hHxvuISbXanv9GplDfXfeMYc9Ms1FnZ9QWLy4P/gqP9k6Cu+RX?= =?us-ascii?Q?DQ3xdcwXbv81yO8ihc1OyzIT/25A/7Cy4bBmffyCCIVyvTv+TQZVXe7EkucN?= =?us-ascii?Q?0MG2PhJMuwd41PwpVoEisB0yi6NK9/b81t6ukxbKMbrRl6PK1DU8C9DOSUop?= =?us-ascii?Q?pQZVbXfSM2HG88imgJaZIqsKaDa13TAkE18TlPKPVSjCbDot8WNgRcIWoajf?= =?us-ascii?Q?YEED30V8oqZuInuAncUzLBunfXxQXVrP4GT/3XSYYWZEQIXtWlJilXkqDasA?= =?us-ascii?Q?ewGlhMQ3QhThYTWGROUXv7ky/CzF5eeFN/7/jzosZ0/hylgrwPM28FruGWaZ?= =?us-ascii?Q?MAZpJDMSDponyAiSIyDq8zknKRCkflTYpm16okBWzu13THIHytgbhz6qoi2N?= =?us-ascii?Q?R9SStNDHIdcUhI1FAxXePUV7HAc1yZIiYwoDdLhV+6JMPAxnMr2nKpSpsD6x?= =?us-ascii?Q?bvxuLd5tO1wdMm2LLYYvoNTqJuLa/CzaY+d/x+Xk+/AIEr14F4vKXI9qE+4E?= =?us-ascii?Q?9XeqafrjJ9r5KE9CXoI/bWogxcCc8TUn6Bgkgs5AYWNA1UBK/N5hTOV5Dxyj?= =?us-ascii?Q?8uhNMa6t9dE0g/qKmNj2kvak43rE90egOGI/1qYDpM/f+rLdytVMzDsGYzo/?= =?us-ascii?Q?38Y/1riXfmQwzBbYuroFrHv6vtjN31920n4umtkZzQo3ucXVBPuEJ6VDVwy+?= =?us-ascii?Q?Nlu6JcpIpJ/mf2qZlXLYKbOOR4VGVc9sRIl9Jjehp0YJv7rZxcNpK4Fc/Yku?= =?us-ascii?Q?uomNRdQnPW+uQmZjJ+vEWffTjiOI1AjpSeCiIRqk?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82a99653-18d1-4f26-1c7b-08dcc273f314 X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB4461.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 06:30:43.6768 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: spBNy9p0cO1jIJrzj2eEPw5IjubmdGNFDCMV16+sjTPIrjcdf5orbGhP6paoHJOso3WitPycvU/mpb6F2KNehg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: JH0PR06MB6344 Content-Type: text/plain; charset="utf-8" Use the macro instead of ternary operator. Signed-off-by: Yu Jiaoliang --- drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c b= /drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c index bb4f3bd7532e..4975d47b66d8 100644 --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c @@ -311,7 +311,9 @@ void dcn2_update_clocks(struct clk_mgr *clk_mgr_base, new_clocks->disp_dpp_voltage_level_khz =3D new_clocks->dppclk_khz; =20 if (update_dispclk) - new_clocks->disp_dpp_voltage_level_khz =3D new_clocks->dispclk_khz > ne= w_clocks->dppclk_khz ? new_clocks->dispclk_khz : new_clocks->dppclk_khz; + new_clocks->disp_dpp_voltage_level_khz =3D + max(new_clocks->dispclk_khz, + new_clocks->dppclk_khz); =20 clk_mgr_base->clks.disp_dpp_voltage_level_khz =3D new_clocks->disp_dpp_v= oltage_level_khz; if (pp_smu && pp_smu->set_voltage_by_freq) --=20 2.34.1 From nobody Sun Feb 8 18:18:36 2026 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2078.outbound.protection.outlook.com [40.107.215.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2442D13D538 for ; Thu, 22 Aug 2024 06:31:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.215.78 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724308266; cv=fail; b=U4rjM7KcYOuJDLVMmJS5jOjdSuOt0AMJPhEPfQ1j4w3FJzQjfC8BmGoklm1pni2TRp4RGuGU0qm/6KgeCFGAeDb+tG5K3rKCmU3etiYtkAlHAEwGVkTq87dIea3qQ2ZlWJN15qI0gBSL3YboTuynbbh1q/kVD40QigrwqPt+kzg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724308266; c=relaxed/simple; bh=35spBJUt5DeCgSAVWlbjWIBx2zduK97xR5CtexQ5pfA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=ps2rqxHSEym3NlEXpUL9gkTPr6RmGrONHrdPYdbsyefF33pUK9CRZctzQhBJbSg0YwzMoF5nmGsxUJ3nIZ/o5cMTdZQrziciv93ZMLsSJdSjzhvFHEl/Juupg+NfJ4OHRcjqOQ1ROxSGFUPrmc6UP5Ur3cPjlGLUJwVZ+z0jb1k= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=YoPRiOYY; arc=fail smtp.client-ip=40.107.215.78 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="YoPRiOYY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vv/ttxtk2di8k0Ry+wHbOIvS5W+kPhdiD6aCPOWP+4C2KbiNyWzo7GpHOuZ7YEr0Pizzxvfi/l5RAHK1R12qd0XDRXOvu1ku7sfaWws9GyUadJCdvt3MhW1cbjBjPJV0jX6izcZgvZNtIPx/H9cetU0pbHt1dPbqR5vAxO40+k5gmO21m/uz+GeFb3U1G0PMSEr/nnFfAcCkd7LkQRT82SIr7SWgQBc/KqUEIOQBblWHqqlqRwRhJAHiT9PvavnLjptD2k2iyRFgD+19LdXKAIn4+FRfQdtfO5qban2HLkdVxG3VokU8Iq9WyjqcHer3YyBXEj139dx3Ui5IBsFdJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=WPHFiCX2D8HefJU2ksWv8ccMuI1S9KxOQ2E/bdwcOTg=; b=u6D0vxGZ9HzkNFejbPwfM1VLXCItNLtXrek97h+eMoQadWEEgrYjpuJihHlYx1eIpq3OGN8NNSlskmdzHml2kfWNvyBD6GBCgZ/pe7wnNFSHqYfSgQAVPDd77WlRXgTs4nBSn/ahHiJ5RSLyr3wVKwbtSNHMpRkrzcxIA8TgGOS5lhWhH/Z7jaNR8PwZapN7WRhIfbTJ2eLh2QIiYASr8Ccyst4aERxwP07azvdWzYYpJ3nYBz17xNiiH3h0CnoMKiJ/AktUv/v9WBOQKLXh/JgKVeiC8ohDo2phUB9LAYNfcfgTwY889SAK+HkauaPbYwz9h1nbdzff9R84Pvhj3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WPHFiCX2D8HefJU2ksWv8ccMuI1S9KxOQ2E/bdwcOTg=; b=YoPRiOYYE3tnaYYrd6yRHqIiSOqV/rvzzqhGOEGKfOznqXL4mj4jzxCSThnTjPZzVlP/i/RqJSK/DKuBVLDCZcTKsn424x6Xu+MiuGxDpfmDpOVRRB23Oc51ZamQHkSaYHO0Z8urg5NfQ1lR0zWI25Zd/qP4AuZ3El1FNBbFuVCY5nErawFEfWQxOk0Orpo8MVEUySouvOmGfP/0qW+WaoPxh5NR5PbInht1s9T6WDbineBYUtaM4sF8CwQT7Smi6i2GSHsAv35cwUMswP3aRkw4MEscxVS8nSBVl8W9T7Xcp6Ot2rwLnZxKYow+xKUB3RZtM2sDeUSbE/NnHAcmDA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from TYZPR06MB4461.apcprd06.prod.outlook.com (2603:1096:400:82::8) by JH0PR06MB6344.apcprd06.prod.outlook.com (2603:1096:990:17::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21; Thu, 22 Aug 2024 06:31:01 +0000 Received: from TYZPR06MB4461.apcprd06.prod.outlook.com ([fe80::9c62:d1f5:ede3:1b70]) by TYZPR06MB4461.apcprd06.prod.outlook.com ([fe80::9c62:d1f5:ede3:1b70%7]) with mapi id 15.20.7897.014; Thu, 22 Aug 2024 06:31:00 +0000 From: Yu Jiaoliang To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , Xinhui Pan , David Airlie , Daniel Vetter , Alex Hung , Hamza Mahfooz , Hersen Wu , Dillon Varone , Wenjing Liu , Alvin Lee , George Shen , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: opensource.kernel@vivo.com Subject: [PATCH v1 3/6] drm/amd/display: Use max/min macro Date: Thu, 22 Aug 2024 14:29:29 +0800 Message-Id: <20240822062947.1318340-4-yujiaoliang@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240822062947.1318340-1-yujiaoliang@vivo.com> References: <20240822062947.1318340-1-yujiaoliang@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0040.apcprd02.prod.outlook.com (2603:1096:4:1f6::7) To TYZPR06MB4461.apcprd06.prod.outlook.com (2603:1096:400:82::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYZPR06MB4461:EE_|JH0PR06MB6344:EE_ X-MS-Office365-Filtering-Correlation-Id: 69a8ccc7-9cde-4a90-1426-08dcc273fd59 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|7416014|1800799024|376014|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?AeXGn4tS0gACzgjnWtBzHiB7Kf1TYk07OhDkR/kTgM5FWSRewPlQupoBRXfT?= =?us-ascii?Q?TbRrEvXIE8SNEIt/1W90UT+F7EC77B8TBGqwMpJxgakBASrC3Gut06x/O8yB?= =?us-ascii?Q?RJBGGtwdued3lWxms1tws+vb87wjgjbbX9Ms8kt6zMtbzPSG37+zSHhgfZJq?= =?us-ascii?Q?oUWzh3+aVtJmUQHUpMb2gv3n3kkQfktknfyxhJVA252/mZlzED8yGXKy0Z+w?= =?us-ascii?Q?zx3c5Mw0m6YUJ7IFIWwaQTQlIBA7qbyilc3nqFJHk7cVfKQI/Amaq/Ya4wK+?= =?us-ascii?Q?vG7BwHEBzUYJ3aWViK9VGt1C1/yyW4Oew4OB0y8t2oWU40AB0syGfAT57UL0?= =?us-ascii?Q?Pa8E7n3XEZpo0Bnx5fTIb/ecAal1sMWaUZVrgLBRym8D2/YKNBfey4zfaOwj?= =?us-ascii?Q?VIJfp+ed9qk5p+u0gOmVmrAmNC159Baho7e0ofikcobtt1JYTUMQgqBr44kB?= =?us-ascii?Q?7SsVkyHgH1hdrcdagVs73EoMM9H3wCjoXCyitUWUnZTQcatMgwM6Zep3pd5a?= =?us-ascii?Q?XCQ3KyR663YhwIRRof43PUM4sS2Trs3QFCUc8VdEtsMOsbXsLDWY3IGbb5l1?= =?us-ascii?Q?rH5jRTJEkD6AUi98R9k7uiiH9Ag927omTwWEZj/QqIIkvQV2fUkdWIJw6dxe?= =?us-ascii?Q?8FVNYjh+6YmBOmdKlyINxLmxgyn5mWDMpCcSByWPptajrdVbeIvFGEPfbhin?= =?us-ascii?Q?bE7G7hdGRi4zremlg1sl+iybKQTWR1e64HUSqLD+LuDZELD+YQ+Wi+Nh5HAQ?= =?us-ascii?Q?pMusQMSQ9h3xIq1HxCqEyy6KZwgU+IVR+FggjQT+O9NXBD9KL7vt9hEanmLI?= =?us-ascii?Q?Te6cHoaUWJp+kjNqru5XBe1kxYdxN0/1EIqmr4KBfqYpk8eBYd8NNuHLQuo7?= =?us-ascii?Q?AjW2qymGAY17rYESPDkEtcm4n6lL2PBBb3xvqC5gVJFNPblTArSODI/c4xIO?= =?us-ascii?Q?GWFbnKzuCaqP+jV44iu8w0UMFgcU4dk5UwMZJYhXueZSNJua1FKhnLglyduH?= =?us-ascii?Q?XIs/E5lOtHxZgDiKr0XKbzRGjaB2O4QbbdXsBbLZ8j3KOdA1kgPM2VC4o8PB?= =?us-ascii?Q?wchCGvPiRUuIkuOh83jBcyrz8RfJgtfg7q5BilnV4LIEGt8mYyCiNANahXp+?= =?us-ascii?Q?Y/MstRx1jOi50F9n6GzHxsDfdj3yGvYS9Y7Ki6QXdEhKTbJC3t2CKK8pIVr+?= =?us-ascii?Q?rSlerGaeBs4VWze7w5Q0XyG1CsP1d/d/K9+nPsQHeSr0tyDprGGAx/Aa3ciU?= =?us-ascii?Q?r1MB4xGNoEudEAROhd/Xi3OEh66ymcy9OJotIJAxHtM5C4rTBipIV4IpNbcC?= =?us-ascii?Q?87rTVkZHGjuPd889SaKeIOSOUIYg5xcRMnGjv3DczHEGQ/59jqzhjvTjYDV5?= =?us-ascii?Q?JsvxuvOGtVnVeic6NZ6MO4IYdPRup316akmyhVFTxqhCdoIcnRqUwqAcx3fJ?= =?us-ascii?Q?a8h/ZXAqEHU=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYZPR06MB4461.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(7416014)(1800799024)(376014)(366016)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?w8PAf/KI2X2m6e8IF/syfTJroZUMVhDAY6bZYjdcVxfSpaO8XEopxVjxaZ+L?= =?us-ascii?Q?iFhmlLF4KVoocIRFZvmveW1NZc86r4Tv+B+EMtaPnr0LK+cauHvW+mlQEHEd?= =?us-ascii?Q?KZZ3z68vfamU/V+52b1D4K9gK0jz4MSW5m2O8WvDXcngEQu++ic1ohA4sNUb?= =?us-ascii?Q?HOJgMjvR2HeBqeSZgX45BKkHICc9ij3iGi7PpZ9HnGwOYgm3YrnyNizovDTM?= =?us-ascii?Q?6kI/mCTcMhFZJoZRmQHYk3CooiVhjn528oJlZMUqHlEMjEsKfCwtEmNFb782?= =?us-ascii?Q?d5YKCwRoJtWsoUBJ2gja3cq5apcDw7+qDk3542j2wuIK6uPTAanE3ENPQoxi?= =?us-ascii?Q?ywKFxBEG9gIs3QS4J88T7u/t5ZwOTmoZbueZfDDZGGMEv//9KOQW4p+LvMZb?= =?us-ascii?Q?awXIiVL7LOjKUrAHw28WPEwbgbPQsnnJjOzzD8hrqgHndRyBqBHiedzhWpug?= =?us-ascii?Q?qJykqsMdCLz4ApqAWO9w8MVD5KDdTklErvSnce2Dke0TqZW2MIVDvlqj2Wlj?= =?us-ascii?Q?wD5L8TGoPGpR+oSk1njgaR3Az5FWJ6GrKwNP4Sfz1F9X/xlo7/7Q+JgFPNyd?= =?us-ascii?Q?Oicc+8jZXdkZ1PUZynHaaqddjdHDgkqBl1GlJDhnU7+lGlvPCh4oTPEH+xJR?= =?us-ascii?Q?V7YRP/CqcNw9DPX7D5JTlyTCJNHXWfjQtW97kbVNsEOcWu2DdEQ9w0HVNEL5?= =?us-ascii?Q?Vlz//DlvLffP0RU5oZjQ01HR0WVzrlY68mXzdQVjohsQbbduoTEFMgypyZ88?= =?us-ascii?Q?BTK8E6XZ++ZtH3nBCCqmHXjoSG1oSPaMPXrgsgaeTXmBIWvepctxJAOk5eVq?= =?us-ascii?Q?nxxSiCXbNkOUacGn9t1/bCFqvc4KoPW1ChXhrNnIJyQIA1xpuJHHNTH6HV7L?= =?us-ascii?Q?OCg1sv25yGTIslJrmZ1LjzQpCU1uYfYb+RftUTNZaXFHCjtvm/OXyjLUZAPi?= =?us-ascii?Q?zZLytwawPzio9xFmfFbhIo313pQ8bERpCIQOImsb51VZz0a0/ugYB897/bsK?= =?us-ascii?Q?a1P0Yi9upl9+kUPf/wJ+AMK5iciHVwDdkFMOXHMHDb9GKc8jLPSrDXMxC8lN?= =?us-ascii?Q?QAdR8V4vShZqOXzv1hJ1f1mPSkHUEI/0uLQB0HDabF3Zy0WANSBMFuBoqtiR?= =?us-ascii?Q?/KXfb8oYo4DXUKWGtcuCzFNIgvY6QK62o1s1gRAP404OHyGI6/EUK3jAj2TJ?= =?us-ascii?Q?aGiZLXTuRfBHPYuO699MYGobjwM89tNCin4AQmkctAUMRVrKksr1tS9NvMNW?= =?us-ascii?Q?c7SQtUSVtIengQEBOy88GFuCYwrCqucNudcHQ5ypMtqs9qJ6LkXJke/42lrn?= =?us-ascii?Q?GGIeHoZ56VwpFPoNAtEJdx4N1COEMjN5aWrWCtxwz7u+pTNZufloeZc439sI?= =?us-ascii?Q?vst3i7H3HyIohlT3i64CafdwOPLeQtUhR/HKKZm1ISbEbutHzY4DQRVtzF03?= =?us-ascii?Q?kTAS7Kyb/Qq7UspyTwY92J15rPKPk9yJcl9ZpFTt2Ksm5Hd04JHuHTUTz8LU?= =?us-ascii?Q?pReIaFx6T+sMPJ+sQ7b9y0ShOO9WF2uTn34+Fbox1Lxn+uJJ/8EmJiqCzx0s?= =?us-ascii?Q?T0zb6DBDM2qOaxLuqFOco4LWU/sPzux8zN0qfaku?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69a8ccc7-9cde-4a90-1426-08dcc273fd59 X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB4461.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 06:31:00.9032 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: loXKKdR14urBzbqbEwGaMEAWVsGRI30OPya7keNca40ktnwH5l0lS9IKnZA/x4Z67rhti3erYxNfRzyCCMciAA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: JH0PR06MB6344 Content-Type: text/plain; charset="utf-8" Use the macro instead of ternary operator. Signed-off-by: Yu Jiaoliang --- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gp= u/drm/amd/display/dc/core/dc_resource.c index b38340c690c6..5d40f61261ad 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -797,9 +797,9 @@ static struct rect intersect_rec(const struct rect *r0,= const struct rect *r1) int r0_y_end =3D r0->y + r0->height; int r1_y_end =3D r1->y + r1->height; =20 - rec.x =3D r0->x > r1->x ? r0->x : r1->x; + rec.x =3D max(r0->x, r1->x); rec.width =3D r0_x_end > r1_x_end ? r1_x_end - rec.x : r0_x_end - rec.x; - rec.y =3D r0->y > r1->y ? r0->y : r1->y; + rec.y =3D max(r0->y, r1->y); rec.height =3D r0_y_end > r1_y_end ? r1_y_end - rec.y : r0_y_end - rec.y; =20 /* in case that there is no intersection */ --=20 2.34.1 From nobody Sun Feb 8 18:18:36 2026 Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01on2068.outbound.protection.outlook.com [40.107.255.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2386F1D12EA for ; Thu, 22 Aug 2024 06:32:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.255.68 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724308329; cv=fail; b=lnqpIt18p6CAt5Aj0PFl93UHENtYyw0Bx2f8ywnvrQ83rdK9d4ITa/+6R2uU4WjlCwFm9h9/2ZQ+KjrQU10vxKuOkvOa/ZQ58735XhliMDFu4E70OQUTkw0niG4awdF2LP+AE0ox3e4s7baS6Z+KxFhLAFRjYe4S7lidhcBpQ94= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724308329; c=relaxed/simple; bh=mOTuuGp9NHdZaTyR+VhF9fYrPddCTPd2FRfu8AvMd94=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=sIafw3KTIPD5U1tnK7C+p6WVVA1K2b/oavpDAm1P2hxVh2X2CDX8pg055/HEOollRabr9QlqCEaTMtUY2qo7qlSSQ4jf9KRIG22kf7U2JoZodEgN7i/0N80hLdoIoNFOHn229AFo9kwQ+Q5ebDZkHJ2ZtT/RrsOLJu+zjrVayAM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=VoqjnAiW; arc=fail smtp.client-ip=40.107.255.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="VoqjnAiW" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NXtIpO/d550ydKBI6J9APSpMsCPI3CcUP15lt8O1uQ22Wc+a/lBEgAS77KWCo0LB7dVpyzZ8sJaY/dR/5ruhCCtiwNN5Z+C1wdv9bM/3Mzow8qkMilhDgVqsTvRTSVDgWb0I+bBBVwWIYQ4PW4ng4Y6q6PtOl2Go7lbJi0MJYJowIWX15x6gd1n3/kmPXpkcvD8qpyBpU8vM79FzgRQWu4sv4lGM62V7v4mnaEHz8gpl9jblTC/t0kfmP20oMryB8w+cuQzNqXKZIGOi/M94hz/YkRY9fddtQXqfVHUOYDXS0cOy6hodOijbsuQkDHDM0nuJ36KHKIRoiUyo1JcNIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=mTsu0wrvbdIEE6vA3MQgBXlaN79AI4+N6lS1tqsz9ss=; b=hcjvOBc5uUG4WiGxO8w0++9psOjt9MrpA4HPaI3EOJttxCBR6gVVnirgAk+oMoChPwL76wi9CZlK93mBIvTdfEySi5Xqp+sAIPbc52Rn9b76ZhnxOblh4/DWTjBUW0RW+iVFO/SudaG3B5c2jNN5UjIcHmZbpPqGGUErWnY+R8UApSBBoOgg7Si9YevY/QsJcWcZkNcdSvQJHaCiQqMYVRTypl+X3902PrgftQzoISlWHCQuO1fSdyamQRVLueWxeudxrc1bg/1jwHFsk2259nnLNKxNAnjldPaTPreCMXcKg6vYeirfsU6p57DYLKnSU6EgleRHnTPq7yi7jdVtRA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mTsu0wrvbdIEE6vA3MQgBXlaN79AI4+N6lS1tqsz9ss=; b=VoqjnAiWk/n2rW702B2OD0/CkHDtz0/5bNBVz5qNxqEuso7vUumEC3Yb+KIAy5CZ2sMOn8m4Ind5PqKo0xFFbaCk5QcXP/LADbJovUtrTDuBUDt3NYkEsLKmSXEJ93Hb+91z2OjoginTy+iKX5TNIx6cg2Pb72JhUzRgtBIycjSAI9vZGgUnW/zb4NNf4kED/bXN5skElPT0zHSTNx2CjtduWZWwUTXWeUInq40KpVbFcAvIl2Gz/F4d1UVImHD7hM1CTISH6CiXyLQQNepHgJt4ppGYmzRwyTF8BpMeBV1NcDWnSYzOLpZwugbg4hLrDiMc00jDrvd83kHxT4VV0Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from TYZPR06MB4461.apcprd06.prod.outlook.com (2603:1096:400:82::8) by JH0PR06MB6344.apcprd06.prod.outlook.com (2603:1096:990:17::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21; Thu, 22 Aug 2024 06:32:04 +0000 Received: from TYZPR06MB4461.apcprd06.prod.outlook.com ([fe80::9c62:d1f5:ede3:1b70]) by TYZPR06MB4461.apcprd06.prod.outlook.com ([fe80::9c62:d1f5:ede3:1b70%7]) with mapi id 15.20.7897.014; Thu, 22 Aug 2024 06:32:04 +0000 From: Yu Jiaoliang To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , Xinhui Pan , David Airlie , Daniel Vetter , Hamza Mahfooz , Alex Hung , Wayne Lin , Dillon Varone , Hersen Wu , Nicholas Kazlauskas , Duncan Ma , Alvin Lee , Srinivasan Shanmugam , Aurabindo Pillai , "JinZe.Xu" , Qingqing Zhuo , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: opensource.kernel@vivo.com Subject: [PATCH v1 4/6] drm/amd/display: Use max/min macro Date: Thu, 22 Aug 2024 14:29:30 +0800 Message-Id: <20240822062947.1318340-5-yujiaoliang@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240822062947.1318340-1-yujiaoliang@vivo.com> References: <20240822062947.1318340-1-yujiaoliang@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0040.apcprd02.prod.outlook.com (2603:1096:4:1f6::7) To TYZPR06MB4461.apcprd06.prod.outlook.com (2603:1096:400:82::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYZPR06MB4461:EE_|JH0PR06MB6344:EE_ X-MS-Office365-Filtering-Correlation-Id: 1dbc1ecf-2852-4624-a0ad-08dcc274236b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|7416014|1800799024|376014|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?sEQpezvNG+V42wvvOrLhsCqxeJ2C4IXAOez9CzSSAGeAFP5xuY2EzJkgAJOA?= =?us-ascii?Q?6yPn2dhqksGPgpuBjiV9hHpTIcxj2iPfoleHF1kqMyQ8epSmlHJn1T3qHCkd?= =?us-ascii?Q?JrIWokBTfiMDo6grRr0ZzCETZmpaPOdv3XfaFHnX21F9RrE64s35SW/iQPpt?= =?us-ascii?Q?drR6ibh3pAoP2ei/W8Ba/VKVkiGkVFTTObgMZz+fPdii4/+00SUOp7fIFv8a?= =?us-ascii?Q?skR4Clz3KY8Czp8+O3d7rqiJD7yM++r4K7e4VC0PJ3TtSNedjlEpFJRfRFoL?= =?us-ascii?Q?eFi5hIhObmOPBg9vp3khFwzkt73oP6MG+OnMIXllup3+sxtPxRudqMVnBYOb?= =?us-ascii?Q?FrIq1y6JT3C3W+Rkg9kVMLJNVtDSDxDr1NCsX9lf1XGmmZ8uDok8dWU9M5VU?= =?us-ascii?Q?Gxk0WJvicyjPaWF1BhNclJp27bPaKCCNuq/hDSBafFaN7UJ3MN0HRNwurcNi?= =?us-ascii?Q?zQ5BoMVZ+yNW8uhkR3v4mEIRVrbnY30sQz3q0fqPEQk0PfCS5NEYLRh5Ixq+?= =?us-ascii?Q?KKZoQwFsMp3p+Rjs7ZTFuEMIHIIt9tpQgCVIGv6XKiAbW4bjfHOU36cVo9H4?= =?us-ascii?Q?aLXyOCpZXNc8zP5/ukFv4nm8Nu7V22qZaN6ysjnHJIKNJlogXA1N6peJraUi?= =?us-ascii?Q?RIm1pwMyvk71qF1VJDdSYGq4qlB8H1AUCXhxKhZOYw8j6r7yv2R1NAXwptYi?= =?us-ascii?Q?DASojzBfhebh8cTR4hT4fQM2ZvOfrzh6eOuDg8RHEIscDTB4nyhz1SkkqZTs?= =?us-ascii?Q?rwwiryHf04yd72fiXLDmHbm5FuRLusc5jj70+/iEt+/skv2A3lRl6ZdiCFxW?= =?us-ascii?Q?aEADfEEI5SbV+/kyxtzBko790Jwj3cjM+ByMRTJRNb6eTPxuxpSFyASP0gtc?= =?us-ascii?Q?NTzNI8k+uHEgwuecAhI3y/jCZ6fKiQaecQnB5QHT3qThRBNCpJ3OUyTV+gEw?= =?us-ascii?Q?tf7x5R6asAm3uBVC7ahvoJ5dmsUOvsnDY5NxEgZlTpQq0mRmIfYJY1jYnLsB?= =?us-ascii?Q?+QlzN0sJDK4AXfca7GggAKwXg4oOn5EG+TUeE4RSLxkfhiganyT5Usk7F3vi?= =?us-ascii?Q?myKehSpwCu05eV6DWYPrULConNfPODKPb3jOiQfVxmsSSRcrfM89Wbxn4Hek?= =?us-ascii?Q?QzhJHoRxB1uNx5qhRtScdFR5on4jbvkaPb5Jvc4KmwsLZa7KIAu3wa8C5tSD?= =?us-ascii?Q?o2OGeKmyiouNQKLWsZVi+km5Z7/ReUMlo8ctHD6JgyH6S+zyjOmlN3ZBDEbe?= =?us-ascii?Q?51N+Tcji13MFifAws58l3SR1Ro7STlPTS67eTwblyeoFmhgmCJV4wupU+bwT?= =?us-ascii?Q?YAw2Z6yZxGgMy6AyqCCXs+i0tqDaBf5wtXUxffl+XD6183XIZ2qWY+0jU90u?= =?us-ascii?Q?UoGW27vjyofRccJTlgIMcer0BMZEHdmS/zIjI+rhjvRG4euMReROolDKJa0X?= =?us-ascii?Q?JzEMP8WDDP4=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYZPR06MB4461.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(7416014)(1800799024)(376014)(366016)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?x6nDsXL4LoTy4H+pgeoSoGsffTyokPjFPucE9L+SSH0/t4rJfAOOUlfuJrBP?= =?us-ascii?Q?lJuDdNoEFXmkQ+VBak5wdZ2DU6PqEFSZ71t+vTDMY/mFbYyprBZ5Z4RWDUzd?= =?us-ascii?Q?NfFU1JTwmlQeNZjQs/xL8MVOrBDHoj/i5EY8hqPerMM3BFSyzsGEkVlspsQ0?= =?us-ascii?Q?y4E93zXhKeJe3m9Eda4ELMhLxEvxwpzDtjXG4bTe2Dk2T9xEKoWtJ7QvdG5P?= =?us-ascii?Q?q6HhSKkohEiTM5/7ljf5nKdidoHeaS/e6NEV6MjfoV3OvxVPrItlQJNAKzSr?= =?us-ascii?Q?TZtDLep6rBgrOErInbl10E8+zvPWoVwcDHFGqxTjqJnnQa8NVayyWlq1o7fz?= =?us-ascii?Q?HroBR9pC7KOOoQLEeJfxIPyOG8Mr2lIaLsvkmho9mz0vD4ibGfw3pnailZde?= =?us-ascii?Q?xsvauVlquluuMWHZmUjgB37PiN+34HA5POiqKHpb9kjQbvyj7Dyg/Wb24tCv?= =?us-ascii?Q?vpgvm/U7RTyxnHCUpy/kPQoHe2h2tZYNdoc0jPCv2l9H9ZwO+6XjxCE53vE6?= =?us-ascii?Q?M27728UunkYEfUh93dkVa6YVn3glok2z6tA1HamzMbEQhYmwH+D/9BwhFMbt?= =?us-ascii?Q?c3qlS/xnQd2GExx/Mfcv5l3XJ7UsxtlJyseyUByyoiTU6EL4yn7g+QaLeJeo?= =?us-ascii?Q?ISbYJNbe3XkFZAut2M0o9kXovXVGZKt3Hsv+OduzHAUkQL9uUCvbQFGUJx2U?= =?us-ascii?Q?pApf/c0vBJx/6kkOKbudkPraeevA8FbxUuvR1JvgobaIV0cYvqX1TkVJBrZr?= =?us-ascii?Q?zVDMFli9sC3Dkq890SOPOBkfovEX80UefQdThBTQQCwx8rJZFa1Yydg+cNfU?= =?us-ascii?Q?k8pOcc/2obPvn3030EZMNNRsv8ikMG9W+WPqDhWhqUmUzGJRZRCbhtNgoG9s?= =?us-ascii?Q?XKGHuivPNTQIh1mJ02qzAJhIp105I0ItvDXv3ecVpb2mEyOgHQz4o1ZDS0/m?= =?us-ascii?Q?rQSgdnVlaWOFEFMHRxeiK74KYLIM0DppPeegLWGjf1K8AXk5DEJGccij2dj+?= =?us-ascii?Q?ISaAcKtEyNBHV4naiifn15MJ/0tYvbN8mtTrJ81+SM2YMw8PKxdJsAxYuNEj?= =?us-ascii?Q?a7fMd7A5d0sxq2cqN08PqhErclZ+m1fRAV0xNgn26HQ2C0/wbI2Tu+A5Cm6R?= =?us-ascii?Q?jSoezBgIJ7vq41cRydpjsNhnQnAhK8XUK177CSjAevij3d0p7OuUsAiP2zAu?= =?us-ascii?Q?8kCA+zjMQ0bU9BE0Jf2UAiM2HtMBPOzLKUZZbN1kwFuPRo9kN/X6dBjrkrQH?= =?us-ascii?Q?ziBNDPb8sj4W9CNhVeb8zjwZN8qgEM/H2/dlS/5bcafOUk7Yms+MpKHvCgxr?= =?us-ascii?Q?XxgSM6/Qz1XKEn93JqL8qcFKhaCVq5zhxx2Ja52GEH8aZqDF7CUOShXpkRqK?= =?us-ascii?Q?7lQBzI41P1VJIKwvtMA0zArmFZkaa6wo8d0VfPFxBQwsiwxm4Ta++LJOD+YN?= =?us-ascii?Q?V7LbkALzA2uMaxh7mJtwAjc4zTfoVd8kAPR0Rtca5UbKi/dkyy1Atey/e+k2?= =?us-ascii?Q?pEJGDIKqMsRxblnfRvO3l5cRigsjHt2dZy7AoOP+7J17EoqpuZe/SrfeX4oZ?= =?us-ascii?Q?RkjCeCzwYEsM/KiL+XpyAFhSs46vKEJkSjRD31mB?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1dbc1ecf-2852-4624-a0ad-08dcc274236b X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB4461.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 06:32:04.7786 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gNIfOZqtVb9Dsh988jBlM3ai6HkP9QV2GYp3mp+HJze7vpp65212O8Ly5bwkR2mXlB5qhoyf7PGEtS+sqoUZwQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: JH0PR06MB6344 Content-Type: text/plain; charset="utf-8" Use the macro instead of ternary operator. Signed-off-by: Yu Jiaoliang --- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c b/drivers/gpu/drm= /amd/display/dc/dc_dmub_srv.c index b1265124608b..f48f8cf1e232 100644 --- a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +++ b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c @@ -606,7 +606,7 @@ static void populate_subvp_cmd_drr_info(struct dc *dc, max_drr_vblank_us =3D div64_u64((subvp_active_us - prefetch_us - dc->caps.subvp_fw_processing_delay_us - drr_active_us), 2) + drr_active= _us; max_drr_mallregion_us =3D subvp_active_us - prefetch_us - mall_region_us = - dc->caps.subvp_fw_processing_delay_us; - max_drr_supported_us =3D max_drr_vblank_us > max_drr_mallregion_us ? max_= drr_vblank_us : max_drr_mallregion_us; + max_drr_supported_us =3D max(max_drr_vblank_us, max_drr_mallregion_us); max_vtotal_supported =3D div64_u64(((uint64_t)drr_timing->pix_clk_100hz *= 100 * max_drr_supported_us), (((uint64_t)drr_timing->h_total * 1000000))); =20 --=20 2.34.1 From nobody Sun Feb 8 18:18:36 2026 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2050.outbound.protection.outlook.com [40.107.215.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 05554249F9 for ; Thu, 22 Aug 2024 06:32:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.215.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724308366; cv=fail; b=icBj02Z2wdJ6CVgkmeCas8BOaGAiCvJXLAssiv8NUbVnEQ5//Vdrz8qk51Ldku7ILcvtD+bI0kC+McgTjdoyy33vyOzv6G2TpVQFMn2mm48pxAuv8UoA8tqXky/MVA4p/rIeBoov0t8CLoYRlIz/EquNME81h4E+BY9W1O9/eUk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724308366; c=relaxed/simple; bh=bJln1nRUybbHpmcdwsAEIWLDrMCgpSjBDzMlsxPpGm0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=cchSTQ6vmG72YDkHW685tAKGocZwziFZNvZ2/VsXG6oxEK9ey6fp/fOFEzO2ZKdhHN0hxp7ZwMy93nzCnhg2SWZMwQagp3Wr2KX3YwtbBbTJUOQydh1lJArLrJbJBW60RWS0eXCoH6wl6Tz72P00lRUlJzKhjlNmIpKu6ihyqLw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=gXOu0ClY; arc=fail smtp.client-ip=40.107.215.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="gXOu0ClY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KZuNP9y13tuy7cVxm97MY6jzqEAmflPSFKTk0t8s0eDjVwPGr92BqndjQV2o2v/kAycm/GaBEzZeK7ejavUobbZpbtiMAbzkIfNx6rJ6p9O9sZTBngsV9IJj7WiCwdPS40L4K2DRBKfIuB3JJkX27R+q4V4GW5BfQgc5uPYVlKE+ubWIYqjpgGi8z5EQ5YzcV8pGrwydLpXWY6RWnVSi5Z4k2ybgo4Z9BkT3hgxMyfwmXf7CtSt3ELUZ9ZyDy+wZhoBBnwn13fJ80F0+uDR0rs75D+VmBveiWP9vN0hdPygoJvM3rUy4RHW80buRU0UuoYN+tqkxSHFznd3lirg/iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=WfXf3Thi8Fu04hOU5bFN2rxfQbx13dEfeKLe0Ovid+0=; b=qWNaH8XxfCvlIZoe0I2FGHfumtFmC+n+N7JfLAySaM1DDMEWX9njgYupYqI2AtZZvTrPQEbTvt9JLCfn0MayjMWWhRS8cDX+FbIBy4N7k+KKBNBo4vvNSLYxY2d/Biv8PjvcfyeDrIc0qMDoFcHXLL6M/imiRzKN+A47dqgcHfMsq+dnZcWwdpDueXj1nKWE3YqK2HI/XEembgA2AOmTrj/ug/45cq6pcdmqwogXZcUSevj++Sl5PmhMfOU3/4KoZrW2NRqKXajQZmtxIwVjUJjiSfMv1acxS74HVSyYKENkZfQd5FwTCZJGzI9zxLokthj0Q4UPsduSC9IFIeBHqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WfXf3Thi8Fu04hOU5bFN2rxfQbx13dEfeKLe0Ovid+0=; b=gXOu0ClY7j4MIa5idbiUl+aKuR/IbCc/gTnC2rMJFwyPhNw2dp9wY1tDH3ncK9g70RCyI/ZJh6aiC22hQ9d1kf60HS5Cmqzim804Vo9z9Utbo+qoLdhrbSikWqpk+0S8+i0ijpQ459/5C0ZrA1td6dzin/XnHjpg9rojZuhD27DE9PgiS8Ob3eQfvzQYpjHEkTmMb8mOvJ65RziktuJ8tWlg2rjNzO6WXbc050Pt488a6b+b3W4xlytt21R4N1z3N5yxLxPw4SlbjLFLsWtN3YQPI88UFTirLpESK+Li7f+FJFfd+MaellzJS0J/c19BRpQ9nYrUMr8bK2YD+CGQXA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from TYZPR06MB4461.apcprd06.prod.outlook.com (2603:1096:400:82::8) by JH0PR06MB6344.apcprd06.prod.outlook.com (2603:1096:990:17::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21; Thu, 22 Aug 2024 06:32:41 +0000 Received: from TYZPR06MB4461.apcprd06.prod.outlook.com ([fe80::9c62:d1f5:ede3:1b70]) by TYZPR06MB4461.apcprd06.prod.outlook.com ([fe80::9c62:d1f5:ede3:1b70%7]) with mapi id 15.20.7897.014; Thu, 22 Aug 2024 06:32:41 +0000 From: Yu Jiaoliang To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , Xinhui Pan , David Airlie , Daniel Vetter , Hamza Mahfooz , Alex Hung , Alvin Lee , Dillon Varone , Hersen Wu , Samson Tam , Jerry Zuo , Wenjing Liu , Aurabindo Pillai , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: opensource.kernel@vivo.com Subject: [PATCH v1 5/6] drm/amd/display: Use max/min macro Date: Thu, 22 Aug 2024 14:29:31 +0800 Message-Id: <20240822062947.1318340-6-yujiaoliang@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240822062947.1318340-1-yujiaoliang@vivo.com> References: <20240822062947.1318340-1-yujiaoliang@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0040.apcprd02.prod.outlook.com (2603:1096:4:1f6::7) To TYZPR06MB4461.apcprd06.prod.outlook.com (2603:1096:400:82::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYZPR06MB4461:EE_|JH0PR06MB6344:EE_ X-MS-Office365-Filtering-Correlation-Id: 77a5c5b8-49bd-4c96-d2a2-08dcc274396f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|7416014|1800799024|376014|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Z3lIDAgZd1kLUOil1pvbHA558VzVN13Euv+RtTRzaulPc8f1ymWeMTjJfnvh?= =?us-ascii?Q?8d5friHdRuFGIBaVmPhvAMy8jCNAB+LximYdb9PjFkc544JY+2FWWyBZTJk+?= =?us-ascii?Q?tigGjELd2kZbQVyd2NlP8uw+5vDALFb4YibNOjHxtOV/5wTE133m99vG0C/k?= =?us-ascii?Q?1jZyLiRuIYfEsE8gRS/H1bcT6QPEPsgow/wTd7MzaWve/X5GKcimxs2FEPID?= =?us-ascii?Q?5d7+AkxAMZsxfaAjxaKIFo+oOV9VxNnFJ9nE2PRNDbUaBY9Up4JlaUq1RJIn?= =?us-ascii?Q?UOpzD2bB8YeF35EC4opi+DOG4htpoqU3Ah7IMvM/1yerWyR8uHj2gAwVOMR0?= =?us-ascii?Q?B5TdbFOVh9Rz0EWjVTVLAsqgz/C/urDJRILsBQMm3kZ2udBiNyhuDOL7l4VD?= =?us-ascii?Q?4MbuQ9ClxPO7aNodjs+L2iyExEmx/AjPGbHvWK4eY5K67aYLAS/NUBg9LqdL?= =?us-ascii?Q?mHBrD6mrNUuDl+zvVF/p2PVXVA8+EOdp8yd8nHt5XRw6dfsIipoWTMdZpOAQ?= =?us-ascii?Q?E6Ki6xh1IRZ2iS4FE7buPhOYMexHYSpTgNjmbRevfRKlpw2wfsKyCc6y8EVc?= =?us-ascii?Q?sU5LWx9WI7XACLF13ickB3lj158ZKod6aKcaEHzV2Ok6tjiN5aisZm+9RgMd?= =?us-ascii?Q?FmxZsel3gvgPSNA9jsJmhuSfMJI+d6jXQprkay/ZJslVMIaUyQ9YcyPH4hvy?= =?us-ascii?Q?ZYNe8pna45xrMOourDa2CSpG2Jl1kAslzUexeVupzDQW8jUkhD39TRIbBplt?= =?us-ascii?Q?7F4ChIizoYZQj1wHQ82vF+lUolxybsQiFB6/h/HF6JoAwb1FoEUhKObqpRLA?= =?us-ascii?Q?+NHAFSXnzeMEKlBezBrshe2EmXF0UyisbJqWWHfBHWHCxbfjkU4Rdg8FdzQM?= =?us-ascii?Q?SHrE0UDvmtI+Fb6iNEi8xPDdGdZFwdZ5IRCccI5n4YEyN9QlhVDhCn/QVmV+?= =?us-ascii?Q?hztZP+4yV02rOv7MwHDT1V7F63CO76Fct2Xi4IGLK7EGR5NVwVTblMlj9ESE?= =?us-ascii?Q?QmY7uIFECUg3rE1VBv6g9/Iwdsr9if6Ln3J9Xk0BwoZY5Un+JS9tUWkdnvtQ?= =?us-ascii?Q?6T4mJYI73MB9Fy28gTxpLoHR7sCWXE5bJ/CK7qZocS6wApwkDHoaBIQ7ivk+?= =?us-ascii?Q?jHFoLsd/aZXEvN3hgbxCakx88OtFCnfAjBBLCOcC4dDDFjcqW1r7HG2wAiAB?= =?us-ascii?Q?OH/bqO+ByJtQYU67o+MlVtccRH8noO95IVf30wWTAutqi4VmfPvMVuSDUS/H?= =?us-ascii?Q?Vmhe9G20HAztE0LdN3ao24ryhrT0f8TnouP/iTlGHxDfyyA4yheTuU4q8igb?= =?us-ascii?Q?7efsTKjXbyk10crlsD67kGc+QsytrE/Jv9/20rHG79uFnZYQAuZnYpjQb5y/?= =?us-ascii?Q?UnDrPql44QiFKc09+FBi4IO2aerRIqGvtzmQRVMXGSTwCJTK2h+bPNv+l1wa?= =?us-ascii?Q?Zt8ZqUZA0cY=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYZPR06MB4461.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(7416014)(1800799024)(376014)(366016)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fl8IbiRPxQ5aEl3zeUT6XsmlQp38Nx1vdFgX4BHuVHPBFIQ4KxQi91N4piaE?= =?us-ascii?Q?skd3UX7WyvamoY/X9a0U/p5tZ80giR1+Y6i0l1Blf3WQwIIkxdroaS3zB9Jl?= =?us-ascii?Q?8NPglo0P6qakMtB2ZXtXSqlIWZQQM4EuRNxWNis71SJC3NaqLFeTtFqt8EeL?= =?us-ascii?Q?8lkv+Xri2LVPCwiq69l7tZ1+Luy1IZ8D/JTdRpiHewup4g7sfa9doEYyG0P7?= =?us-ascii?Q?8BbQOEWVtP3DdvAMdrjejV9OfLwStA69b+EqZipk2uww++UM0f0b4FKcpB81?= =?us-ascii?Q?QmuMZ+qJJ7yfBi2h5+qeok1iauo5uf1kgndzvHbKMK6+FDlpuFf6+5O4+xs1?= =?us-ascii?Q?KwkqX1yv0HNHiKeAdTj62lXTTAyGGmwAro0ijZA/fdoSkeJr3HewodwbfmlY?= =?us-ascii?Q?C3QjYxnFFGP/JDgnrYX+5cRRmAqy6nAWvBv/uPI5fHBs1nui1LeTYqE06zko?= =?us-ascii?Q?9sTsXyKsMzlfPtmMulPxPVZIbkP7Z08Fjr8QAYBC5/+aFOu7cUEnQ0rOqul2?= =?us-ascii?Q?jR4klrL8mbC/ccMUHXyP0yQWw2jLibMjZofVbi1LvVDfoFiptBZeTYcHMVHN?= =?us-ascii?Q?TQeQT+YA7BqaTCi6sqamLtfxictb0JBKJEDmtdCbMqCy9CjabBnlpW5Nb4Ar?= =?us-ascii?Q?iq3yf2YAoz+nPdZ7NzLDwnHIB16FgiW5BzXhxoeq5Mt1a6Z6+hN38N1mppPI?= =?us-ascii?Q?J/6YiBfqleEqqS6dw/tEl6UVX/luTJ0ioobfQexkArTlDG/smag7zMw6RJLM?= =?us-ascii?Q?m84E7FUSFPzMm1ssLTzE8t79RCZ850i9+ojFYWuXJ3FYEIy7QM1Hf1ezYi5b?= =?us-ascii?Q?KqwemxBXyBTQ4tyrqPL2O9PvNAPN4uZiGtP3ykgGOepS5eCFLNedLetuBFJ1?= =?us-ascii?Q?b/n9Fr8+JxWlOfn6Hp9S9D4AURRdu29F1/kU86GHXh3kk7YIgjDjhWBCrKBq?= =?us-ascii?Q?rJKZdzZJX/Tz8Dg5e5R5rY51U+tmPKDpEWKqKNgUYhFWMXPQ5XmwhloQSjdK?= =?us-ascii?Q?Y5CRJpJxS40jmfn+ZjPC2HIsuZ6yX6MAQIJcz0dwrYmRhXqJNCMA7bE1pHO7?= =?us-ascii?Q?i7h7p9EDlf9FDociqFVuJwp7pbjFk9O/SA6WZBf37KhzP+5VeCvkYEV6nl0s?= =?us-ascii?Q?KNvVJwmKMlGanP+ZE+kn6/8vB8PvxKbvwLsOX/JsccnggcVx6VDBWDpoaepQ?= =?us-ascii?Q?xjaqkhJEhhc0ZghBYKIaXBnUX4ZiSsCd6TrlGOTFUCCXwTOS/knDksT1cOdu?= =?us-ascii?Q?RA8lKtIKkMCpvUczfGBz3aKvu3PApuEkm82R9PkbpvNe1UUvg2aPd3Ko/qnn?= =?us-ascii?Q?KU5PWZ+BYsNyU4NtKB3ZAXJ7Lygr972FhX5xktAswzkMFBcIiBGoW0lSQUqV?= =?us-ascii?Q?pWBhTFOzQxTqWoMZB1aLA9tFgzN+uwwUkzEOEWYNpjkA1HHB85EDe4efmB+S?= =?us-ascii?Q?FoJAzryFTWYsmSadY0o3B6hQCdPXiXiQToARUTC+OGvzQHJzEP+yEQ8Z2Dke?= =?us-ascii?Q?tLca24ah2av9B5BgRTHCWpefN0qZppO1hLeL2NGUnpY8hfAlpW0UdBTNWMhp?= =?us-ascii?Q?biiibCFZNQvai3K8WqySbNsO7QbzEcqsRrqDSTJy?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77a5c5b8-49bd-4c96-d2a2-08dcc274396f X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB4461.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 06:32:41.7272 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4L/NP5YwrkDg6AVwHM59fW/OhAum5Eg99e+vj6RGlYR65PZv6orbnZcQHzHNu6DWUuqHfXqC74Ng7oVcculExA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: JH0PR06MB6344 Content-Type: text/plain; charset="utf-8" Use the macro instead of ternary operator. Signed-off-by: Yu Jiaoliang --- drivers/gpu/drm/amd/display/dc/spl/dc_spl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/spl/dc_spl.c b/drivers/gpu/drm/= amd/display/dc/spl/dc_spl.c index 9eccdb38bed4..d5fa6e79fdff 100644 --- a/drivers/gpu/drm/amd/display/dc/spl/dc_spl.c +++ b/drivers/gpu/drm/amd/display/dc/spl/dc_spl.c @@ -17,9 +17,9 @@ static struct spl_rect intersect_rec(const struct spl_rec= t *r0, const struct spl int r0_y_end =3D r0->y + r0->height; int r1_y_end =3D r1->y + r1->height; =20 - rec.x =3D r0->x > r1->x ? r0->x : r1->x; + rec.x =3D max(r0->x, r1->x); rec.width =3D r0_x_end > r1_x_end ? r1_x_end - rec.x : r0_x_end - rec.x; - rec.y =3D r0->y > r1->y ? r0->y : r1->y; + rec.y =3D max(r0->y, r1->y); rec.height =3D r0_y_end > r1_y_end ? r1_y_end - rec.y : r0_y_end - rec.y; =20 /* in case that there is no intersection */ --=20 2.34.1 From nobody Sun Feb 8 18:18:36 2026 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2053.outbound.protection.outlook.com [40.107.215.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F2ACF139D09 for ; Thu, 22 Aug 2024 06:33:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.215.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724308424; cv=fail; b=hD3K3Nxb4nWUntEqtdr4Wx/9noGhoaDtZ9XDmnuew8hwVFDLsCWOHF5l9N1q7pySKmN8tXc+ofCHtdweTOoaKK5XdA0QbfFj9/3LkSoFzrwcfJbmL60zkpZcKInTs1ln99D6MijxNLQuWJpmtTVlXIjZAPA11ZfRWrNB/ynUPY4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724308424; c=relaxed/simple; bh=h4Cl3b/c31t0v0WLutCjDxjfnnpeE40lYojRd4SGiRk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=XkKzDhivJTfJDQ/db0O5fJcLPYsHSeTUdGiD5/hI0k//mj7z+o4ceORdo6f21UC9zmfaNdW++GUl5G2qcDLfpS/lg2cuh4LszUU/a3bhGtXacNMyJlZF15IryeCu/EcF6uZqvNrGjeJoMtkiJgPTO4kggDmd1IGN6Luo7WiRTQo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=PjEO3pv2; arc=fail smtp.client-ip=40.107.215.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="PjEO3pv2" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mhydPUqTXtWKBKsHC48XTbizSwLETDEWuIIBu6k1/u1YecVvm1CzwSgBLt6UydgdVmnjHwkYhVNCwguiGWwoJ/pDqiKPsuHXTqCAU2VGy3TTHuS0LwX62Gnf0clCE3booNpwGKFHGld6zZYt0Ajyb8cs9RUol3JIaPj4/hmRJ7PAWKsDJiOHhm+tMSmQa4Gb4XqH1PU1qRGHznbm4Zj3bH9YZ8wfxs74dPI1uFpHXxbNpu8FwUy5J4VIsK3GjjIObFNHX7Z/bE0T1Uaz4P8JjpgafIzLROP4dhHX7iqd0vM/aCJ/MhizxVkhuzyiTcTrzuCLM2K8VWcH7XQ+DhssFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=6Nf4qHOg4Wy94B4bQcsuL4rSf5VRXrwo3ygBKI6+/bM=; b=cH2f3YPlAeLukcXZzrKdXgNVccBi/NhBJtHTBrHoefF+mElLpStTF+bSZAb8JWv/5Vu7zOgs5RxX8BZQQ1LE1pimajW38g7MVpQFwBDPJMR9bLejEmHx/41fB2mya+bOxkb6T0pFLBEWamDjnStEsWuoguiRxJCjsUqpjOySLcEpehZLCbUYr/MDNTjc+Psmq7jQOBLHtDvmTUefHGxniHPl+ACVxnl/jWABl9XPeLOtKBrQ/awO7SQbs8u8EO8OpxQVKeWjZQb0LKlmQJtA73U5udjaikewPueoR39X4/2oSbfuYYOsJR2wzybm2SDn96w9mC/UeDHH1apx2ABQYA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6Nf4qHOg4Wy94B4bQcsuL4rSf5VRXrwo3ygBKI6+/bM=; b=PjEO3pv2oR/S+PLWmRo0vScE1OWfK8PGa8AoKr6rgGNP7ij0F0GL+rMLW7OLTrwiSVXS3A4Oo8FkWptLxPggioFCOwKsNOJMJzA7TXC/JMFpPrbVj8NEhMJMteFDuPiiqBWfAuxtSRInm7qKJAVxSglaexmgujcOT2f5ERD36aL4N2iyrBfnxspfM0yx7L/Jb9PwY6eQ0rTDJga84QtEVcETaT+GlHZuOqk9ozXhHFcq3A6Kux7ePP3KGelPN2xkhG+mVRWlFx4P3H1YHFPzR90ZBDKV5MpzPyO7wT03F4BL73JoKuFxJ3XPBe7YQoloaQ60FS13Ay4Qqz+3RwreKQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from TYZPR06MB4461.apcprd06.prod.outlook.com (2603:1096:400:82::8) by JH0PR06MB6344.apcprd06.prod.outlook.com (2603:1096:990:17::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21; Thu, 22 Aug 2024 06:33:37 +0000 Received: from TYZPR06MB4461.apcprd06.prod.outlook.com ([fe80::9c62:d1f5:ede3:1b70]) by TYZPR06MB4461.apcprd06.prod.outlook.com ([fe80::9c62:d1f5:ede3:1b70%7]) with mapi id 15.20.7897.014; Thu, 22 Aug 2024 06:33:37 +0000 From: Yu Jiaoliang To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , Xinhui Pan , David Airlie , Daniel Vetter , Alex Hung , Hamza Mahfooz , Alvin Lee , Hersen Wu , Dillon Varone , Aurabindo Pillai , Krunoslav Kovac , Marcelo Mendes Spessoto Junior , Muhammad Ansari , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: opensource.kernel@vivo.com Subject: [PATCH v1 6/6] drm/amd/display: Use max/min macro Date: Thu, 22 Aug 2024 14:29:32 +0800 Message-Id: <20240822062947.1318340-7-yujiaoliang@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240822062947.1318340-1-yujiaoliang@vivo.com> References: <20240822062947.1318340-1-yujiaoliang@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0040.apcprd02.prod.outlook.com (2603:1096:4:1f6::7) To TYZPR06MB4461.apcprd06.prod.outlook.com (2603:1096:400:82::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYZPR06MB4461:EE_|JH0PR06MB6344:EE_ X-MS-Office365-Filtering-Correlation-Id: 2af0cf4c-f12f-4cb6-962a-08dcc2745ae1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|7416014|1800799024|376014|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?4W16E6UpVblwdo9GArypANUqazeLf2MIOQ+68FB6QqE6VwOxw3s4kK0vRr5m?= =?us-ascii?Q?pfVQ5I6oOCMLeVk7NsOQ84ALaLXjAlSxerQGUYuZzUaQ9nW6Z+bG11f/JdzX?= =?us-ascii?Q?UCu+hOaDUtfMUmVdmkTn2k0yYV+i2OUsoMLvIZ4bVZM4XgnmkOFKMaZrC4BU?= =?us-ascii?Q?WeCEGWeSb8I0CZINyuCaxWcaAapso22bMcTYT4hGNnsCSUpJKtDAP6sK6txD?= =?us-ascii?Q?lDMubDQHRYmKRCxzWQ5Ugj+MVN2Zdvf4AoP1r1GcY/ZIuj4dRoyv2/+Eb4OP?= =?us-ascii?Q?L401TfaPu4Wud0CtMD3h4nRzpvO3fSnry4oJAK73wXRL9xK8Qi8MEjmSuP5p?= =?us-ascii?Q?kdbyLWx7LKGEjf03QvoVq6r77LCfMAHGGOLReb7C0tMzFJ/1+4o2Oz4R2oaT?= =?us-ascii?Q?TD9ibP0lHelQXFhgqzItjXD5nyxOHEIpzc72MEfh4JBW4RqrIZOp4osN01dT?= =?us-ascii?Q?xOnNFwSEsWO2s1ELJgXyCRe6wskEJBJmWGL602Q7GXKUFUw9CYjDVXoS5q/J?= =?us-ascii?Q?hBm76OB8x7HEbICJRafFESijK7YNwm7xD7+EjlgPUsm/I00cMqDDQzphnr21?= =?us-ascii?Q?94HW6uy8/DLGgofg9IMCjp+fwnxBNs1nzZUf52V9i/7osFZiHlX8DUrfVXKs?= =?us-ascii?Q?TgqN9hz8D8wunktTEqRqorWDBDuaCeLGQHabD0cNRAqg8eM6g6E8XGjCCGJk?= =?us-ascii?Q?EenwzN0nKqjttYpVQg+Zt+dGe2xT1BhMOGVo8dtXefo1IlsoxI0syxmJ4UJM?= =?us-ascii?Q?K04YkzFmzy1XBrYmBubCsAYU5vYolPPcVe7MO0t7gD7Lrd6BSuCKrA0K5fve?= =?us-ascii?Q?L50eZa6NeZufyUeGGWeORoGPn/mQICrWjJo4BTvT51LLf+eHms+VD2WRrvnM?= =?us-ascii?Q?ZqdKyko0vOQCqDlaMIgOG7YZX37hGJRuh6S6SFq6clqV6f51w64ijnJxGzmU?= =?us-ascii?Q?xx8D2spazCbisrLJMJFsvLmbmhjKc2FqNx0OjwlD+wZY+sEOBOIeWAEFrMtA?= =?us-ascii?Q?30IojyaRBnAMqCu12utxotypAqLJz9DaguSqPuRJNGsfi383jWCoW0P6jjFS?= =?us-ascii?Q?+rD1y8cQtdXJH7QnZwL9x4kPaYmSC0T+B8C+hrZE8OnFEx3i4nVynTYKABTL?= =?us-ascii?Q?gPBDFJRwRb7GeF3r0SmktPUgLv+E/6EZfrRjP0sxE5OdjM/kx+ngzVqSCBpZ?= =?us-ascii?Q?lmt6dZ7UZN/x6epafOUB6A0+zPqEI99cO7VPpp61kvXxB3WMD3Q4Z9HOPufu?= =?us-ascii?Q?2Xd2oEGdd+XToRtyUZ+omyFIgJ6ci4XxwdNAIGVX3hQ9sB5KpRgzxEXtIZ/7?= =?us-ascii?Q?2R90TDKPsABea0o+ArjZnbIiSeKL2cwGS4Aad9CL7+WMAK/Bo5OF4tkJJ8fd?= =?us-ascii?Q?Bye3yjxRtBnLbq48t7EMFgQuTAAUQs/OkY1RxkgNxcJiJNX5rghpggFuNqha?= =?us-ascii?Q?qUtpo8tICfA=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYZPR06MB4461.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(7416014)(1800799024)(376014)(366016)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?l+k5A/zjVJglLaikg/BaflaoCswhou4nWKEgZizY1LNncU2JAzeLnspUJdqx?= =?us-ascii?Q?Bw5JRqwtZeNejj3thQOZA3Ig5jE6CO/XCIUimyfz8Nm7bodAhyz7foymLaJS?= =?us-ascii?Q?bwJJW9dPTyrQOD5vkiESLKGe6qER9LyoEjZftHnBeo5ZfS7C5H1l8ERDac69?= =?us-ascii?Q?xRir/NFe/8oz09E/p7LHQOB+lKBWNK4k/UNPgBrvXQZeVZHNV4A3xtWyPLid?= =?us-ascii?Q?CQHefdH9u9I87nH8SIhSICdxSr/Lkk+E8nQu+QWOWUGoxuowwc6JrYxdzk92?= =?us-ascii?Q?rrz9Y6zlV4wgC9E6wHhTl/D9s1F2BBen7H0Xr7ZhURq9v7dTsRezJHyl8bI4?= =?us-ascii?Q?ekAffHGENu5sNEbnkymJ2VXYx8Urchx5qNOIQyS03rEMEiEQ2JsQoZ/Wgr01?= =?us-ascii?Q?m5l6k4IzsacH5SIgNuQw3gYrF3Px6B6smrjcHHf8a6M1/2LYO8GHqKX0K9/d?= =?us-ascii?Q?5LEO7/GNSlEL9JOYH7J9aVMxAkjB2QcecupOKJXa1LncGjilOzmGCnTsI02M?= =?us-ascii?Q?u47wbGhZzZ15VOVo3HUx//RxFWRk9Rl/DrmQdQhSBkgRKv4/XqgW1VfYMLUz?= =?us-ascii?Q?KFOksEu8PP+vbXHCrrYFVfz+28HXCj5IXZq8VO7+VCdz7I5MsNmK1PUjAd/b?= =?us-ascii?Q?55VAyKxpWNhMtiTcZ8lnDzPKuplo9DqhsZ80rdTS/Fz79DjKkvA5rp4kVIMi?= =?us-ascii?Q?D57t+rk2noqkltavP2VaimuTpHUILdpTbXHMtEi5HKW0psjdwGf4ckK3GDrb?= =?us-ascii?Q?W8nKYzOqBGY36mSzYdGtujWT43NhmauNY/C8AyZubsAEHuCk+MivsN0iFqa7?= =?us-ascii?Q?0J2faep4RXX7UNHex29/MdUkFoIlKKvjnE91w/swzcxz27io1mwL3Ki1Vf5s?= =?us-ascii?Q?fC331qIUXIsj7i18RQACQfK2bYOUVGLBjqPl17eRi4rFOKgqjBPnccCZbEky?= =?us-ascii?Q?Kd0CVcyK/oNa1AB3t3b7Nb9sHSsYo5c5DAZb5k8jI6Bc8qOpPvWeP6Tiq/qk?= =?us-ascii?Q?gU1TwQsWHTj/uLOc4dlslLlhIGOkAaUxrh/cvOgJLJioZ39NRHNLb4NYmQ/K?= =?us-ascii?Q?N8yK2toHrhdtlLghZ8VOL9CUOg8jdoPNgfS3+4hoTl5rAwdDrHDS2+aIYlHO?= =?us-ascii?Q?FO4rUVajuJ03MDU2QJgWFZ1yR+NJcIlMAQQDTZrG9bAnG1PnptVwY7SXFese?= =?us-ascii?Q?GQdHmk0rUxCheOv1S5h48Sjqhaz839cpO5aMCzH+wO1dpahQP8jZGGmZL5W4?= =?us-ascii?Q?O6xNKyiCnbqZaDvj+rRvooGy4z8O2d2jFell+GKqgWrYU48PYiLI9jLZpXWL?= =?us-ascii?Q?YcOXyHFJl2V1mmt1tKVtxc7khMTpI8ZKdvZfFihzZpKN2YtyYW7cloEucWg0?= =?us-ascii?Q?84332n4XgY8g/U64+P4DPJChx4zCOAFC961JwkR5+kEVwcPKTIKeaM41FAVJ?= =?us-ascii?Q?EGeQfMtP5cyDnxhiPSFHnLuwmvqoO7KLaBo0AHsdBuSHhlnaKUg/RkT7Lvk+?= =?us-ascii?Q?DDRJWFZzEJfNYlsiW6kNhn2xIwoC3HtU1f8cvZlRaouI9ZGa8OiehzB4nkGz?= =?us-ascii?Q?Kr39wGz4rtoUoO7I0l4+pZI7nKXd/EzKQ15lYnb5?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2af0cf4c-f12f-4cb6-962a-08dcc2745ae1 X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB4461.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 06:33:37.8211 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1cEE1oyLWatkKE2unKjnt4GuVjH5dYzsbbPpqxwRof8YikDLTaclD96KWD/UazaqbvqBp4bV1h0dEyaOhO4S2g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: JH0PR06MB6344 Content-Type: text/plain; charset="utf-8" Use the macro instead of ternary operator. Signed-off-by: Yu Jiaoliang --- drivers/gpu/drm/amd/display/modules/freesync/freesync.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c b/driv= ers/gpu/drm/amd/display/modules/freesync/freesync.c index a40e6590215a..33b9b87d8d3a 100644 --- a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c +++ b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c @@ -1005,8 +1005,8 @@ void mod_freesync_build_vrr_params(struct mod_freesyn= c *mod_freesync, (stream->timing.h_total * (long long)stream->ctx->dc->caps.max_v_total)= ); } /* Limit minimum refresh rate to what can be supported by hardware */ - min_refresh_in_uhz =3D min_hardware_refresh_in_uhz > in_config->min_refre= sh_in_uhz ? - min_hardware_refresh_in_uhz : in_config->min_refresh_in_uhz; + min_refresh_in_uhz =3D + max(min_hardware_refresh_in_uhz, in_config->min_refresh_in_uhz); max_refresh_in_uhz =3D in_config->max_refresh_in_uhz; =20 /* Full range may be larger than current video timing, so cap at nominal = */ --=20 2.34.1