Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp6215175rwd; Mon, 19 Jun 2023 04:15:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4WKgbNMaHIwrdXb6glR6svhr5WBhSzPaegYKwqSUnPieffzEuEMpYtFf0w1qKuee9W/Wi3 X-Received: by 2002:a17:90a:7388:b0:25b:d96b:e87b with SMTP id j8-20020a17090a738800b0025bd96be87bmr5022975pjg.1.1687173316914; Mon, 19 Jun 2023 04:15:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1687173316; cv=pass; d=google.com; s=arc-20160816; b=OAd5JRmazvJwA68Va9vc0rUnpTr8J1aCQmDYe4EujSdfi+gFBkTHQQ5xsBxFAxDF2r 0RC52ED7FBagSdiAyQVpAuN5rprOa1z/uuEkmNu0B9Lv52xbccFjIeWGH42KcGYesRVj iEKFo0qBYh8MUSzbSoj3Pre/RQb728H2HTyHASxFFKoznJyZnlM8/FghR3+LcYruXgt/ GHjmEwKpr/4gnxi3BRs5EqkV99ku/nBdbW0+moVQbEe+JM+te2aFD3Kf4wIRTdyRXAHE yNFyqeMNpb5aefT9GiuhDNo+3oArp6SoCSxBboJ05KdqBxL9r5m6CSXt6fOPyJChHqTo Ir3w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :message-id:date:subject:cc:to:from:dkim-signature; bh=ivJsXuB2YQe25+wDdOAG6THiewWW1JCsiheI1umJqfw=; b=qbm1q7yN97KKHY8BZitewY1zWYdbhjvax3tkiJJrWK7rBD9Q+5GQcC+fsjY5DKTtp/ vnijcZ6u/GW+Vd45thz198ySb0clOMEqOctCSdItnLBKMcet5+xi2XMOTmnF8HuLYx9l oheqZeFtNnvfbXUivjETREBUURU3/hyccG/VQ1W5vnN+v5r2jT5j9z0hexJOWgtxFLs3 Y+oszpXWfhil7MREHPbEVnDvVNeJ/YVDKiAI/iB2dSDpgJ8dBaTl9RwQ9khSR4jNm0Xm QU7u6J+CmZTH4paogyEmjM1JePcwZQl44x9NWPIPJYaSU4BUa7l/oFVOwDG67J58D/d1 8bTg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@vivo.com header.s=selector2 header.b=D1ls8N7B; arc=pass (i=1 spf=pass spfdomain=vivo.com dkim=pass dkdomain=vivo.com dmarc=pass fromdomain=vivo.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vivo.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e1-20020a17090a728100b00259a3c7fb52si7102078pjg.27.2023.06.19.04.15.04; Mon, 19 Jun 2023 04:15:16 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@vivo.com header.s=selector2 header.b=D1ls8N7B; arc=pass (i=1 spf=pass spfdomain=vivo.com dkim=pass dkdomain=vivo.com dmarc=pass fromdomain=vivo.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vivo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232563AbjFSLCb (ORCPT + 99 others); Mon, 19 Jun 2023 07:02:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231801AbjFSLBx (ORCPT ); Mon, 19 Jun 2023 07:01:53 -0400 Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on2095.outbound.protection.outlook.com [40.107.117.95]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03C001987 for ; Mon, 19 Jun 2023 04:00:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=awC8UeIvXSoocPfEdYGvseyblw0xw5ADzb1+G5HMzoBzxVUtNhBJU1t4Hm3awLWFwE9SOLzktA9TAKQvlhnAh7Gufl2iUIEi8Z5dlbsCy28YR62xVvIGD/4NXfMbaP1t/ODJisuOy59tLoB2hV3MElOw6fXbq5Oqusq/W7oGNFtUHArVANHbA3j+qiCn95JK6LdN4jb9ScZtkf4SDRa/Psmuk2YJXnMctk2IGbXGKj4S5mpMKrpuIQCENTiwZPa8ZzC3FzKaYcn6uRdPSi76eBX0mMb2iK+ovXDZq5qQeb5ILsDqefYAwAmFJMgO+GctkO+gX6wm7bGubg3OTsWfMg== 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=ivJsXuB2YQe25+wDdOAG6THiewWW1JCsiheI1umJqfw=; b=Dj9nWLVP/DFK8zqnunmZegmH6T46JKG0XYLPBOA01zyo81HjjfzbToxYGmrnyD8sHaKB6/Bl/8gnyzTqbR9L54RLOc5SQIEi2RcG3STrgqTzD2UFRiQufHlYNTwNJtipB8chwtC89YGKu1e1icmCYVD5vSQkNji0BcgtpNgr/Ox6Bo8l5GNXvhiOLo//31L6SN8AtJkGPivHIbrgqO6RthoWluoqdSuDTVhx80Di1gOQDRsZDLrFY8/RMCsg5b6pyQsiN7I4AGTpjPqmqpvo2/4hRPiqQdxRyBvN/ft728mO3I5aT16myQ8rVEbEm1aKZtcsz/1bTG+b3nMrsmgpKg== 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=ivJsXuB2YQe25+wDdOAG6THiewWW1JCsiheI1umJqfw=; b=D1ls8N7BTi9azjRo8l+JW1Zoq0HyS/4ukDGP8sclshhV9iDaZqxlEfRrJZL2TPcBPGZsraUKF2rWnH7pfVFL0CM2v1k/NDEzoRZC/5z4gwOsZ5IyV/+afUOdK9oDlln3YjefekBOjVzhP2a6uS58gwJkCVRmguT/nPM91uiq1/uJtJTtO3tvIRkiPt8OeiXJQvWJkrc0YyPHOAulVAa50vpGZ3AVRsQtvSt9hLpxHZwC0WLuyp1NIcDXec5G8xRfKQxUu/hz0+7GsoVZmz5lbf7VAi/hw8eDrftTVbBGULIWVU73MTG74JlqwG//AHuKNjUqEQK1rebHkd6mC0ifqg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SEZPR06MB5022.apcprd06.prod.outlook.com (2603:1096:101:48::5) by TYZPR06MB6566.apcprd06.prod.outlook.com (2603:1096:400:454::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.36; Mon, 19 Jun 2023 11:00:53 +0000 Received: from SEZPR06MB5022.apcprd06.prod.outlook.com ([fe80::37cd:b3a2:1fee:705c]) by SEZPR06MB5022.apcprd06.prod.outlook.com ([fe80::37cd:b3a2:1fee:705c%6]) with mapi id 15.20.6500.031; Mon, 19 Jun 2023 11:00:53 +0000 From: Li Dong To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Aric Cyr , Tom Rix , Qingqing Zhuo , Anthony Koo , "Leo (Hanghong) Ma" , Li Dong , Dillon Varone , Austin Zheng , Mike Hsieh , 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 Subject: [PATCH] gpu: drm/amd: Fix traditional comparison using max method Date: Mon, 19 Jun 2023 18:54:45 +0800 Message-Id: <20230619105514.1888-1-lidong@vivo.com> X-Mailer: git-send-email 2.31.1.windows.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: TYAPR01CA0030.jpnprd01.prod.outlook.com (2603:1096:404:28::18) To SEZPR06MB5022.apcprd06.prod.outlook.com (2603:1096:101:48::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5022:EE_|TYZPR06MB6566:EE_ X-MS-Office365-Filtering-Correlation-Id: 061b6f3b-f862-4025-5d1a-08db70b472f0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5OB6F7x2elN9xCqCf/TNGmDdR8bVTBQT3tJOwa3bAzQNckTa7FBOWrrjfVL7CvtSDS6Et9nHw7D2eYilnYXkKBpk7aMmqHE2g2N2OqH74oOHhg+jMAO/2FeG+Yl45NoaxSertxgaZDRXxwGsngPtXpjmHAGDWBOS7jUXstqNrcvYhwR+fG+yZfHd97MfNs/MVZuf+TNvfZLkqKY9W85ysndiRNycWkIeTgTSLk5Gktb5E4UDZikvUf1ON1f+GYvWxTn399DVREokSPqq12Al6dsSDBYVHY5dl+w4bY68g/Dbl1RjyH5IDDabpcU42eQg1IoJNtx0Z3qtA5TC3a+dQ5kpyk1LHz6pAA+zu43SCmmu47JQXg9nitl3hIkA4qOFo4RYdKMp4pRPEYgNqlsgVQVLMywmMZHhqYkoNhpN+SqjSEDevqTm1D9BikbJaFDd2k0R2moqo00XZ+0FU1AHwO+IY01SPu7JGyTb832vOZNbLqJx5hWlMwqJVHOWJOGAh8zTu+uqVHm6N0+4V1bMXqgcKPekKFnxuNusXHE7u969Do9kV3EjAAn5n0drWr9qMBsBiGOKnH8axtmTC4BPZgbsBopB2Wo2GnGiH/noURQaUmuQW3yLoOZKpJTPSK4lKoXPVC6Jv+8wA6K9TFNlpg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SEZPR06MB5022.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(376002)(39850400004)(346002)(136003)(396003)(366004)(451199021)(478600001)(83380400001)(86362001)(107886003)(6486002)(52116002)(6666004)(316002)(38350700002)(921005)(66556008)(66476007)(4326008)(66946007)(38100700002)(1076003)(6506007)(6512007)(26005)(186003)(110136005)(2616005)(8676002)(8936002)(7416002)(2906002)(5660300002)(41300700001)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dHfrkXeJ+aWLt6NXHGKX10UD+ocpvbEGlpcSSBpmvskth7Saq8DPoLvlatU1?= =?us-ascii?Q?czuRvkLU/GNB+CFdkDB+P1SYbVr5VzILDIn3uJg7fK30cdY2yBe90lI5czrF?= =?us-ascii?Q?MH1f9znks8roVAdlZPsIgq5bXb0L3bZY2yCaeV1hEnjQRkxQI0MJKt51Wt0I?= =?us-ascii?Q?tKr4/GTVOzrFI/qKJUF9CfDLd2UJm8aWVSido5gQQzEBLEIQmRcYCEI81ygG?= =?us-ascii?Q?mklVoh9128rXIURRjgvUrNn8o1CTvjYnvvHwcGMZWwe6ZzK5XwU5azjYA3lg?= =?us-ascii?Q?oUqfWeUoakvrpnJBWMB8aTxr4EFB8xY0pwyF9I32nIHxI4dH6fB/kboCsBgX?= =?us-ascii?Q?9XhKYZZ50EPpLi8NYEedxtzWcZVJR33oFQGqwcou+njsKVcC0ja4OVgKiHUD?= =?us-ascii?Q?8/klJmrN4mjg81xIqRdqr6/tJHr+7b5Zz4rCv/1xA0BGeUxKRJo2dsfIM5xu?= =?us-ascii?Q?2ylIBzffbidsIU1lMBSnN2wqwxjg5jP8lymry0LJwH9fEt4ckNze1Di8u5mL?= =?us-ascii?Q?TBQ7xCNyNLziQWBF2or34IhrREi2DzBnmzfRG4R/ICzciL8BZsHk6a47sYLY?= =?us-ascii?Q?Q+Aku5xiZYC6v8DqVbrY4JYueObLjdjIUWCyf5V7hEAHTa5V1GQ/QbasPrL7?= =?us-ascii?Q?Q2XobAUG6RTLybuGMCSNtwVhLghqdCdC37ZmhUqNtIgBIL6Q9S35O3fp4zus?= =?us-ascii?Q?6bZxJWBJ/Fz/L8TYHNY3iMcSB8LN3bYRR3NLYg9g1fruVBFVC8aKhcf0Y+dQ?= =?us-ascii?Q?tgydx8jFR+XeU/xBBySR3yIh83Dyq79U6lD79tC9ctnf7sYiypVWhMSzTubx?= =?us-ascii?Q?1T0Ym6RM60NRtYkdM57he+aj3gPVmDKtqykPcYPBpN7rMOzfbXF/2OtxhG3P?= =?us-ascii?Q?yajav+8P+4ncOf99SAYjnv3//BQACAWhQEez50IYkZKjylEdoZrOzdtPPtw0?= =?us-ascii?Q?w+/Zi13SlEjyiBTYk0Y7d9hnH5jOAFvDFgaGXEkUe2YZSoJ9pZEuHJN4sCNG?= =?us-ascii?Q?nsKRfe0EqbaNlKAiI/FyBhwmPSkKF5bQnv+/QRC0hSngSkcsbKF+Ft8Cg3PA?= =?us-ascii?Q?xMsgNkpayjPTOUOPsw5hkKrCr2VpYoOn0ACVdgu34+XIt002bbyAjyJ4WzoZ?= =?us-ascii?Q?d/CeWd0p5gRthOkVqF69UFlxP8iEMy+7sFcSvbSI2MdwNU75hWgAsvWJXgy3?= =?us-ascii?Q?dQkS0yECG3HFv0VmYRVgOmzEwfSg6N9Ki84ORkmbE0xKbPzSWC8KbTDW6tY+?= =?us-ascii?Q?HihjPOvtiKG8sj+o3cZ3ZAEDEg42b7CPJWRK2oXcyRs2e8u/0N16LOQulnED?= =?us-ascii?Q?ULsk/sHbnLPuxbDWNe9RCkzZi8HuvCHRpiaFyhO+8wL0nKwyUSCAzK8eNnNk?= =?us-ascii?Q?Pw4P47qzp+J8PyrYViTAqSpICsLc2c/4AvcOiuOvHk9ZdfvZyuno+Njuqwhj?= =?us-ascii?Q?NOXU500KanPQQEpsIfqwE3j/3p4FoKEeXQWqWaYlt5KqsNV1kQVNfXZtj4PZ?= =?us-ascii?Q?Wres30O23FipdFae5jbsR+L1xLStDuzSPhKkFlmMqjRmtO6Ce94pcQq3JVIt?= =?us-ascii?Q?H3v42iM3UE55M7+3x/UfJYsU16pzlzfrj81w2upZ?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 061b6f3b-f862-4025-5d1a-08db70b472f0 X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5022.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2023 11:00:53.1894 (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: UNhjA7SaKE19oryodqvX6Touw3yOPA8h7S+V0F8bLdmnd2Hv1KG2+EkpYDVLY5GLNBDlqFQZSQRvJiQM/FUnmA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB6566 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 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: X-Mailing-List: linux-kernel@vger.kernel.org It would be better to replace the traditional ternary conditional operator with max() Signed-off-by: Li Dong --- drivers/gpu/drm/amd/display/modules/freesync/freesync.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c index dbd60811f95d..a5eabde53fa4 100644 --- a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c +++ b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c @@ -1005,8 +1005,7 @@ void mod_freesync_build_vrr_params(struct mod_freesync *mod_freesync, (stream->timing.h_total * stream->ctx->dc->caps.max_v_total)); } /* Limit minimum refresh rate to what can be supported by hardware */ - min_refresh_in_uhz = min_hardware_refresh_in_uhz > in_config->min_refresh_in_uhz ? - min_hardware_refresh_in_uhz : in_config->min_refresh_in_uhz; + min_refresh_in_uhz = max(min_hardware_refresh_in_uhz, in_config->min_refresh_in_uhz); max_refresh_in_uhz = in_config->max_refresh_in_uhz; /* Full range may be larger than current video timing, so cap at nominal */ -- 2.31.1.windows.1