drm/nouveau/kms/nv50- (gcc13): fix nv50_wndw_new_ prototype
Subsystems (3)
PATCH 1/1 drm/nouveau/kms/nv50- (gcc13): fix nv50_wndw_new_ prototype
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.
---
Notes:
[v2] switch to uint instead of to enum
drivers/gpu/drm/nouveau/dispnv50/wndw.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/dispnv50/wndw.h +3 -2
@@ -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,
Signature · 1 line
2.39.0
Quoted 12 lines · Jiri Slaby (SUSE)
gcc-13 warns about mismatching types for enums. That revealed switched
arguments ofnv50_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 structnv50_wndw_func*, structdrm_device*, enumdrm_plane_type, const char *, int, const u32 *, u32, enumnv50_disp_interlock_type, u32, structnv50_wndw**)'drivers/gpu/drm/nouveau/dispnv50/wndw.h:36:5: note: previous declaration of 'nv50_wndw_new_' with type 'int(const structnv50_wndw_func*, structdrm_device*, enumdrm_plane_type, const char *, int, const u32 *, enumnv50_disp_interlock_type, u32, u32, structnv50_wndw**)'It can be barely visible, but the declaration says about the parameters in the middle:
enumnv50_disp_interlock_type,
u32interlock_data,
u32 heads,
Quoted 7 lines
While the definition states differently:
u32 heads,
enumnv50_disp_interlock_typeinterlock_type, u32interlock_data,Unify/fix the declaration to match the definition.
will merge it into drm-misc soon
Quoted 37 lines
Cc Martin Liska <[email protected]>Cc Ben Skeggs <[email protected]>Cc Karol Herbst <[email protected]>Cc Lyude Paul <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Signed-off-by Jiri Slaby (SUSE) <[email protected]>---
Notes:
[v2] switch to uint instead of to enumdrivers/gpu/drm/nouveau/dispnv50/wndw.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/nouveau/dispnv50/wndw.h +3
-3@@ -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