Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4930626pxj; Wed, 9 Jun 2021 05:32:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCrQ0R4QOpJNdY3ima2S6y4L84kQPliQLdKOWlxoHAtCbUx5heGaAKMnXcBwWEB/z/wFDO X-Received: by 2002:a17:906:2a8e:: with SMTP id l14mr28130942eje.549.1623241923582; Wed, 09 Jun 2021 05:32:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623241923; cv=none; d=google.com; s=arc-20160816; b=zExCijgEnbe67Fea94YwdIWB0t5fkdu7odroD8eWvRnMhGOMpHDpAkwtfON3Crv0sJ Fph8NRmBIzBEpPEQvA7duCO0QhWVrLqmrus5HLsCjTlVVOx7gaAx/9Hs0Cwn7pVlr1PH QI2Vl1yV5n6mGIxDamorgaVGSy7Eovg7yCpAYOKvbrFhrIEAXj8Q2jXUUhQIzXVi6q87 y1sw2Maa1E3EPLqPxvvyDkwXMGe4I5v/bpDQ4AN39FMzUlvi24rHmpNYVCN2ZDngwCgi oFBJKfS7dZb/N6YdLofqhh0vEXlvs46pkMTpErU3OVT9UBLcP/fB8aRb77lzAnxkvAz6 gSNA== 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=mq7ryWBS4SM3EcItuihXZYzUMCXcNbETAh6CtJqqg8k=; b=G6YwgI2xy+vjEN66uE1fO9TmIVsuQkvY16/0Aj3p+teylkgjMt6e7ACgZD4mwhO8sp qty0Gk9ZMwuau9LclRJydmBkCSmCzOcsJ2urw3cJmiaCsLDRS586yT6rHexHBXRSdaOa WixM+yvw4s/N1NTWSzWNtCS9ZDdDpV3F9XCifN6FiTA2hjqULIbtGwJElEZWmN6pyl40 ZVdxq2U37kOkuyGJARKaU+B5FBoz3A4+y5D4+FX424d6hlU42/lCJpYEwEbNJCzaLS7E dVBmBuVwWmtWzGKX0U5xKF5irdeh7LHMgjkyd7MFyODK7ChIR8rOhAJqWA+bQAZIGnHk yYIw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vivo.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s24si2420674ejs.124.2021.06.09.05.31.39; Wed, 09 Jun 2021 05:32:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vivo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236244AbhFIDEO (ORCPT + 99 others); Tue, 8 Jun 2021 23:04:14 -0400 Received: from mail-m121144.qiye.163.com ([115.236.121.144]:8204 "EHLO mail-m121144.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236273AbhFIDEO (ORCPT ); Tue, 8 Jun 2021 23:04:14 -0400 Received: from Wanjb.localdomain (unknown [36.152.145.182]) by mail-m121144.qiye.163.com (Hmail) with ESMTPA id 7D0ADAC0056; Wed, 9 Jun 2021 11:02:17 +0800 (CST) From: Wan Jiabing To: Harry Wentland , Leo Li , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Rodrigo Siqueira , Dmytro Laktyushkin , Jun Lei , Chris Park , Alvin Lee , Bhawanpreet Lakha , Colin Ian King , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Wan Jiabing Subject: [PATCH] drm: display: Remove duplicated argument in dcn31 Date: Wed, 9 Jun 2021 11:01:46 +0800 Message-Id: <20210609030202.113368-1-wanjiabing@vivo.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZS1VLWVdZKFlBSE83V1ktWUFJV1kPCR oVCBIfWUFZQh5OH1ZKHk1KTx5JSUhPS0lVEwETFhoSFyQUDg9ZV1kWGg8SFR0UWUFZT0tIVUpKS0 hKQ1VLWQY+ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6PCI6Vjo*GT8TGQwTSTc6NhUV OUgwCjdVSlVKTUlISUtMTEhDSENLVTMWGhIXVQwaFRESGhkSFRw7DRINFFUYFBZFWVdZEgtZQVlI TVVKTklVSk9OVUpDSVlXWQgBWUFITElONwY+ X-HM-Tid: 0a79eeb87a0bb039kuuu7d0adac0056 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix the following coccicheck warning: ./drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c: 3539:12-42: duplicated argument to && or || ./drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c: 5677:87-123: duplicated argument to && or || Signed-off-by: Wan Jiabing --- .../gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c index d655655baaba..06fac59a3d40 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c @@ -3536,7 +3536,7 @@ static bool CalculateBytePerPixelAnd256BBlockSizes( *BytePerPixelDETC = 0; *BytePerPixelY = 4; *BytePerPixelC = 0; - } else if (SourcePixelFormat == dm_444_16 || SourcePixelFormat == dm_444_16) { + } else if (SourcePixelFormat == dm_444_16) { *BytePerPixelDETY = 2; *BytePerPixelDETC = 0; *BytePerPixelY = 2; @@ -5674,7 +5674,7 @@ void dml31_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l for (k = 0; k < v->NumberOfActivePlanes; k++) { if (v->ViewportWidth[k] > v->SurfaceWidthY[k] || v->ViewportHeight[k] > v->SurfaceHeightY[k]) { ViewportExceedsSurface = true; - if (v->SourcePixelFormat[k] != dm_444_64 && v->SourcePixelFormat[k] != dm_444_32 && v->SourcePixelFormat[k] != dm_444_16 + if (v->SourcePixelFormat[k] != dm_444_64 && v->SourcePixelFormat[k] != dm_444_32 && v->SourcePixelFormat[k] != dm_444_16 && v->SourcePixelFormat[k] != dm_444_8 && v->SourcePixelFormat[k] != dm_rgbe) { if (v->ViewportWidthChroma[k] > v->SurfaceWidthC[k] -- 2.20.1