| Message ID | 20190628103359.2516007-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/armada: fix debugfs link error | expand |
On Fri, Jun 28, 2019 at 12:33:40PM +0200, Arnd Bergmann wrote: > Debugfs can be disabled at compile time, causing a link error > with the newly restructured code: > > drivers/gpu/drm/armada/armada_crtc.o: In function `armada_drm_crtc_late_register': > armada_crtc.c:(.text+0x974): undefined reference to `armada_drm_crtc_debugfs_init' > > Make the code into the debugfs init function conditional. Thanks Arnd, mind if I roll this into the original commit? > Fixes: 05ec8bd524ba ("drm/armada: redo CRTC debugfs files") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/gpu/drm/armada/armada_crtc.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c > index e3a5964d8a65..03d3fd00fe00 100644 > --- a/drivers/gpu/drm/armada/armada_crtc.c > +++ b/drivers/gpu/drm/armada/armada_crtc.c > @@ -773,7 +773,9 @@ static void armada_drm_crtc_destroy(struct drm_crtc *crtc) > > static int armada_drm_crtc_late_register(struct drm_crtc *crtc) > { > - armada_drm_crtc_debugfs_init(drm_to_armada_crtc(crtc)); > + if (IS_ENABLED(CONFIG_DEBUG_FS)) > + armada_drm_crtc_debugfs_init(drm_to_armada_crtc(crtc)); > + > return 0; > } > > -- > 2.20.0 > >
On Fri, Jun 28, 2019 at 2:48 PM Russell King - ARM Linux admin <linux@armlinux.org.uk> wrote: > > On Fri, Jun 28, 2019 at 12:33:40PM +0200, Arnd Bergmann wrote: > > Debugfs can be disabled at compile time, causing a link error > > with the newly restructured code: > > > > drivers/gpu/drm/armada/armada_crtc.o: In function `armada_drm_crtc_late_register': > > armada_crtc.c:(.text+0x974): undefined reference to `armada_drm_crtc_debugfs_init' > > > > Make the code into the debugfs init function conditional. > > Thanks Arnd, mind if I roll this into the original commit? That would be best, please do so. Arnd
diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c index e3a5964d8a65..03d3fd00fe00 100644 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c @@ -773,7 +773,9 @@ static void armada_drm_crtc_destroy(struct drm_crtc *crtc) static int armada_drm_crtc_late_register(struct drm_crtc *crtc) { - armada_drm_crtc_debugfs_init(drm_to_armada_crtc(crtc)); + if (IS_ENABLED(CONFIG_DEBUG_FS)) + armada_drm_crtc_debugfs_init(drm_to_armada_crtc(crtc)); + return 0; }
Debugfs can be disabled at compile time, causing a link error with the newly restructured code: drivers/gpu/drm/armada/armada_crtc.o: In function `armada_drm_crtc_late_register': armada_crtc.c:(.text+0x974): undefined reference to `armada_drm_crtc_debugfs_init' Make the code into the debugfs init function conditional. Fixes: 05ec8bd524ba ("drm/armada: redo CRTC debugfs files") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/gpu/drm/armada/armada_crtc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)