From patchwork Thu Oct 19 01:03:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Li X-Patchwork-Id: 155244 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp92783vqb; Wed, 18 Oct 2023 18:04:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFawB+np+CLVgHJ+v/A7DXZh6sRo4uIl9+C0Dec6z/xm+xbuKifc7VfM1+BbWxaFkFmFIJp X-Received: by 2002:a05:6a21:6da0:b0:14c:d494:77c5 with SMTP id wl32-20020a056a216da000b0014cd49477c5mr857248pzb.13.1697677451687; Wed, 18 Oct 2023 18:04:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697677451; cv=none; d=google.com; s=arc-20160816; b=IS3APlUU2hIgKpreQvVL3cQp3Hyj7F2UCLHkNXeTeSrOctf9Jy0dwtQLxnsYlSiW6+ 7DQiXMHbzF/3fWrJlZfGW8lmOxx+LPU/fSDh0WeJpSav6M3KyBUB4Ern2idCm+nzx9VT xPY/XQN2VpZP0aRgmKg6LlJ+exL1tpa+MeLc5sa2G6qJzwFJ6bE4mFo7BMWkHFQo1L8h 8qOlcfaLd/2OTrER1uQMB7gxavVf0wwnDwyxkCc24zz1wtgN5mh3SdZFLlC5K/yInxbY AFCS3HSG6LJRyCEodLGNzZKiNlmH++TykNvPQsJ8Ce0nIbfmMoXXfAyReBxeaXCCZPe6 AW8Q== 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; bh=W2A3GlAu/MQ4OetpWhCdbhQT96a5esTtJ6mJr4KEisY=; fh=UQ4YQjzOw2k8je/E9PGcW/tvlIaqdQEelKufHp3nLKk=; b=vqAiJfXAzWXnIiLyWoBkx9xKzm4b15h11doozKOpH0xTbWa+cB8V5WH6j35sgRF8QH 5YiXzOGtjN8fLo0tZGEw1MIopHcCO4wScdVSRXCbwwEVNL5PtUTOg7FsUBKVqHQuZTke 3Fd5coiYdm19LfcSKVqFouVc2DCcwtgVMa404FRWzWiRc+nCvXpvV+22IatVMc+gEvic WL3c7UYIRKpBSFkkJ8rRFakGBSoUvsYXVcl9LcM1t44M1kwTxPC478CKrT4qFl91heXV jt4wdtmtHV2h873FaKISUoLk3Ji2aukUeMp5GoqjcHvW7sqej2RJodO00NZmJAxrN3Kf iang== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id z4-20020a170902708400b001b894687ec9si978694plk.462.2023.10.18.18.04.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 18:04:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 1B0B4809C4F9; Wed, 18 Oct 2023 18:04:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231414AbjJSBDk (ORCPT + 24 others); Wed, 18 Oct 2023 21:03:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229456AbjJSBDk (ORCPT ); Wed, 18 Oct 2023 21:03:40 -0400 Received: from out30-133.freemail.mail.aliyun.com (out30-133.freemail.mail.aliyun.com [115.124.30.133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC8F4B0 for ; Wed, 18 Oct 2023 18:03:37 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R221e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045192;MF=yang.lee@linux.alibaba.com;NM=1;PH=DS;RN=9;SR=0;TI=SMTPD_---0VuS3rO6_1697677413; Received: from localhost(mailfrom:yang.lee@linux.alibaba.com fp:SMTPD_---0VuS3rO6_1697677413) by smtp.aliyun-inc.com; Thu, 19 Oct 2023 09:03:34 +0800 From: Yang Li To: alexander.deucher@amd.com, harry.wentland@amd.com, airlied@gmail.com, daniel@ffwll.ch Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yang Li , Abaci Robot Subject: [PATCH -next 1/2] drm/amd/display: clean up one inconsistent indenting Date: Thu, 19 Oct 2023 09:03:31 +0800 Message-Id: <20231019010332.25878-1-yang.lee@linux.alibaba.com> X-Mailer: git-send-email 2.20.1.7.g153144c MIME-Version: 1.0 X-Spam-Status: No, score=-0.7 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Wed, 18 Oct 2023 18:04:08 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780143809955853512 X-GMAIL-MSGID: 1780143831228815994 drivers/gpu/drm/amd/amdgpu/../display/dc/dml2/display_mode_util.c:150 dml_max() warn: inconsistent indenting Reported-by: Abaci Robot Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6933 Signed-off-by: Yang Li --- drivers/gpu/drm/amd/display/dc/dml2/display_mode_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/dml2/display_mode_util.c b/drivers/gpu/drm/amd/display/dc/dml2/display_mode_util.c index 7dd1f8a12582..3a70838abfba 100644 --- a/drivers/gpu/drm/amd/display/dc/dml2/display_mode_util.c +++ b/drivers/gpu/drm/amd/display/dc/dml2/display_mode_util.c @@ -147,7 +147,7 @@ dml_float_t dml_max(dml_float_t x, dml_float_t y) return y; if (y != y) return x; -if (x > y) + if (x > y) return x; else return y; From patchwork Thu Oct 19 01:03:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Li X-Patchwork-Id: 155243 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp92578vqb; Wed, 18 Oct 2023 18:03:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEmVntQDjd182CYsVBJF49EOB+HM+8Jij99rjGl2hjjEPpvzQNKUi2SpLg0bVVZymaiAQ1Q X-Received: by 2002:a17:902:ea09:b0:1c1:f6d1:3118 with SMTP id s9-20020a170902ea0900b001c1f6d13118mr1030690plg.27.1697677431227; Wed, 18 Oct 2023 18:03:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697677431; cv=none; d=google.com; s=arc-20160816; b=w23D9ftdOcyYDEIfFCryI5Z3pz3tYSqBoKOIgKh2wuSy+dovmKkSc2aazf5bshnFdS XGNu91A02Fyx+Pi66hIzsbbuY989dW2n+OvFqhHaD1Zx10x3RuW/pdMbSOx3PcHVdMuU UcOpjDqpVcjA5uk6D8p2DfGgMeq4YiJiEqJPydWmJT2tgEY+URIHeYbIuQKtbeANTN09 UuuX6FH8MN6dqW9ZfsK9hTGHUD9G856NKrjIVZnGFR4tg3O00y8CtdFO+76JRiYXB1MZ AmoWk2Of74iW3xu3f9bs3G1I+aYYX38q1NF/LwniBGoUAnLab4G5/FvawJNm55f//07X KszA== 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; bh=5KokB6MrN1WbcOAWJZBzltYcEymShUq3JfRp7flRYrU=; fh=UQ4YQjzOw2k8je/E9PGcW/tvlIaqdQEelKufHp3nLKk=; b=wM/qpLu4XWgWqsh0Ii5HgpMw/n9VtO8SHZ2hBoxXdc0IOy2/QgNLU9WLGbT5Rn6Dg6 RG1dVMT4y4MWMXak7G4L1pexBhvKyVLTqLYb3Tqwaa4ECFLzIjar7QzV6bA1RhPUO65/ B0DIAwGTKkQa3i90zBqceoSZgwFPOyZQ2UvZc44qXp8R7QNkMM+zqhv6e+YIM+80pDiH gWi/uS+faj/0fGmiIPnUmuQucuuta9c0VKbsuXHV05+YivYPO0Uvm6pnXQp6RLVC+cLR wGXSCRmTj0z3p3j/k5q0278VngXKDupIoEUKeLqhy4an1UjVT7ZXj3q03BNSvWyNFK4w e3xA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id z15-20020a170903018f00b001c61923a58esi1197326plg.137.2023.10.18.18.03.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 18:03:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 489DE8213F36; Wed, 18 Oct 2023 18:03:50 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232010AbjJSBDo (ORCPT + 24 others); Wed, 18 Oct 2023 21:03:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229456AbjJSBDm (ORCPT ); Wed, 18 Oct 2023 21:03:42 -0400 Received: from out30-119.freemail.mail.aliyun.com (out30-119.freemail.mail.aliyun.com [115.124.30.119]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8571B0 for ; Wed, 18 Oct 2023 18:03:39 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R191e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046059;MF=yang.lee@linux.alibaba.com;NM=1;PH=DS;RN=9;SR=0;TI=SMTPD_---0VuS1dn5_1697677416; Received: from localhost(mailfrom:yang.lee@linux.alibaba.com fp:SMTPD_---0VuS1dn5_1697677416) by smtp.aliyun-inc.com; Thu, 19 Oct 2023 09:03:36 +0800 From: Yang Li To: alexander.deucher@amd.com, harry.wentland@amd.com, airlied@gmail.com, daniel@ffwll.ch Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yang Li , Abaci Robot Subject: [PATCH -next 2/2] drm/amd/display: clean up one inconsistent indenting Date: Thu, 19 Oct 2023 09:03:32 +0800 Message-Id: <20231019010332.25878-2-yang.lee@linux.alibaba.com> X-Mailer: git-send-email 2.20.1.7.g153144c In-Reply-To: <20231019010332.25878-1-yang.lee@linux.alibaba.com> References: <20231019010332.25878-1-yang.lee@linux.alibaba.com> MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_IN_DEF_SPF_WL 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 18 Oct 2023 18:03:50 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780143809955853512 X-GMAIL-MSGID: 1780143809955853512 drivers/gpu/drm/amd/amdgpu/../display/dc/dml2/dml2_policy.c:206 dml2_policy_build_synthetic_soc_states() warn: inconsistent indenting Reported-by: Abaci Robot Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6933 Signed-off-by: Yang Li --- drivers/gpu/drm/amd/display/dc/dml2/dml2_policy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml2_policy.c b/drivers/gpu/drm/amd/display/dc/dml2/dml2_policy.c index f8e9aa32ceab..0b3ab7aaea87 100644 --- a/drivers/gpu/drm/amd/display/dc/dml2/dml2_policy.c +++ b/drivers/gpu/drm/amd/display/dc/dml2/dml2_policy.c @@ -203,7 +203,7 @@ int dml2_policy_build_synthetic_soc_states(struct dml2_policy_build_synthetic_so s->entry.fabricclk_mhz = p->in_states->state_array[i].fabricclk_mhz; s->entry.dram_speed_mts = 0; - insert_entry_into_table_sorted(p->in_bbox, p->out_states, &s->entry); + insert_entry_into_table_sorted(p->in_bbox, p->out_states, &s->entry); } } // Add max FCLK