From patchwork Wed Mar 15 12:12:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 70196 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2318117wrd; Wed, 15 Mar 2023 06:08:04 -0700 (PDT) X-Google-Smtp-Source: AK7set+895RL9ka8hfvEPvEMO78dDhDVWVtvcYKzLTtPxsnvNpfeteo0NMEo5qBLYopaN1pSaGel X-Received: by 2002:a05:6a20:8407:b0:d5:de51:b7e1 with SMTP id c7-20020a056a20840700b000d5de51b7e1mr4112386pzd.35.1678885684198; Wed, 15 Mar 2023 06:08:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678885684; cv=none; d=google.com; s=arc-20160816; b=NeIOWMYfAzydr5XYvChAOpY8Z9BDEz3Nn8VoS2M4V4lYqypy3eWoecpPNIQyqVqaMK QbcSTVEEJU9mBzPP9HoakBxlPn43JLM/o897RAQf3jWQ0m8z1nBdZ3/bqpFk0A0kXNUt D65169fn/nooJllLDzAswqr3Uowro0bhrbtKNlpENmy5n7KeKUPiKzXpTUhDMK12GDnT /dVJTge/4Cf90ybTjBMZZyn9xIkg3eyRW/sm+XdjtXLo+kgOgG2/DAnJFtiyY5ctwXyh R5K/TqkUOWF7SbKHsvsoGiDcIp6ouly01VRZEa1r5mPaGkNB0PrJM0+lNMXcbu63J/6d 9uog== 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=V9KyjnYESiiGdb8GJZeG/aOn9c8uS34D/WgZQrulaiwuBaEOTVNCyFcgXb2sVqrVQ6 T2isSSQECo0j66beQQXQKnu2+cYPhRPQ+Pp6sru2wcCzLDNzO5qVAGpMtbAWZKuMv+6F SjZBVAUaKEcctC76EZ2dhCDAOaBqY266Y+xzriW2eJ+h6S8QGwLzNVyImA5rXOZEpiRs lCcNPa9eR78p7IOcMbqRZL4HfmRpKUCJgK8gSQ8Kt+SS3PhdqaKROg7xeGEV64tb+2a8 n1B9pMAK+3LGt36pL72Wdo7yztdWD41tNgXbY54y1CQkntMhb0wEBOaKCfsQVN/1LGpO Yi5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WsLzORw7; 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 136-20020a63008e000000b005076410cb9asi5076665pga.424.2023.03.15.06.07.49; Wed, 15 Mar 2023 06:08:04 -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=WsLzORw7; 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 S233011AbjCOMkq (ORCPT + 99 others); Wed, 15 Mar 2023 08:40:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232949AbjCOMkX (ORCPT ); Wed, 15 Mar 2023 08:40:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65F4E25E20; Wed, 15 Mar 2023 05:39:13 -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 248CE61D73; Wed, 15 Mar 2023 12:38:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0949DC433EF; Wed, 15 Mar 2023 12:38:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678883936; bh=etYCdQjmQ3MfcfmwcIxY4173EwgJTDNwtqJOInfO2s4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WsLzORw7+4E69n68V0o6SZ3741/VbEVu2byrAaTirZgjTnYHk+Gi0xM+j+2iNny6P XprK72nlMuBzlKs4p09usJ0nisIdMCrg024yH3v+dG97FeUBz7J6nAkf0t6JrELHfN VJXgXTRwTA1I5gpjfUoXbQMSYjYHjc9bIrbSsWxQ= 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.2 045/141] drm/nouveau/kms/nv50: fix nv50_wndw_new_ prototype Date: Wed, 15 Mar 2023 13:12:28 +0100 Message-Id: <20230315115741.343839335@linuxfoundation.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230315115739.932786806@linuxfoundation.org> References: <20230315115739.932786806@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?1760439234803902483?= X-GMAIL-MSGID: =?utf-8?q?1760439234803902483?= 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,