[PATCH] drm: drm_drv: Only call drm_agp_clear() in __OS_HAS_AGP case

Fabio Estevam festevam at gmail.com
Thu Aug 8 15:00:10 PDT 2013


From: Fabio Estevam <fabio.estevam at freescale.com>

Commit 28ec711 (drm/agp: move AGP cleanup paths to drm_agpsupport.c) causes the 
following link error on ARM (imx_v6_v7_defconfig):

drivers/built-in.o: In function `drm_lastclose':
:(.text+0x588a0): undefined reference to `drm_agp_clear'
make: *** [vmlinux] Error 1

drm_agp_clear() is defined only '#if __OS_HAS_AGP' is true, so add this 'if'
logic when calling it.

Signed-off-by: Fabio Estevam <fabio.estevam at freescale.com>
---
 drivers/gpu/drm/drm_drv.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index dddd799..58f7f39 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -195,7 +195,9 @@ int drm_lastclose(struct drm_device * dev)
 
 	mutex_lock(&dev->struct_mutex);
 
+#if __OS_HAS_AGP
 	drm_agp_clear(dev);
+#endif
 
 	if (drm_core_check_feature(dev, DRIVER_SG) && dev->sg &&
 	    !drm_core_check_feature(dev, DRIVER_MODESET)) {
-- 
1.8.1.2



More information about the dri-devel mailing list