Skip to contentSkip to conversation

Build break due to 28ec711 "drm/agp: move AGP cleanup paths to drm_agpsupport.c"

DISCUSSION Stephen Warren 2 participants 4 messages Aug 8, 2013

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

In next-20130808, building tegra_defconfig for ARM yields:

Quoted 2 lines

drivers/built-in.o: In function `drm_lastclose':
/home/swarren/shared/git_wa/kernel/kernel.git/drivers/gpu/drm/drm_drv.c:198: undefined reference to `drm_agp_clear'

That's because drm_agp_clear() is called unconditionally, yet is only conditionally built into drm_agpsupport.c (#if __OS_HAS_AGP).

Should the call from drm_drv.c be conditional, or should there be a dummy static inline replacement in include/drm/drmP.h for when AGP support isn't available?

#1 lore raw

Hi

Quoted 11 lines · Stephen Warren

In next-20130808, building tegra_defconfig for ARM yields:

Quoted 2 lines

drivers/built-in.o: In function `drm_lastclose':
/home/swarren/shared/git_wa/kernel/kernel.git/drivers/gpu/drm/drm_drv.c:198: undefined reference to `drm_agp_clear'

That's because drm_agp_clear() is called unconditionally, yet is only conditionally built into drm_agpsupport.c (#if __OS_HAS_AGP).

Should the call from drm_drv.c be conditional, or should there be a dummy static inline replacement in include/drm/drmP.h for when AGP support isn't available?

Sorry, I missed testing with AGP=n and the code I fixed depended on dead-code-elimination to link correctly. I overlooked that. There is a patch pending on dri-devel:
http://lists.freedesktop.org/archives/dri-devel/2013-August/043077.html

Regards
David

#2 lore raw
Quoted 11 lines · David Herrmann

Hi

Quoted 8 lines · Stephen Warren

In next-20130808, building tegra_defconfig for ARM yields:

Quoted 2 lines

drivers/built-in.o: In function `drm_lastclose':
/home/swarren/shared/git_wa/kernel/kernel.git/drivers/gpu/drm/drm_drv.c:198: undefined reference to `drm_agp_clear'

That's because drm_agp_clear() is called unconditionally, yet is only conditionally built into drm_agpsupport.c (#if __OS_HAS_AGP).

Quoted 8 lines
Quoted 3 lines

Should the call from drm_drv.c be conditional, or should there be a dummy static inline replacement in include/drm/drmP.h for when AGP support isn't available?

Sorry, I missed testing with AGP=n and the code I fixed depended on dead-code-elimination to link correctly. I overlooked that. There is a patch pending on dri-devel:
http://lists.freedesktop.org/archives/dri-devel/2013-August/043077.html

That makes it worse! To solve it, you need:

include/drm/drm_agpsupport.h +1 -1
index f926542..a184eee 100644
@@ -8,7 +8,7 @@
 #include <linux/agp_backend.h>
 #include <drm/drmP.h>
 
-#ifdef __OS_HAS_AGP
+#if __OS_HAS_AGP
 
 void drm_free_agp(DRM_AGP_MEM * handle, int pages);
 int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);
#3 lore raw

Hi

Quoted 16 lines · Stephen Warren
Quoted 15 lines · David Herrmann

Hi

Quoted 11 lines · Stephen Warren

In next-20130808, building tegra_defconfig for ARM yields:

Quoted 2 lines

drivers/built-in.o: In function `drm_lastclose':
/home/swarren/shared/git_wa/kernel/kernel.git/drivers/gpu/drm/drm_drv.c:198: undefined reference to `drm_agp_clear'

That's because drm_agp_clear() is called unconditionally, yet is only conditionally built into drm_agpsupport.c (#if __OS_HAS_AGP).

Should the call from drm_drv.c be conditional, or should there be a dummy static inline replacement in include/drm/drmP.h for when AGP support isn't available?

Quoted 6 lines
Quoted 4 lines

Sorry, I missed testing with AGP=n and the code I fixed depended on dead-code-elimination to link correctly. I overlooked that. There is a patch pending on dri-devel:
http://lists.freedesktop.org/archives/dri-devel/2013-August/043077.html

That makes it worse! To solve it, you need:

Argh! I need some proper build environments to test all the non-x86 stuff. Thanks for the hint, I will resend the patch. Hopefully it'll work this time. Sorry for that..

Thanks
David

Quoted 14 lines
include/drm/drm_agpsupport.h +1 -1
index f926542..a184eee 100644
@@ -8,7 +8,7 @@
 #include <linux/agp_backend.h>
 #include <drm/drmP.h>
 
-#ifdef __OS_HAS_AGP
+#if __OS_HAS_AGP
 
 void drm_free_agp(DRM_AGP_MEM * handle, int pages);
 int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);