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;
MIME-Version: 1.0
References: <20230116100718.12832-1-jirislaby@kernel.org>
In-Reply-To: <20230116100718.12832-1-jirislaby@kernel.org>
From:   Karol Herbst <kherbst@redhat.com>
Date:   Mon, 16 Jan 2023 12:34:12 +0100
Message-ID: <CACO55tvnedcj5ZmEoqLw1Vz2vJQjpKjtdbvMMQVbjydZ51JvJQ@mail.gmail.com>
Subject: Re: [PATCH -resend] drm/nouveau/kms/nv50- (gcc13): fix nv50_wndw_new_ prototype
To:     "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Cc:     airlied@redhat.com, linux-kernel@vger.kernel.org,
        Martin Liska <mliska@suse.cz>, Ben Skeggs <bskeggs@redhat.com>,
        Lyude Paul <lyude@redhat.com>,
        David Airlie <airlied@gmail.com>,
        Daniel Vetter <daniel@ffwll.ch>,
        dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, Jan 16, 2023 at 11:07 AM Jiri Slaby (SUSE) <jirislaby@kernel.org> w=
rote:
>
> 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 declaratio=
n 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 n=
v50_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.
>

Reviewed-by: Karol Herbst <kherbst@redhat.com>

will merge it into drm-misc soon

> Cc: Martin Liska <mliska@suse.cz>
> Cc: Ben Skeggs <bskeggs@redhat.com>
> Cc: Karol Herbst <kherbst@redhat.com>
> Cc: Lyude Paul <lyude@redhat.com>
> Cc: David Airlie <airlied@gmail.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: dri-devel@lists.freedesktop.org
> Cc: nouveau@lists.freedesktop.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
> ---
>
> Notes:
>     [v2] switch to uint instead of to enum
>
>  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/no=
uveau/dispnv50/wndw.h
> index 591c852f326b..76a6ae5d5652 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,
> --
> 2.39.0
>