Skip to contentSkip to conversation

drm/nouveau/kms/nv50- (gcc13): fix nv50_wndw_new_ prototype

PATCH New Jiri Slaby (SUSE) 1 participant 3 messages Jan 16, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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
index 591c852f326b..76a6ae5d5652 100644
@@ -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
#1 lore raw

PATCH 1/1 BRANCH_MARKER: work

From: Jiri Slaby <[email protected]>

---
 branch/work | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch/work
branch/work new file +1 -0
new file mode 100644
index 000000000000..587be6b4c3f9
@@ -0,0 +1 @@
+x
Signature · 1 line
2.39.0
author
#2 lore raw

Re: [PATCH] BRANCH_MARKER: work

Please, ignore this :).

Quoted 14 lines · Jiri Slaby (SUSE)

From: Jiri Slaby <[email protected]>

---
  branch/work | 1 +
  1 file changed, 1 insertion(+)

create mode 100644 branch/work

branch/work new file +1 -0
new file mode 100644
index 000000000000..587be6b4c3f9
@@ -0,0 +1 @@
+x
Signature · 2 lines
js
suse labs