[PATCH] i915, drm: Fix build dependency on VGA_ARB

[Ben Hutchings]

On Thu, Aug 26, 2010 at 05:29:54PM +0200, Carlos R. Mafra wrote:
> On Do 26.Aug'10 at 16:59:18 +0200, Borislav Petkov wrote:
> > I get:
> > 
> >   LD      init/built-in.o
> >   LD      .tmp_vmlinux1
> > drivers/built-in.o: In function `intel_modeset_init':
> > (.text+0xa993f): undefined reference to `vga_get'
> > drivers/built-in.o: In function `intel_modeset_init':
> > (.text+0xa9963): undefined reference to `vga_put'
> > make: *** [.tmp_vmlinux1] Error 1
> > 
> > since CONFIG_AGB_ARB is not being selected. Make I915 driver select it
> > as the numerous other things it selects.
> > 
> > Signed-off-by: Borislav Petkov <bp at alien8.de>
> > ---
> > 
> > This is on latest Linus git (v2.6.36-rc2-237-gd4348c6) after doing `make
> > oldconfig' on an Acer Aspire One netbook.
> > 
> >  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 4cab0c6..43590ab 100644
> > --- a/drivers/gpu/drm/Kconfig
> > +++ b/drivers/gpu/drm/Kconfig
> > @@ -97,6 +97,7 @@ config DRM_I830
> >  config DRM_I915
> >  	tristate "i915 driver"
> >  	depends on AGP_INTEL
> > +	select VGA_ARB
> >  	select SHMEM
> >  	select DRM_KMS_HELPER
> >  	select FB_CFB_FILLRECT
> 
> I reported this build failure here:
> 
> http://lkml.org/lkml/2010/8/23/127
> 
> Is there no other way to fix this? From the Kconfig description
> of VGA_ARB I thought I would not need this (and it's a new thing too),
> so why make my kernel bigger so easily?

<linux/vgaarb.h> should define dummy inline functions if CONFIG_VGA_ARB
is not defined.  It already does this for vga_client_register() but should
cover the other functions as well.

Ben.

-- 
Ben Hutchings
We get into the habit of living before acquiring the habit of thinking.
                                                              - Albert Camus