public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

accel: fix CONFIG_DRM dependencies

Browse source 
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'

The problem is that DRM_ACCEL is a 'bool' symbol, so driver that
only depend on DRM_ACCEL but not also on DRM do not see the restriction
to =m configs.

To ensure that each accel driver has an implied dependency on CONFIG_DRM,
enclose the entire Kconfig file in an if/endif check.

Fixes: 8bf4889762 ("drivers/accel: define kconfig and register a new major")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230127221504.2522909-1-arnd@kernel.org
(cherry picked from commit 3524c96a12)
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
This commit is contained in:
Arnd Bergmann 2023-01-27 23:14:55 +01:00 • committed by Thomas Zimmermann
parent 3ad8173b4d
commit 9f20c9f4b1
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/accel/Kconfig
View file

@ -6,9 +6,10 @@
# as, but not limited to, Machine-Learning and Deep-Learning acceleration # as, but not limited to, Machine-Learning and Deep-Learning acceleration
# devices # devices
# #
if DRM
menuconfig DRM_ACCEL menuconfig DRM_ACCEL
bool "Compute Acceleration Framework" bool "Compute Acceleration Framework"
depends on DRM
help help
Framework for device drivers of compute acceleration devices, such Framework for device drivers of compute acceleration devices, such
as, but not limited to, Machine-Learning and Deep-Learning as, but not limited to, Machine-Learning and Deep-Learning
@ -25,3 +26,5 @@ menuconfig DRM_ACCEL
source "drivers/accel/habanalabs/Kconfig" source "drivers/accel/habanalabs/Kconfig"
source "drivers/accel/ivpu/Kconfig" source "drivers/accel/ivpu/Kconfig"
endif