Skip to contentSkip to conversation

drm: select DRM_KMS_HELPER from DRM_GEM_SHMEM_HELPER

PATCH Superseded Arnd Bergmann 3 participants 3 messages Jan 22, 2025

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm: select DRM_KMS_HELPER from DRM_GEM_SHMEM_HELPER

From: Arnd Bergmann <[email protected]>

In the combination of DRM_KMS_HELPER=m, DRM_GEM_SHMEM_HELPER=y, DRM_FBDEV_EMULATION=y, The shmem code fails to link against the KMS helpers:

x86_64-linux-ld: vmlinux.o: in function `drm_fbdev_shmem_driver_fbdev_probe':
(.text+0xeec601): undefined reference to `drm_fb_helper_alloc_info'
x86_64-linux-ld: (.text+0xeec633): undefined reference to `drm_fb_helper_fill_info'
x86_64-linux-ld: vmlinux.o: in function `drm_fbdev_shmem_get_page':
drm_fbdev_shmem.c:(.text+0xeec7d2): undefined reference to `drm_gem_fb_get_obj'
x86_64-linux-ld: vmlinux.o: in function `drm_fbdev_shmem_fb_mmap':
drm_fbdev_shmem.c:(.text+0xeec9f6): undefined reference to `drm_gem_fb_get_obj'
x86_64-linux-ld: vmlinux.o: in function `drm_fbdev_shmem_defio_imageblit':
(.rodata+0x5b2288): undefined reference to `drm_fb_helper_check_var'
x86_64-linux-ld: (.rodata+0x5b2290): undefined reference to `drm_fb_helper_set_par'

This can happen for a number of device drivers that select DRM_GEM_SHMEM_HELPER without also selecting DRM_KMS_HELPER. To work around this, add another select that forces DRM_KMS_HELPER to be built-in rather than a loadable module, but only if FBDEV emulation is also enabled.

---
 drivers/gpu/drm/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/Kconfig +1 -0
index 0fe99d440bfa..a8d2dffbc82f 100644
@@ -311,6 +311,7 @@ config DRM_GEM_SHMEM_HELPER
 	depends on DRM && MMU
 	select FB_CORE if DRM_FBDEV_EMULATION
 	select FB_SYSMEM_HELPERS_DEFERRED if DRM_FBDEV_EMULATION
+	select DRM_KMS_HELPER if DRM_FBDEV_EMULATION
 	help
 	  Choose this if you need the GEM shmem helper functions
 
Signature · 1 line
2.39.5
maintainer Reviewed-by on v1 1/1
#1 lore raw

Hi

thanks for the patch.

Am 22.01.25 um 07:46 schrieb Arnd Bergmann:

Quoted 16 lines

From: Arnd Bergmann <[email protected]>

In the combination of DRM_KMS_HELPER=m, DRM_GEM_SHMEM_HELPER=y, DRM_FBDEV_EMULATION=y, The shmem code fails to link against the KMS helpers:

x86_64-linux-ld: vmlinux.o: in function `drm_fbdev_shmem_driver_fbdev_probe':
(.text+0xeec601): undefined reference to `drm_fb_helper_alloc_info'
x86_64-linux-ld: (.text+0xeec633): undefined reference to `drm_fb_helper_fill_info'
x86_64-linux-ld: vmlinux.o: in function `drm_fbdev_shmem_get_page':
drm_fbdev_shmem.c:(.text+0xeec7d2): undefined reference to `drm_gem_fb_get_obj'
x86_64-linux-ld: vmlinux.o: in function `drm_fbdev_shmem_fb_mmap':
drm_fbdev_shmem.c:(.text+0xeec9f6): undefined reference to `drm_gem_fb_get_obj'
x86_64-linux-ld: vmlinux.o: in function `drm_fbdev_shmem_defio_imageblit':
(.rodata+0x5b2288): undefined reference to `drm_fb_helper_check_var'
x86_64-linux-ld: (.rodata+0x5b2290): undefined reference to `drm_fb_helper_set_par'

Quoted 6 lines

This can happen for a number of device drivers that select DRM_GEM_SHMEM_HELPER without also selecting DRM_KMS_HELPER. To work around this, add another select that forces DRM_KMS_HELPER to be built-in rather than a loadable module, but only if FBDEV emulation is also enabled.

with comments below.

drivers/gpu/drm/Kconfig config DRM_GEM_SHMEM_HELPER

Quoted 9 lines
---
  drivers/gpu/drm/Kconfig | 1 +
  1 file changed, 1 insertion(+)
drivers/gpu/drm/Kconfig +0 -0
index 0fe99d440bfa..a8d2dffbc82f 100644
@@ -311,6 +311,7 @@ config DRM_GEM_SHMEM_HELPER

I expect that DRM_GEM_DMA_HELPER and DRM_GEM_VRAM_HELPER are also affected.

drivers/gpu/drm/Kconfig config DRM_GEM_SHMEM_HELPER · line 314

Quoted 4 lines
drivers/gpu/drm/Kconfig +1 -0
  	depends on DRM && MMU
  	select FB_CORE if DRM_FBDEV_EMULATION
  	select FB_SYSMEM_HELPERS_DEFERRED if DRM_FBDEV_EMULATION
+	select DRM_KMS_HELPER if DRM_FBDEV_EMULATION

Maybe move the new line before the lines with FB_ to keep it sorted alphabetically.

I think this patch fixes

 https://lore.kernel.org/dri-devel/[email protected]/T/#mcc9fa26b2980b93dc688061884119a3dd0277dc5

Could you please add Closes and Reported-by tags?

Best regards
Thomas

Quoted 3 lines
drivers/gpu/drm/Kconfig +0 -0
  	help
  	  Choose this if you need the GEM shmem helper functions
 
Signature · 7 lines
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)
#2 lore raw

On 22.01.2025 08:53:40, Thomas Zimmermann wrote:
[...]

Quoted 3 lines

I think this patch fixes

 https://lore.kernel.org/dri-devel/[email protected]/T/#mcc9fa26b2980b93dc688061884119a3dd0277dc5

Yes it does! \o/

Quoted 1 line

Could you please add Closes and Reported-by tags?

regards,
Marc

Signature · 4 lines
Pengutronix e.K.                 | Marc Kleine-Budde          |
Embedded Linux                   | https://www.pengutronix.de |
Vertretung Nürnberg              | Phone: +49-5121-206917-129 |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-9   |