Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Lu Hongfei <luhongfei@vivo.com>
To:     Harry Wentland <harry.wentland@amd.com>,
        Leo Li <sunpeng.li@amd.com>,
        Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>,
        Alex Deucher <alexander.deucher@amd.com>,
        =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>,
        "Pan, Xinhui" <Xinhui.Pan@amd.com>,
        David Airlie <airlied@gmail.com>,
        Daniel Vetter <daniel@ffwll.ch>, Jun Lei <jun.lei@amd.com>,
        Alvin Lee <Alvin.Lee2@amd.com>,
        Nevenko Stupar <Nevenko.Stupar@amd.com>,
        Dillon Varone <Dillon.Varone@amd.com>,
        George Shen <george.shen@amd.com>,
        Randy Dunlap <rdunlap@infradead.org>,
        amd-gfx@lists.freedesktop.org (open list:AMD DISPLAY CORE),
        dri-devel@lists.freedesktop.org (open list:DRM DRIVERS),
        linux-kernel@vger.kernel.org (open list)
Cc:     opensource.kernel@vivo.com, luhongfei@vivo.com
Subject: [PATCH] gpu: Replace the ternary conditional operator with max()
Date:   Tue, 30 May 2023 10:37:26 +0800
Message-Id: <20230530023731.13534-1-luhongfei@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1E8KOIfQbUG6RvcYLJjc9oy0wSuvqiE4kOLu5FrCicXYxWu8jfNYSGa1eoq+?=
 =?us-ascii?Q?LM7b7fqSjqVv3vV1wTR2Rd74XIGhOSXYmS5riCrn2HJU+XIJNcY1gGv5/v5x?=
 =?us-ascii?Q?EmLEIJAS36XanZQBrd/7CC3C19uSsCBNyz24fjXnDPkovfsc7EZ8YsXFibwf?=
 =?us-ascii?Q?xcq3mbBWCAfeXncGFodhZpae9RW4U9vUos/OGwR3YZdbJ/eD032mLEcPRQeC?=
 =?us-ascii?Q?eB9mpAXwolzLUkuvbJ2gwfpt+OYnmKN3bVUDeUT95DaHmsFjWQSNGUt37xPl?=
 =?us-ascii?Q?iarzj3AYl1Nl7vIuOmTcwFQpcIlOTFOExPQeqiSCLViM6hTI1ENLx8117d7L?=
 =?us-ascii?Q?6jqradbTiKCut/2X16i09DUEMIpVZnuqy7tMvMfHU9BvqSmh+iS7TDxConrt?=
 =?us-ascii?Q?/pFMUTt9mmu3uB/g/7NvVBzEIj1q3rjxFzOZfhHSvpkHD6qmjFskDps+siYB?=
 =?us-ascii?Q?JhFi+nDDuPXxCSVAYE1zDrkyEzG4LYYlQaRgaoai3hzinEjeEf79VWpdrupz?=
 =?us-ascii?Q?zZqzhll+AKIPyTqSwnvnFqk2IQULonqJyFlXzODDq2TbD6LJ2txVLat+sLO3?=
 =?us-ascii?Q?BIDmc+KkqXtqklsrSxM0qeQkhshuelv3EyD+oQC+muyl2k7lvzYwJ9xcvOJp?=
 =?us-ascii?Q?WRmjgIoIacG/VCW8CCknyaPOfHtTamAd/uEX37TkcZdyMD0SAQYgf15lTeqT?=
 =?us-ascii?Q?d3P8oAni9ZOvjMFxk/ZMKAm1Iy57kDwBsK8QH8h3crGyNS0GKi5TqeJ5MkEe?=
 =?us-ascii?Q?6vl+nLlvWWwvOTstp8U5fkFC/jYV50Jh0Au6AAPKq5gwcqwWDQe2oe06vfWO?=
 =?us-ascii?Q?Jz/0ZtevDfONsZoYroJUye8deCqmU9owwU5bBWwxmj/zl0qO9sx3qPnzyRq4?=
 =?us-ascii?Q?A0FO8loKq/wIS1zXOtHEo217h3fIprEQ9xGVAfxgZ9H6YPaZzMqxKwhnE426?=
 =?us-ascii?Q?subP1zcIkBuk4205DYHHkirKUKiETGo2XcP9o0CGvK+sM/NgqMS9TtNjK2yS?=
 =?us-ascii?Q?XqxgL984wR94VUd80o53aZWAk0Rl/TlisRBTh8SgVEsGEkyLfrx8v/PyDJ3+?=
 =?us-ascii?Q?vZxpgthsdLC6Pj6k6WZG9D4DOft9ZltB/eMFyLE9LVy6E3Ruvt0mIlLw6ITu?=
 =?us-ascii?Q?a5NthlU+4Lm7lMdAhxG4o/Ya8jTCjv4sGc6xsyZpJjCS23Y+omyQxro5YrHE?=
 =?us-ascii?Q?P8xql8UBw0BVIxSyNSPRbBsQiT2/pnPmJB1ICT6jhCLhbvVZA/RlMaD4giZP?=
 =?us-ascii?Q?efGATyfP4G0af49voZg2+6nn6+lRK/1liYqWxt8Nw+CK1CZ5aK4gxk+HgwMI?=
 =?us-ascii?Q?mCtec8YyAc5vld2+nP1DX+eRWJiXV/yr+16aQm0D+3u45Q9UBYuMOlKkYaco?=
 =?us-ascii?Q?fCEtPwlpBxmJn5VQaIHf6y1rtMCEcjR94W1O2jCk6GVzQr45wuxXxGmDNjkU?=
 =?us-ascii?Q?BLOO4RUlXiYJKCQWq3Ae95I/qQ0WpQpS9ktPwajmRlVSmMP6aljFAfg1t7iL?=
 =?us-ascii?Q?PCR5LtgTCagSoeU7WcXlk83D0q8P7IEgjqhaeIwdpZIx73GMBw1UP3hGqaMx?=
 =?us-ascii?Q?cJnmC5bAlFZEmghEScF7vSfEL7v7U7d9DbKXVJks?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f261455f-d6e5-4f57-5b07-08db60b6d8a0
X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB6697.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2023 02:37:43.9488
 (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: o8NZdCJdJ5kEOocRWQgqzNjK/U4E3MTvhlaHzkROvoY4KhW3tu+uL3lzdTvMURT4GxLNPIx7a9+eA8J5LW6/WA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB4433
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

It would be better to replace the traditional ternary conditional
operator with max()

Signed-off-by: Lu Hongfei <luhongfei@vivo.com>
---
 drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c

diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c b/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c
index 47beb4ea779d..bbc1f2011e99
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c
@@ -915,7 +915,7 @@ static bool subvp_drr_schedulable(struct dc *dc, struct dc_state *context, struc
 	stretched_drr_us = drr_frame_us + mall_region_us + SUBVP_DRR_MARGIN_US;
 	drr_stretched_vblank_us = (drr_timing->v_total - drr_timing->v_addressable) * drr_timing->h_total /
 			(double)(drr_timing->pix_clk_100hz * 100) * 1000000 + (stretched_drr_us - drr_frame_us);
-	max_vblank_mallregion = drr_stretched_vblank_us > mall_region_us ? drr_stretched_vblank_us : mall_region_us;
+	max_vblank_mallregion = max(drr_stretched_vblank_us, mall_region_us);
 
 	/* We consider SubVP + DRR schedulable if the stretched frame duration of the DRR display (i.e. the
 	 * highest refresh rate + margin that can support UCLK P-State switch) passes the static analysis
@@ -1008,7 +1008,7 @@ static bool subvp_vblank_schedulable(struct dc *dc, struct dc_state *context)
 				(double)(vblank_timing->pix_clk_100hz * 100) * 1000000;
 		subvp_active_us = main_timing->v_addressable * main_timing->h_total /
 				(double)(main_timing->pix_clk_100hz * 100) * 1000000;
-		max_vblank_mallregion = vblank_blank_us > mall_region_us ? vblank_blank_us : mall_region_us;
+		max_vblank_mallregion = max(vblank_blank_us, mall_region_us);
 
 		// Schedulable if VACTIVE region of the SubVP pipe can fit the MALL prefetch, VBLANK frame time,
 		// and the max of (VBLANK blanking time, MALL region)
-- 
2.39.0