Skip to contentSkip to conversation

drm/armada: fix debugfs link error

PATCH In review Arnd Bergmann 2 participants 3 messages Jun 28, 2019

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

PATCH 1/1 drm/armada: fix debugfs link error

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")
---
 drivers/gpu/drm/armada/armada_crtc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/armada/armada_crtc.c +3 -1
index e3a5964d8a65..03d3fd00fe00 100644
@@ -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;
 }
 
Signature · 1 line
2.20.0
#1 lore raw
Quoted 7 lines · Arnd Bergmann

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?

Quoted 25 lines
Fixes 05ec8bd524ba ("drm/armada: redo CRTC debugfs files")
---
 drivers/gpu/drm/armada/armada_crtc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/armada/armada_crtc.c +3 -1
index e3a5964d8a65..03d3fd00fe00 100644
@@ -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;
 }
 
Signature · 1 line
2.20.0
Signature · 3 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up
According to speedtest.net: 11.9Mbps down 500kbps up
#2 lore raw
Quoted 11 lines · Russell King - ARM Linux admin
Quoted 7 lines · Arnd Bergmann

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