The new debugfs initialization code fails to build when CONFIG_DEBUG_FS is disabled:
In file included from /git/arm-soc/drivers/gpu/drm/nouveau/nouveau_drm.c:57:0: drivers/gpu/drm/nouveau/nouveau_debugfs.h: In function 'nouveau_debugfs_init': drivers/gpu/drm/nouveau/nouveau_debugfs.h:37:29: error: parameter name omitted nouveau_debugfs_init(struct nouveau_drm *)
This fixes the prototypes so we can build it again.
Signed-off-by: Arnd Bergmann arnd@arndb.de Fixes: b126a200e9db ("drm/nouveau/debugfs: we need a ctrl object for debugfs") --- This broke when the nouveau patches got merged into drm-next on Monday. Found on ARM randconfig builds.
diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.h b/drivers/gpu/drm/nouveau/nouveau_debugfs.h index 52c7161297d7..b8c03ff5bf05 100644 --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.h +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.h @@ -34,13 +34,13 @@ nouveau_drm_debugfs_cleanup(struct drm_minor *minor) }
static inline int -nouveau_debugfs_init(struct nouveau_drm *) +nouveau_debugfs_init(struct nouveau_drm *drm) { return 0; }
static inline void -nouveau_debugfs_fini(struct nouveau_drm *) +nouveau_debugfs_fini(struct nouveau_drm *drm) { }
Arnd Bergmann arnd@arndb.de hat am 13. Januar 2016 um 14:48 geschrieben:
The new debugfs initialization code fails to build when CONFIG_DEBUG_FS is disabled:
In file included from /git/arm-soc/drivers/gpu/drm/nouveau/nouveau_drm.c:57:0: drivers/gpu/drm/nouveau/nouveau_debugfs.h: In function 'nouveau_debugfs_init': drivers/gpu/drm/nouveau/nouveau_debugfs.h:37:29: error: parameter name omitted nouveau_debugfs_init(struct nouveau_drm *)
This fixes the prototypes so we can build it again.
thanks for this. I already send a patch to the nouveau ML here: http://lists.freedesktop.org/archives/nouveau/2016-January/023779.html
but I guess I should mail to the kernel list directly next time.
Signed-off-by: Arnd Bergmann arnd@arndb.de Fixes: b126a200e9db ("drm/nouveau/debugfs: we need a ctrl object for debugfs")
This broke when the nouveau patches got merged into drm-next on Monday. Found on ARM randconfig builds.
diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.h b/drivers/gpu/drm/nouveau/nouveau_debugfs.h index 52c7161297d7..b8c03ff5bf05 100644 --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.h +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.h @@ -34,13 +34,13 @@ nouveau_drm_debugfs_cleanup(struct drm_minor *minor) }
static inline int -nouveau_debugfs_init(struct nouveau_drm *) +nouveau_debugfs_init(struct nouveau_drm *drm) { return 0; }
static inline void -nouveau_debugfs_fini(struct nouveau_drm *) +nouveau_debugfs_fini(struct nouveau_drm *drm) { }
On Wednesday 13 January 2016 14:55:47 Karol Herbst wrote:
Arnd Bergmann arnd@arndb.de hat am 13. Januar 2016 um 14:48 geschrieben:
The new debugfs initialization code fails to build when CONFIG_DEBUG_FS is disabled:
In file included from /git/arm-soc/drivers/gpu/drm/nouveau/nouveau_drm.c:57:0: drivers/gpu/drm/nouveau/nouveau_debugfs.h: In function 'nouveau_debugfs_init': drivers/gpu/drm/nouveau/nouveau_debugfs.h:37:29: error: parameter name omitted nouveau_debugfs_init(struct nouveau_drm *)
This fixes the prototypes so we can build it again.
thanks for this. I already send a patch to the nouveau ML here: http://lists.freedesktop.org/archives/nouveau/2016-January/023779.html
Ok, thanks
Arnd
On 13 January 2016 at 16:00, Arnd Bergmann arnd@arndb.de wrote:
On Wednesday 13 January 2016 14:55:47 Karol Herbst wrote:
Arnd Bergmann arnd@arndb.de hat am 13. Januar 2016 um 14:48 geschrieben:
The new debugfs initialization code fails to build when CONFIG_DEBUG_FS is disabled:
In file included from /git/arm-soc/drivers/gpu/drm/nouveau/nouveau_drm.c:57:0: drivers/gpu/drm/nouveau/nouveau_debugfs.h: In function 'nouveau_debugfs_init': drivers/gpu/drm/nouveau/nouveau_debugfs.h:37:29: error: parameter name omitted nouveau_debugfs_init(struct nouveau_drm *)
This fixes the prototypes so we can build it again.
thanks for this. I already send a patch to the nouveau ML here: http://lists.freedesktop.org/archives/nouveau/2016-January/023779.html
Ok, thanks
Fwiw Arnd's fix feels a lot better - it lacks typos, has a fixes tag, comprehensive commit message etc. etc. :-)
-Emil
Emil Velikov emil.l.velikov@gmail.com hat am 15. Januar 2016 um 12:06 geschrieben:
On 13 January 2016 at 16:00, Arnd Bergmann arnd@arndb.de wrote:
On Wednesday 13 January 2016 14:55:47 Karol Herbst wrote:
Arnd Bergmann arnd@arndb.de hat am 13. Januar 2016 um 14:48 geschrieben:
The new debugfs initialization code fails to build when CONFIG_DEBUG_FS is disabled:
In file included from /git/arm-soc/drivers/gpu/drm/nouveau/nouveau_drm.c:57:0: drivers/gpu/drm/nouveau/nouveau_debugfs.h: In function 'nouveau_debugfs_init': drivers/gpu/drm/nouveau/nouveau_debugfs.h:37:29: error: parameter name omitted nouveau_debugfs_init(struct nouveau_drm *)
This fixes the prototypes so we can build it again.
thanks for this. I already send a patch to the nouveau ML here: http://lists.freedesktop.org/archives/nouveau/2016-January/023779.html
Ok, thanks
Fwiw Arnd's fix feels a lot better - it lacks typos, has a fixes tag, comprehensive commit message etc. etc. :-)
-Emil
no worries, I am still learning after all
Karol
dri-devel@lists.freedesktop.org
-
Arnd Bergmann -
Emil Velikov -
Karol Herbst