From patchwork Mon May 29 07:18:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 100129 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1335535vqr; Mon, 29 May 2023 00:30:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6gpE6+FaYBbYjkoE9hTlqqdmz+lQUHg42/RHJx+xBj0OBtLesql2pIybOELknqp8R/5Tni X-Received: by 2002:a17:903:230c:b0:1af:9c18:a160 with SMTP id d12-20020a170903230c00b001af9c18a160mr11010906plh.17.1685345410077; Mon, 29 May 2023 00:30:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685345410; cv=none; d=google.com; s=arc-20160816; b=qxTbU5A/wuuD1wOiqlwFjQijH9ake31AoV+aTNUgKw9SSOyiuoPva5Txqy3rfeIotJ PDxGhSgT/IKU2a2Fw3NUBbalIXfc91iFh9zJa+TZ3rIPjklcpm0gJFHf3lUtONbqnSvz c3YvT/SzuoRU5Q6eOOWU3cwVOkaYcRN8eJ/I5LrhH9Jq2kJvjxFYlUZxjufzl/DakKUa XRQjrmYoYwMmZCN9ajR5C4BhV69kzUtuadybY3VkNtcIZcz/bjOGM4mAqpnpw4s5B6WP m1Ttc6BzZqAYcuXuhsBH8oyQtE6o03j/bXSimTOujNqGX1aa4InfJVsACczIQXJmPmD5 /thA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=E29VI58F9t8lbiMbudotJ9ysUUBZknzo+5bxInVW578=; b=LLqZGFAjA9y5kv0FgnYg/6UjmlvdjZWiareyJzdp9eeMUjrRRd6+AWjIq5vut3BD2d ukcxJADcvDXRzaahAJrKFD6X8D1W3Vx0jM2qi9fLPyyQBGpmoBG5N9Sm8+tGQx5FRejW sko/waFnIpDup1zhLtbF/GFf+U4svn7EXDsMue0bpps92hN51z8MqwsZ1uMuC0nDqvLu L/vy+hc96xP35BIbNUtHgorYpJFM0SkV+S95yrny8Tc8zySngtWCHjoKHdtfyPB1hNr7 cx5U72QamYvKd8pRxYkGq5bboaHZJfEXm8F1jQfUXoNI9act7Y/zCnfWenr/QxMiVg71 pOOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b="qN2RdXC/"; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i6-20020a1709026ac600b001ae38227983si5079754plt.199.2023.05.29.00.29.56; Mon, 29 May 2023 00:30:10 -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=@wanadoo.fr header.s=t20230301 header.b="qN2RdXC/"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231350AbjE2HTP (ORCPT + 99 others); Mon, 29 May 2023 03:19:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230512AbjE2HTL (ORCPT ); Mon, 29 May 2023 03:19:11 -0400 Received: from smtp.smtpout.orange.fr (smtp-30.smtpout.orange.fr [80.12.242.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10C8DA6 for ; Mon, 29 May 2023 00:19:09 -0700 (PDT) Received: from pop-os.home ([86.243.2.178]) by smtp.orange.fr with ESMTPA id 3X9eqYgEzMDzt3X9oq4QNQ; Mon, 29 May 2023 09:19:08 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1685344748; bh=E29VI58F9t8lbiMbudotJ9ysUUBZknzo+5bxInVW578=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qN2RdXC/1SfqjAN9PDebvToRpP+JJUk8Q6FA4M43mFXtgHgv0S+f9x8BrEfyJZ44v mtS4PdX+9TjiYH+BNk64ndNK/Ckh2i5e6HYPe7JvC5eyR7vhJiDCWSCrkLW6IRGsti 4SbpZPIOkkBBr7xntU7liZnyPVJiF7mWgIksIwA3ms5JM7fsRK4Z5j0IJuIuFPi4rB rfVPxOjaTrYe/94URzYk1vwNsONPBvEQ7qOSB8Ik7Tz2YlnOHjqwVnq437SS7RmZeL xBlZ05K7U4aOtAjKzaQnJdRGcfQaCyE1b6xVOIiTFfCpG6wSLH9XXT4nbw/XPv1Y+L PT7MiJgsJiDfQ== X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Mon, 29 May 2023 09:19:08 +0200 X-ME-IP: 86.243.2.178 From: Christophe JAILLET To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 2/3] drm/amd/display: Simplify get_dmif_switch_time_us() Date: Mon, 29 May 2023 09:18:55 +0200 Message-Id: <1ab1210048a4b485247cccba6721f1885c986331.1685342739.git.christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 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_H3,RCVD_IN_MSPIKE_WL,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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767212749084183601?= X-GMAIL-MSGID: =?utf-8?q?1767212749084183601?= Thanks to the sanity check a few lines above: if (!h_total || !v_total || !pix_clk_khz) and the computation done afterwards on these non 0 values, we know that 'pixels_per_second', 'pixels_per_frame' and 'refresh_rate' are not 0 The code can be simplified accordingly. Signed-off-by: Christophe JAILLET --- NOT compile tested. Because of some BROKEN in KConfig files. --- drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c index 091f0d68a045..eafe8561e55e 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c @@ -690,21 +690,8 @@ static uint32_t get_dmif_switch_time_us( pixels_per_second = pix_clk_khz * 1000; pixels_per_frame = h_total * v_total; - if (!pixels_per_second || !pixels_per_frame) { - /* avoid division by zero */ - ASSERT(pixels_per_frame); - ASSERT(pixels_per_second); - return single_frame_time_multiplier * min_single_frame_time_us; - } - refresh_rate = pixels_per_second / pixels_per_frame; - if (!refresh_rate) { - /* avoid division by zero*/ - ASSERT(refresh_rate); - return single_frame_time_multiplier * min_single_frame_time_us; - } - frame_time = us_in_sec / refresh_rate; if (frame_time < min_single_frame_time_us)