Date: Mon, 21 Sep 2009 18:50:39 +0200
From: Ingo Molnar <mingo@elte.hu>
To: Dave Airlie <airlied@linux.ie>
Cc: torvalds@linux-foundation.org, dri-devel@lists.sf.net,
       linux-kernel@vger.kernel.org
Subject: [PATCH] drm: Fix build failure in radeon and i915 drivers
Message-ID: <20090921165039.GA29050@elte.hu>
References: <alpine.DEB.2.00.0909210610200.26881@skynet.skynet.ie> <20090921161207.GA9741@elte.hu>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20090921161207.GA9741@elte.hu>
User-Agent: Mutt/1.5.18 (2008-05-17)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 3221
Lines: 84


* Ingo Molnar <mingo@elte.hu> wrote:

> there's a new 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'
> 
> with the attached config, 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. The 
> patch below solves this - but this is just a quick patch, i have not 
> investigated any deeper.
> 
> Review of the code suggests that i915 has a similar dependency problem 
> - i fixed that too.

i've looked some more and drm_irq.o depends on vga-arb too so the patch 
below is the more complete fix IMHO.

	Ingo

------------------>
>From 0186c202fefd70291ef3b29e34543083d24f026d Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 21 Sep 2009 18:12:07 +0200
Subject: [PATCH] drm: Fix build failure in radeon and i915 drivers

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@linux-foundation.org
Cc: dri-devel@lists.sf.net
Cc: Dave Airlie <airlied@linux.ie>
LKML-Reference: <20090921161207.GA9741@elte.hu>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 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@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/