From patchwork Wed Mar 15 12:12:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 70211 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2320704wrd; Wed, 15 Mar 2023 06:12:39 -0700 (PDT) X-Google-Smtp-Source: AK7set8jb2jzYVd9qfXF7DsiqezEO3bwASlvRwEWud87PhfNVNwRH5PbZcoVnogDmQSlLqwn7Mvs X-Received: by 2002:aa7:9f02:0:b0:625:7536:7b0e with SMTP id g2-20020aa79f02000000b0062575367b0emr4504605pfr.29.1678885959460; Wed, 15 Mar 2023 06:12:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678885959; cv=none; d=google.com; s=arc-20160816; b=o1+SRiDJpX75B5fMu0CiOTLn/J7o+XmpcOba45v59k0D9++HzEUxW9Z4NqYoatltjf tY4nbO8Dt5mQ9fq9z9zi8sSUpQvjeOF/AxB5Mk9apO2Z6FlcPnNIRW1aDzoYUjZJnHZ3 FW7Rz0KRv8HzrTGtXhnPZodUVD6FOP/+tO72nqqvYXe9UiyHJatUj5VLUFZxefTWjR18 5ROdziyNqzsUDwUa0uOPAQmBqd+MTM5/bbiMgc7+lBgfw4aDTnXkVen8MFCBDAfNneEw SvdGvVdM3nZY6k1XwmdnXadH24uv84ZAn74su6OlSSUBZzOfFDRM1cWyd2lEm6j6j4Ci G5GQ== 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=OwQwl0VepTgJhJ3NnsgVqQ4JH8EVTgMUYpupoXourmg=; b=oXR+Mt7TDe8bIs1TtkSCgnkftbQAcSk5RAIevfLVZbrpEu3qLni6YRa2bmLvh6yrWv omH/DPdAWXW3FFkyqZZ9Y9qaEfdXpVxc5/tHcR7f+PBxK40oKbxyO3ZY59cns9tCyhKf pEdgL9ZPahRdU3c3LZN9pD+bGjr6PoDkXgcxksK0etf57fmVXS3oulVP+8Y5Mt4QSDu1 P1A5XDNLC+bnvtrhsRUAbqWn+AuNmaKSTmglSIbY4CiDFAXNmZvA0q+yaFtZCcdSSTuv 9ChBoHddkA/zhZSGLAO1G9jL3Fllje7LERYFTf35jgk06Rq3TsgXT41vZw8lo1yMFhkr kM1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="U34i/Bjh"; 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 62-20020a630641000000b004fb2bd6c0basi5081911pgg.168.2023.03.15.06.12.26; Wed, 15 Mar 2023 06:12:39 -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="U34i/Bjh"; 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 S232096AbjCOMWT (ORCPT + 99 others); Wed, 15 Mar 2023 08:22:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232186AbjCOMVv (ORCPT ); Wed, 15 Mar 2023 08:21:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26FD096F00; Wed, 15 Mar 2023 05:21:02 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 668B361D4C; Wed, 15 Mar 2023 12:21:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D1DAC433D2; Wed, 15 Mar 2023 12:21:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678882861; bh=otWQfkOjRcKYmh1VqrfmvrHW/ax92X+qCi+inqN6B9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U34i/BjhfE+Yzktf/id0d0RSafzTXU9cEQrpjFtUg+3o0hAgze+Z696Qpn5tavaBB r7/eyK7Ag8W8OABQykPvy+g1EQ6zDXxBtZSLt8PqR4JZlBzCIPFUnOxZzQoKgeBwvB PBHPagxZiK+ThHy/MlTokrAjcPis+rwo46cIKxB0= 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 5.10 029/104] drm/nouveau/kms/nv50: fix nv50_wndw_new_ prototype Date: Wed, 15 Mar 2023 13:12:00 +0100 Message-Id: <20230315115733.261181999@linuxfoundation.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230315115731.942692602@linuxfoundation.org> References: <20230315115731.942692602@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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?1760439523609933283?= X-GMAIL-MSGID: =?utf-8?q?1760439523609933283?= 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 8bed195ae098a..77bf124319fbd 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wndw.h +++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.h @@ -38,8 +38,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,