Skip to contentSkip to conversation

accel: work around DRM_ACCEL dependencies

PATCH In review Arnd Bergmann 3 participants 3 messages Jan 27, 2023 DRM compute accelerators drivers and framework

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 accel: work around DRM_ACCEL dependencies

From: Arnd Bergmann <[email protected]>

At the moment, accel drivers can be built-in even with CONFIG_DRM=m, but this causes a link failure:

x86_64-linux-ld: drivers/accel/ivpu/ivpu_drv.o: in function `ivpu_dev_init':
ivpu_drv.c:(.text+0x1535): undefined reference to `drmm_kmalloc'
x86_64-linux-ld: ivpu_drv.c:(.text+0x1562): undefined reference to `drmm_kmalloc'
x86_64-linux-ld: drivers/accel/ivpu/ivpu_drv.o: in function `ivpu_remove':
ivpu_drv.c:(.text+0x1faa): undefined reference to `drm_dev_unregister'
x86_64-linux-ld: drivers/accel/ivpu/ivpu_drv.o: in function `ivpu_probe':
ivpu_drv.c:(.text+0x1fef): undefined reference to `__devm_drm_dev_alloc'

This could be avoided by making DRM_ACCEL a tristate symbol, which would mean that every ACCEL driver is guarantee to be able to link against DRM as well. However, having both as =m causes another link failure because the DRM core code also links against the accel driver:

x86_64-linux-ld: drivers/gpu/drm/drm_drv.o: in function `drm_minor_register':
drm_drv.c:(.text+0x259): undefined reference to `accel_debugfs_init'
x86_64-linux-ld: drm_drv.c:(.text+0x298): undefined reference to `accel_minor_replace'

I think it will be necessary to establish a link hierarchy between drm.ko and drm_accel.ko to avoid circular dependencies like this, but until then the only way that both can be used is to have both subsystems built into the kernel. Enforce this using a Kconfig dependency.

Fixes 8bf4889762a8 ("drivers/accel: define kconfig and register a new major")
---
 drivers/accel/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/accel/Kconfig +1 -1
index 834863902e16..dd18d3b2028c 100644
@@ -8,7 +8,7 @@
 #
 menuconfig DRM_ACCEL
 	bool "Compute Acceleration Framework"
-	depends on DRM
+	depends on DRM=y
 	help
 	  Framework for device drivers of compute acceleration devices, such
 	  as, but not limited to, Machine-Learning and Deep-Learning
Signature · 1 line
2.39.0
#1 lore raw

Hi

Quoted 5 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

At the moment, accel drivers can be built-in even with CONFIG_DRM=m, but this causes a link failure:

Quoted 7 lines

x86_64-linux-ld: drivers/accel/ivpu/ivpu_drv.o: in function `ivpu_dev_init':
ivpu_drv.c:(.text+0x1535): undefined reference to `drmm_kmalloc'
x86_64-linux-ld: ivpu_drv.c:(.text+0x1562): undefined reference to `drmm_kmalloc'
x86_64-linux-ld: drivers/accel/ivpu/ivpu_drv.o: in function `ivpu_remove':
ivpu_drv.c:(.text+0x1faa): undefined reference to `drm_dev_unregister'
x86_64-linux-ld: drivers/accel/ivpu/ivpu_drv.o: in function `ivpu_probe':
ivpu_drv.c:(.text+0x1fef): undefined reference to `__devm_drm_dev_alloc'

Ehh, this should not happen.

Quoted 5 lines

This could be avoided by making DRM_ACCEL a tristate symbol, which would mean that every ACCEL driver is guarantee to be able to link against DRM as well. However, having both as =m causes another link failure because the DRM core code also links against the accel driver:

Quoted 8 lines

x86_64-linux-ld: drivers/gpu/drm/drm_drv.o: in function `drm_minor_register':
drm_drv.c:(.text+0x259): undefined reference to `accel_debugfs_init'
x86_64-linux-ld: drm_drv.c:(.text+0x298): undefined reference to `accel_minor_replace'

I think it will be necessary to establish a link hierarchy between drm.ko and drm_accel.ko to avoid circular dependencies like this, but until then the only way that both can be used is to have both subsystems built into the kernel. Enforce this using a Kconfig dependency.

Hmm, it was discussed a bit before and conclusion was that accel will be compiled in drm.ko to avoid circular dependencies. There should be no drm_accel.ko module.

Quoted 11 lines
Fixes 8bf4889762a8 ("drivers/accel: define kconfig and register a new major")
---
 drivers/accel/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/accel/Kconfig +0 -0
index 834863902e16..dd18d3b2028c 100644

drivers/accel/Kconfig line 11

Quoted 5 lines
drivers/accel/Kconfig +1 -1
@@ -8,7 +8,7 @@
 #
 menuconfig DRM_ACCEL
 	bool "Compute Acceleration Framework"
-	depends on DRM
+	depends on DRM=y

Would making ivpu Kconfig:

depends on DRM
select DRM_ACCEL

solve the problem and still allow to drm to be build as module ?

Regards
Stanislaw

#2 lore raw
Quoted 10 lines · Stanislaw Gruszka
Quoted 4 lines · Arnd Bergmann

I think it will be necessary to establish a link hierarchy between drm.ko and drm_accel.ko to avoid circular dependencies like this, but until then the only way that both can be used is to have both subsystems built into the kernel. Enforce this using a Kconfig dependency.

Hmm, it was discussed a bit before and conclusion was that accel will be compiled in drm.ko to avoid circular dependencies. There should be no drm_accel.ko module.

Ok, got it. This does not sounds like a great solution as it ties the two modules closer together than most users want, but it should work as long as we control the dependencies for the individual drivers.

Quoted 13 lines

drivers/accel/Kconfig line 11

Quoted 10 lines
drivers/accel/Kconfig +1 -1
index 834863902e16..dd18d3b2028c 100644
@@ -8,7 +8,7 @@
 #
 menuconfig DRM_ACCEL
 	bool "Compute Acceleration Framework"
-	depends on DRM
+	depends on DRM=y

Would making ivpu Kconfig:

Quoted 4 lines

depends on DRM
select DRM_ACCEL

solve the problem and still allow to drm to be build as module ?

Right, that should work, I'll send a v2 patch to add an "if DRM" around the entire drivers/accel/Kconfig file, which should have the effect.

Arnd