From patchwork Wed Mar 15 12:12:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 70204 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2319906wrd; Wed, 15 Mar 2023 06:11:09 -0700 (PDT) X-Google-Smtp-Source: AK7set+T6ZzYN30aru9/ctc28FqDB/+F7E7RHq4WNBfaQpln6/IVNv0MmQQXTNII9gOGUv2s7TV5 X-Received: by 2002:a05:6a20:734c:b0:bf:40b:2db with SMTP id v12-20020a056a20734c00b000bf040b02dbmr51579862pzc.22.1678885869111; Wed, 15 Mar 2023 06:11:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678885869; cv=none; d=google.com; s=arc-20160816; b=AlTpbTrq3g/V4OczRhx3xmpuPnVIbTkGn43LuyJQirfEYy7XvQ4GBS7sgN74/TntgT IjdfpaWqwkOTTNnPFHxvCgj6i7GjCDQwbQnNpQRg3P/4fze4ds+Kbkvvp5ay+R4cTukN DWaBLMfRs3LWI3l7IhKAFAN5iS3IPPPe8NojA0GsI5qRbXV/Ao3DoDGIilNCiiuWRxor kE9OVDWA5qht64fan/mZT5i5Hh3j5pbFthMeldzY6fmdlWg55wnNmMtukWOwgzvGS7um Rvk6ESQQoj04kWOw81VGKk6Rl5gKuGClMtSAUtatiDcLNWMDLFvn1Fr2cTcj+LXWHhnc y2DQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OwzjW6BKpS3/ACl55zHh8tMQ3RCruNNxLQbg+Ll0wi4=; b=YzPqlrENc9u2VUjhuu1av7//livRdYMRjhGlwVioqkGDHBw58RDNL8hDncQW1fnV/k J2PpJOcq4gSUbwVjxO084sYX+dtvv9H6+oWKJc3W7ffqU5C7Fv44EHIGjMgKs0TOmOoS fwrntUD/ui2wHFlIqeg5Sndo8/gsA6I0yhBdfYpNfbWTxe20mOW1oJuBX2a1HL+L20dl UNG+9KE8uRUGzVXtC130lyjGnEthzHXp49NVJYjVlfWi6pAIxBNxKtpuxCu/l9VcTmKz 5fcYdjDKivMC7Yt+JJEE2grTk62XfJPzTd2cPMu6EK8mvrNlF2MC+GOjNQetJcAnrauD xBLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=g5Sz8vMJ; 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=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b15-20020a630c0f000000b004e00a870567si5004927pgl.124.2023.03.15.06.10.56; Wed, 15 Mar 2023 06:11:09 -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=@linuxfoundation.org header.s=korg header.b=g5Sz8vMJ; 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=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232730AbjCOMfO (ORCPT + 99 others); Wed, 15 Mar 2023 08:35:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232654AbjCOMes (ORCPT ); Wed, 15 Mar 2023 08:34:48 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 376D395E29; Wed, 15 Mar 2023 05:33:20 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 4598CCE19C0; Wed, 15 Mar 2023 12:33:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 39AE9C433EF; Wed, 15 Mar 2023 12:33:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678883593; bh=etYCdQjmQ3MfcfmwcIxY4173EwgJTDNwtqJOInfO2s4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g5Sz8vMJwXKxnKGNkyvaVA67/SqBCKrlusF3mxzFwZFOKKZM9z7s9caaM7UTC2S6n eA9Z43SS/xxgYR97ONgbEqSnu0Q/0a3MeGl+u0lEd80YPJpR8ZXZ/93poiUM8+cpNs fZaj0bCJbgjZ/mkWoeYdq1n7mqRr3jlcc9rJs8ac= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Martin Liska , Ben Skeggs , Karol Herbst , Lyude Paul , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , Sasha Levin Subject: [PATCH 6.1 058/143] drm/nouveau/kms/nv50: fix nv50_wndw_new_ prototype Date: Wed, 15 Mar 2023 13:12:24 +0100 Message-Id: <20230315115742.284910999@linuxfoundation.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230315115740.429574234@linuxfoundation.org> References: <20230315115740.429574234@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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?1760439429041522166?= X-GMAIL-MSGID: =?utf-8?q?1760439429041522166?= From: Jiri Slaby (SUSE) [ Upstream commit 3638a820c5c3b52f327cebb174fd4274bee08aa7 ] gcc-13 warns about mismatching types for enums. That revealed switched arguments of nv50_wndw_new_(): drivers/gpu/drm/nouveau/dispnv50/wndw.c:696:1: error: conflicting types for 'nv50_wndw_new_' due to enum/integer mismatch; have 'int(const struct nv50_wndw_func *, struct drm_device *, enum drm_plane_type, const char *, int, const u32 *, u32, enum nv50_disp_interlock_type, u32, struct nv50_wndw **)' drivers/gpu/drm/nouveau/dispnv50/wndw.h:36:5: note: previous declaration of 'nv50_wndw_new_' with type 'int(const struct nv50_wndw_func *, struct drm_device *, enum drm_plane_type, const char *, int, const u32 *, enum nv50_disp_interlock_type, u32, u32, struct nv50_wndw **)' It can be barely visible, but the declaration says about the parameters in the middle: enum nv50_disp_interlock_type, u32 interlock_data, u32 heads, While the definition states differently: u32 heads, enum nv50_disp_interlock_type interlock_type, u32 interlock_data, Unify/fix the declaration to match the definition. Fixes: 53e0a3e70de6 ("drm/nouveau/kms/nv50-: simplify tracking of channel interlocks") Cc: Martin Liska Cc: Ben Skeggs Cc: Karol Herbst Cc: Lyude Paul Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Jiri Slaby (SUSE) Signed-off-by: Karol Herbst Link: https://patchwork.freedesktop.org/patch/msgid/20221031114229.10289-1-jirislaby@kernel.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/nouveau/dispnv50/wndw.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.h b/drivers/gpu/drm/nouveau/dispnv50/wndw.h index 591c852f326b9..76a6ae5d56526 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wndw.h +++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.h @@ -35,8 +35,9 @@ struct nv50_wndw { int nv50_wndw_new_(const struct nv50_wndw_func *, struct drm_device *, enum drm_plane_type, const char *name, int index, - const u32 *format, enum nv50_disp_interlock_type, - u32 interlock_data, u32 heads, struct nv50_wndw **); + const u32 *format, u32 heads, + enum nv50_disp_interlock_type, u32 interlock_data, + struct nv50_wndw **); void nv50_wndw_flush_set(struct nv50_wndw *, u32 *interlock, struct nv50_wndw_atom *); void nv50_wndw_flush_clr(struct nv50_wndw *, u32 *interlock, bool flush,