drm/nouveau/kms/nv50-: Fix CRC-related compile errors with debugfs disabled
Subsystems (3)
Lyude Paul
maintainerPATCH 1/1 drm/nouveau/kms/nv50-: Fix CRC-related compile errors with debugfs disabled
Looks like I made the mistake of forgetting to check whether or not this would build without CONFIG_DEBUG_FS, as the Kbuild bot reported some issues building with tegra_defconfig:
In file included from drivers/gpu/drm/nouveau/nouveau_display.c:47:./drivers/gpu/drm/nouveau/dispnv50/crc.h: In function ‘nv50_head_crc_late_register’:./drivers/gpu/drm/nouveau/dispnv50/crc.h:106:47: error: parameter name omitted
106 | static inline int nv50_head_crc_late_register(struct nv50_head *) {}
| ^~~~~~~~~~~~~~~~~~
./drivers/gpu/drm/nouveau/dispnv50/crc.h:106:54: warning: no return statement in function returning non-void [-Wreturn-type]
106 | static inline int nv50_head_crc_late_register(struct nv50_head *) {}
| ^~~~~~~~~./drivers/gpu/drm/nouveau/dispnv50/crc.h: In function ‘nv50_crc_handle_vblank’:./drivers/gpu/drm/nouveau/dispnv50/crc.h:108:57: warning: ‘return’ with a value, in function returning void [-Wreturn-type]
108 | nv50_crc_handle_vblank(struct nv50_head *head) { return 0; }
| ^./drivers/gpu/drm/nouveau/dispnv50/crc.h:108:1: note: declared here
108 | nv50_crc_handle_vblank(struct nv50_head *head) { return 0; }
| ^~~~~~~~~~~~~~~~~~~~~~
./drivers/gpu/drm/nouveau/dispnv50/crc.h: In function ‘nv50_crc_atomic_check’:./drivers/gpu/drm/nouveau/dispnv50/crc.h:111:23: error: parameter name omitted
111 | nv50_crc_atomic_check(struct nv50_head *, struct nv50_head_atom *,
| ^~~~~~~~~~~~~~~~~~
./drivers/gpu/drm/nouveau/dispnv50/crc.h:111:43: error: parameter name
omitted
111 | nv50_crc_atomic_check(struct nv50_head *, struct nv50_head_atom *,
| ^~~~~~~~~~~~~~~~~~~~~~~
./drivers/gpu/drm/nouveau/dispnv50/crc.h:112:9: error: parameter name
omitted
112 | struct nv50_head_atom *) {}
| ^~~~~~~~~~~~~~~~~~~~~~~
./drivers/gpu/drm/nouveau/dispnv50/crc.h:112:16: warning: no return
statement in function returning non-void [-Wreturn-type]
112 | struct nv50_head_atom *) {}
| ^~~~~~~~~~~~~~./drivers/gpu/drm/nouveau/dispnv50/crc.h: In function ‘nv50_crc_atomic_stop_reporting’:./drivers/gpu/drm/nouveau/dispnv50/crc.h:114:32: error: parameter name omitted
114 | nv50_crc_atomic_stop_reporting(struct drm_atomic_state *) {}
| ^~~~~~~~~~~~~~~~~~~~~~~~~
./drivers/gpu/drm/nouveau/dispnv50/crc.h: In function ‘nv50_crc_atomic_prepare_notifier_contexts’:./drivers/gpu/drm/nouveau/dispnv50/crc.h:116:43: error: parameter name omitted
116 | nv50_crc_atomic_prepare_notifier_contexts(struct drm_atomic_state *) {}
| ^~~~~~~~~~~~~~~~~~~~~~~~~
./drivers/gpu/drm/nouveau/dispnv50/crc.h: In function ‘nv50_crc_atomic_start_reporting’:./drivers/gpu/drm/nouveau/dispnv50/crc.h:118:33: error: parameter name omitted
118 | nv50_crc_atomic_start_reporting(struct drm_atomic_state *) {}
| ^~~~~~~~~~~~~~~~~~~~~~~~~
./drivers/gpu/drm/nouveau/dispnv50/crc.h: In function ‘nv50_crc_atomic_set’:./drivers/gpu/drm/nouveau/dispnv50/crc.h:120:21: error: parameter name omitted
120 | nv50_crc_atomic_set(struct nv50_head *, struct nv50_head_atom *) {}
| ^~~~~~~~~~~~~~~~~~
./drivers/gpu/drm/nouveau/dispnv50/crc.h:120:41: error: parameter name
omitted
120 | nv50_crc_atomic_set(struct nv50_head *, struct nv50_head_atom *) {}
| ^~~~~~~~~~~~~~~~~~~~~~~./drivers/gpu/drm/nouveau/dispnv50/crc.h: In function ‘nv50_crc_atomic_clr’:./drivers/gpu/drm/nouveau/dispnv50/crc.h:122:21: error: parameter name omitted
122 | nv50_crc_atomic_clr(struct nv50_head *) {}
| ^~~~~~~~~~~~~~~~~~
drivers/gpu/drm/nouveau/nouveau_display.c: In function ‘nouveau_framebuffer_new’:drivers/gpu/drm/nouveau/nouveau_display.c:286:15: warning: variable ‘width’ set but not used [-Wunused-but-set-variable]
286 | unsigned int width, height, i;
| ^~~~~
So, fix the inline function declarations we use in drm/drivers/gpu/drm/nouveau/dispnv50/crc.h when CONFIG_DEBUG_FS is enabled.
--- drivers/gpu/drm/nouveau/dispnv50/crc.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
drivers/gpu/drm/nouveau/dispnv50/crc.h +12 -11
@@ -106,26 +106,27 @@ struct nv50_crc_atom {};#define nv50_crc_set_source NULLstatic inline void nv50_crc_init (struct drm_device *dev) {} -static inline int nv50_head_crc_late_register (struct nv50_head *) {} -static inline void -nv50_crc_handle_vblank (struct nv50_head *head) {return 0 ; } +static inline int +nv50_head_crc_late_register (struct nv50_head *head) {return 0 ; } +static inline void nv50_crc_handle_vblank (struct nv50_head *head) {}static inline int -nv50_crc_atomic_check_head (struct nv50_head *,struct nv50_head_atom *, -struct nv50_head_atom *) {} +nv50_crc_atomic_check_head (struct nv50_head *head, +struct nv50_head_atom *asyh, +struct nv50_head_atom *armh) {return 0 ; }static inline void nv50_crc_atomic_check_outp (struct nv50_atom *atom) {}static inline void -nv50_crc_atomic_stop_reporting (struct drm_atomic_state *) {} +nv50_crc_atomic_stop_reporting (struct drm_atomic_state *state) {}static inline void -nv50_crc_atomic_init_notifier_contexts (struct drm_atomic_state *) {} +nv50_crc_atomic_init_notifier_contexts (struct drm_atomic_state *state) {}static inline void -nv50_crc_atomic_release_notifier_contexts (struct drm_atomic_state *) {} +nv50_crc_atomic_release_notifier_contexts (struct drm_atomic_state *state) {}static inline void -nv50_crc_atomic_start_reporting (struct drm_atomic_state *) {} +nv50_crc_atomic_start_reporting (struct drm_atomic_state *state) {}static inline void -nv50_crc_atomic_set (struct nv50_head *,struct nv50_head_atom *) {} +nv50_crc_atomic_set (struct nv50_head *head,struct nv50_head_atom *state) {}static inline void -nv50_crc_atomic_clr (struct nv50_head *) {} +nv50_crc_atomic_clr (struct nv50_head *head) {}#endif /* IS_ENABLED(CONFIG_DEBUG_FS) */ #endif /* !__NV50_CRC_H__ */
Signature · 6 lines
2.26.2 _______________________________________________ Nouveau mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/nouveau