From patchwork Mon May 29 07:18:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 100127 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1335346vqr; Mon, 29 May 2023 00:29:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4WCRqQIZYG7n8rOr51tc/NsmcLfcVVKW16tfKz/xJYSi0cfms4hmSxzaP6ujD9dpLmtYPh X-Received: by 2002:a05:6a00:98a:b0:64d:5c1d:353 with SMTP id u10-20020a056a00098a00b0064d5c1d0353mr13752926pfg.19.1685345381848; Mon, 29 May 2023 00:29:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685345381; cv=none; d=google.com; s=arc-20160816; b=WlUjfXWDn+3P+bbYcN2j8ze/Owl1wEJvkfANhomJ/IAWVlrys6YbR+/+R3z0VucINP mR0It/aqg201qh+bZIMxSajPhjZs4cREYpIIE12b79X5ZPOJfZz4Y/Bw1l7IT9e1MkzM IJHzYSJtFbrjek6XBJjyySNkQ+sYDYY34EE9o2AJpRjlvdao/gRQbpglepu5J2xUVbmN OmLEl3pE7VQjoq01CC1Uaz9cO0kPzediTB/hqPRLoUSAKt52AxcgVgxWvzeDfFeG/GGa IQsAZCDAbpDQzaiQ9yCvtLaH9lLNeaTbIhaiLLDOmMFfzi2kJbIVQAPcHQJBVa8lj/Ji nSgA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=ToQuNxvWCS00We22b4WvFzbjWsFm90sAaGVlSiXzZ6A=; b=TlUOBCXlfvxhitJ69s2w1M8dQHHc9TyPpJ9zeOKB/G58NFwFWZZdNWX2kPm4MXW5Ct AdF4JEMmGgnGb3aY4WRkwoHJejuK9eKRsN3b3sRA0/4vSehuRUYYBg8o9rQR2JR2syFF 1GuGG+2oKio1FEhu8pIzr34220tEsYlwTio2l00EjdUydXY09sdaTn8kfKq86ocqizbH tXyV3bgTrMPsRYkIiPSzyXyks9sm28Pjo6OPXD6QEfWnKBD/PEi6yRhHID9yY5n+Am8F MKKCKQdPLyQdvhEz3uej7MLNPung5/d3AxDL5NPM8B3wxjK1tl71s4y08Hk5Sx4x+Gpa +YFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=N0OGot8X; 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 g12-20020aa79f0c000000b0064a35829154si9681329pfr.343.2023.05.29.00.29.27; Mon, 29 May 2023 00:29:41 -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=N0OGot8X; 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 S229570AbjE2HTG (ORCPT + 99 others); Mon, 29 May 2023 03:19:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229521AbjE2HTE (ORCPT ); Mon, 29 May 2023 03:19:04 -0400 Received: from smtp.smtpout.orange.fr (smtp-30.smtpout.orange.fr [80.12.242.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99660A4 for ; Mon, 29 May 2023 00:19:02 -0700 (PDT) Received: from pop-os.home ([86.243.2.178]) by smtp.orange.fr with ESMTPA id 3X9eqYgEzMDzt3X9eq4QMn; Mon, 29 May 2023 09:19:00 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1685344740; bh=ToQuNxvWCS00We22b4WvFzbjWsFm90sAaGVlSiXzZ6A=; h=From:To:Cc:Subject:Date; b=N0OGot8XgN/sgaRBBPtv8sAmxBbjCRQT9O8f739VgP6/PefDcz4qn4+sQQ4buhqA8 fAc/X2jePdXNNBWmTWvgbUp9Ryp8kHWEDgJmdzV8ZHE8c1YY413djR6ZWGI8tjM7GY fQLYY7JVDeWvBPzsWhh3RHmI0aLvzF0lmu23syr3EuHsiPzq+pwh17fxnJCmfsb7/j iuwSEeqSG/cl3+zCv29bZ+NSC0beKhU3a8viZBb92BUsu6ZKRr/ioSKfkXVgzCf4ft vipwGXayXPCFv1AUaJfDRHr8JmJ2AbFb3IS6GFQko1QKSbRwVykQrP2aT2+cJnfe+V vbfQ3xCVLrLbQ== X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Mon, 29 May 2023 09:19:00 +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 1/3] drm/amd/display: Fix an erroneous sanity check in get_dmif_switch_time_us() Date: Mon, 29 May 2023 09:18:54 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 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?1767212718925827246?= X-GMAIL-MSGID: =?utf-8?q?1767212718925827246?= It is likely that there is a typo in the sanity check for 'v_total'. If it is 0, then 'pixels_per_frame' will also be 0, and in this case, we also return 'single_frame_time_multiplier * min_single_frame_time_us'. So test for !v_total which looks much more logical. Fixes: 4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)") Signed-off-by: Christophe JAILLET --- drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4cdd4dacb761..091f0d68a045 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 @@ -683,7 +683,7 @@ static uint32_t get_dmif_switch_time_us( /*return double of frame time*/ const uint32_t single_frame_time_multiplier = 2; - if (!h_total || v_total || !pix_clk_khz) + if (!h_total || !v_total || !pix_clk_khz) return single_frame_time_multiplier * min_single_frame_time_us; /*TODO: should we use pixel format normalized pixel clock here?*/