[PATCH] drm: Link CMA framebuffer helpers into KMS helper library

[PATCH] drm: Link CMA framebuffer helpers into KMS helper library

[Thomas Zimmermann]

Linking the CMA frambuffer helpers into a CMA helper library in
commit 4b2b5e142ff4 ("drm: Move GEM memory managers into modules")
results in linker errors:

  arm-linux-gnueabihf-ld: drivers/gpu/drm/drm_fb_cma_helper.o: \
	  in function `drm_fb_cma_get_gem_obj': \
	  drivers/gpu/drm/drm_fb_cma_helper.c:46: undefined reference \
	  to `drm_gem_fb_get_obj'
  arm-linux-gnueabihf-ld: drivers/gpu/drm/drm_fb_cma_helper.c:46: \
	  undefined reference to `drm_gem_fb_get_obj'
  arm-linux-gnueabihf-ld: drivers/gpu/drm/drm_fb_cma_helper.c:46: \
	  undefined reference to `drm_gem_fb_get_obj'
  arm-linux-gnueabihf-ld: drivers/gpu/drm/drm_fb_cma_helper.o: in \
	  function `drm_fb_cma_sync_non_coherent': \
	  drivers/gpu/drm/drm_fb_cma_helper.c:133: undefined reference \
	  to `drm_atomic_helper_damage_iter_init'
  arm-linux-gnueabihf-ld: drivers/gpu/drm/drm_fb_cma_helper.c:135: \
	  undefined reference to `drm_atomic_helper_damage_iter_next'

Link the CMA framebuffer helpers into the KMS helper library to
fix the problem.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Fixes: 4b2b5e142ff4 ("drm: Move GEM memory managers into modules")
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: dri-devel@lists.freedesktop.org
---
 drivers/gpu/drm/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 7f6eb11b6aac..1c41156deb5f 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -34,7 +34,6 @@ drm-$(CONFIG_DRM_PRIVACY_SCREEN) += drm_privacy_screen.o drm_privacy_screen_x86.
 obj-$(CONFIG_DRM_DP_AUX_BUS) += drm_dp_aux_bus.o
 
 drm_cma_helper-y := drm_gem_cma_helper.o
-drm_cma_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o
 obj-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_cma_helper.o
 
 drm_shmem_helper-y := drm_gem_shmem_helper.o
@@ -59,6 +58,7 @@ drm_kms_helper-y := drm_bridge_connector.o drm_crtc_helper.o drm_dp_helper.o \
 
 drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o
 drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o
+drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o
 drm_kms_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o
 drm_kms_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o
 
-- 
2.33.1

Re: [PATCH] drm: Link CMA framebuffer helpers into KMS helper library

[Sam Ravnborg]

Hi Thomas,

On Tue, Oct 26, 2021 at 07:57:00PM +0200, Thomas Zimmermann wrote:
> Linking the CMA frambuffer helpers into a CMA helper library in
> commit 4b2b5e142ff4 ("drm: Move GEM memory managers into modules")
> results in linker errors:
> 
>   arm-linux-gnueabihf-ld: drivers/gpu/drm/drm_fb_cma_helper.o: \
> 	  in function `drm_fb_cma_get_gem_obj': \
> 	  drivers/gpu/drm/drm_fb_cma_helper.c:46: undefined reference \
> 	  to `drm_gem_fb_get_obj'
>   arm-linux-gnueabihf-ld: drivers/gpu/drm/drm_fb_cma_helper.c:46: \
> 	  undefined reference to `drm_gem_fb_get_obj'
>   arm-linux-gnueabihf-ld: drivers/gpu/drm/drm_fb_cma_helper.c:46: \
> 	  undefined reference to `drm_gem_fb_get_obj'
>   arm-linux-gnueabihf-ld: drivers/gpu/drm/drm_fb_cma_helper.o: in \
> 	  function `drm_fb_cma_sync_non_coherent': \
> 	  drivers/gpu/drm/drm_fb_cma_helper.c:133: undefined reference \
> 	  to `drm_atomic_helper_damage_iter_init'
>   arm-linux-gnueabihf-ld: drivers/gpu/drm/drm_fb_cma_helper.c:135: \
> 	  undefined reference to `drm_atomic_helper_damage_iter_next'
> 
> Link the CMA framebuffer helpers into the KMS helper library to
> fix the problem.
> 
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> Fixes: 4b2b5e142ff4 ("drm: Move GEM memory managers into modules")
> Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
> Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: dri-devel@lists.freedesktop.org

Patch looks fine,
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>

	Sam

Re: [PATCH] drm: Link CMA framebuffer helpers into KMS helper library

[Thomas Zimmermann]

[-- Attachment #1.1: Type: text/plain, Size: 2125 bytes --]

Thanks Sam, I've meanwhile merged the patch with our R-b.

Am 26.10.21 um 20:46 schrieb Sam Ravnborg:
> Hi Thomas,
> 
> On Tue, Oct 26, 2021 at 07:57:00PM +0200, Thomas Zimmermann wrote:
>> Linking the CMA frambuffer helpers into a CMA helper library in
>> commit 4b2b5e142ff4 ("drm: Move GEM memory managers into modules")
>> results in linker errors:
>>
>>    arm-linux-gnueabihf-ld: drivers/gpu/drm/drm_fb_cma_helper.o: \
>> 	  in function `drm_fb_cma_get_gem_obj': \
>> 	  drivers/gpu/drm/drm_fb_cma_helper.c:46: undefined reference \
>> 	  to `drm_gem_fb_get_obj'
>>    arm-linux-gnueabihf-ld: drivers/gpu/drm/drm_fb_cma_helper.c:46: \
>> 	  undefined reference to `drm_gem_fb_get_obj'
>>    arm-linux-gnueabihf-ld: drivers/gpu/drm/drm_fb_cma_helper.c:46: \
>> 	  undefined reference to `drm_gem_fb_get_obj'
>>    arm-linux-gnueabihf-ld: drivers/gpu/drm/drm_fb_cma_helper.o: in \
>> 	  function `drm_fb_cma_sync_non_coherent': \
>> 	  drivers/gpu/drm/drm_fb_cma_helper.c:133: undefined reference \
>> 	  to `drm_atomic_helper_damage_iter_init'
>>    arm-linux-gnueabihf-ld: drivers/gpu/drm/drm_fb_cma_helper.c:135: \
>> 	  undefined reference to `drm_atomic_helper_damage_iter_next'
>>
>> Link the CMA framebuffer helpers into the KMS helper library to
>> fix the problem.
>>
>> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
>> Fixes: 4b2b5e142ff4 ("drm: Move GEM memory managers into modules")
>> Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
>> Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
>> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>> Cc: Maxime Ripard <mripard@kernel.org>
>> Cc: David Airlie <airlied@linux.ie>
>> Cc: Daniel Vetter <daniel@ffwll.ch>
>> Cc: dri-devel@lists.freedesktop.org
> 
> Patch looks fine,
> Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
> 
> 	Sam
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]