Re: intelfb: enable on x86_64

Re: intelfb: enable on x86_64

[Dave Jones]

On Tue, Jun 20, 2006 at 03:12:00AM +0000, Linux Kernel wrote:
 > commit 0c187addabbaf93512902442b4a90140a21b0ddc
 > tree 40cd618a76474ec9ba2cfde129315c7ebbaf4f9f
 > parent 16109b3f4c1f2635afd32eb6d49348590de2cb25
 > author Dave Airlie <airlied@linux.ie> Thu, 23 Mar 2006 11:20:08 +1100
 > committer Dave Airlie <airlied@linux.ie> Mon, 03 Apr 2006 11:43:28 +1000
 > 
 > intelfb: enable on x86_64
 > 
 > i945G chipsets supports 64-bit.
 > 
 > Signed-off-by: Dave Airlie <airlied@linux.ie>
 > 
 >  drivers/video/Kconfig |    2 +-
 >  1 files changed, 1 insertion(+), 1 deletion(-)
 > 
 > diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
 > index f87c017..190adce 100644
 > --- a/drivers/video/Kconfig
 > +++ b/drivers/video/Kconfig
 > @@ -741,7 +741,7 @@ config FB_I810_I2C
 >  
 >  config FB_INTEL
 >  	tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)"
 > -	depends on FB && EXPERIMENTAL && PCI && X86_32
 > +	depends on FB && EXPERIMENTAL && PCI && X86
 >  	select AGP
 >  	select AGP_INTEL
 >  	select FB_MODE_HELPERS

This turned into an unpleasant surprise.
If you select for eg, IOMMU=y and CONFIG_AGP=y, and CONFIG_FB_INTEL=m,
then CONFIG_AGP gets silently turned into a =m, and the build fails with this..

arch/x86_64/kernel/pci-gart.c:619: undefined reference to `agp_amd64_init'
arch/x86_64/kernel/pci-gart.c:619: undefined reference to `agp_bridge'
arch/x86_64/kernel/pci-gart.c:619: undefined reference to `agp_copy_info'

		Dave

-- 
http://www.codemonkey.org.uk

Re: intelfb: enable on x86_64

[Dave Jones]

On Thu, Jun 22, 2006 at 02:18:49PM -0400, Dave Jones wrote:

 > If you select for eg, IOMMU=y and CONFIG_AGP=y, and CONFIG_FB_INTEL=m,
 > then CONFIG_AGP gets silently turned into a =m, and the build fails with this..
 > 
 > arch/x86_64/kernel/pci-gart.c:619: undefined reference to `agp_amd64_init'
 > arch/x86_64/kernel/pci-gart.c:619: undefined reference to `agp_bridge'
 > arch/x86_64/kernel/pci-gart.c:619: undefined reference to `agp_copy_info'

This seems to work around it..

Signed-off-by: Dave Jones <davej@redhat.com>

--- linux-2.6.17.noarch/drivers/video/Kconfig~	2006-06-22 14:27:13.000000000 -0400
+++ linux-2.6.17.noarch/drivers/video/Kconfig	2006-06-22 14:27:27.000000000 -0400
@@ -807,8 +807,8 @@ config FB_I810_I2C
 config FB_INTEL
 	tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)"
 	depends on FB && EXPERIMENTAL && PCI && X86 && !VGA_NOPROBE
-	select AGP
-	select AGP_INTEL
+	depends on AGP
+	depends on AGP_INTEL
 	select FB_MODE_HELPERS
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA

-- 
http://www.codemonkey.org.uk