[PATCH] drm: Fix build failure in radeon and i915 drivers

From: Ingo Molnar
Date: Mon Sep 21 2009 - 12:12:07 EST


this build failure:

drivers/built-in.o: In function `drm_irq_uninstall':
(.text+0xb719e): undefined reference to `vga_client_register'
drivers/built-in.o: In function `drm_irq_install':
(.text+0xb7309): undefined reference to `vga_client_register'
drivers/built-in.o: In function `radeon_device_fini':
(.text+0xe400f): undefined reference to `vga_client_register'
drivers/built-in.o: In function `radeon_device_init':
(.text+0xe455b): undefined reference to `vga_client_register'

got introduced with upstream merge 44040f1.

At first sight it appears to be due to CONFIG_DRM_RADEON relying on
VGA_ARB facilities but this is not expressed in the Kconfig rules.

drm_irq.o relies on it too - so the whole DRM facilities relies
on VGA_ARB. I've added a select to express this dependency.

VGA_ARB is not a simple option, it depends on PCI, so in theory
select is not safe - but this is a special case since DRM itself
depends on PCI too.

Cc: torvalds@xxxxxxxxxxxxxxxxxxxx
Cc: dri-devel@xxxxxxxxxxxx
Cc: Dave Airlie <airlied@xxxxxxxx>
LKML-Reference: <20090921161207.GA9741@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
drivers/gpu/drm/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index e4d971c..6c54422 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -9,6 +9,7 @@ menuconfig DRM
depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG && MMU
select I2C
select I2C_ALGOBIT
+ select VGA_ARB
help
Kernel-level support for the Direct Rendering Infrastructure (DRI)
introduced in XFree86 4.0. If you say Y here, you need to select
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/