Re: [origin tree build failure] [PATCH] Re: [git pull] drm tree.

[Dave Airlie]

> > Subject: [PATCH] vgaarb: wrap the client register API so we can disable VGA ARB.
> > 
> > This provides an dummy register function so everything builds
> > if VGA arb is turned off.
> > 
> > Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
> > ---
> >  include/linux/vgaarb.h |   11 ++++++++++-
> >  1 files changed, 10 insertions(+), 1 deletions(-)
> 
> btw., i hope you have not commited this yet, there's a trivial problem 
> with this patch:

oops, i was going to push it to jbarnes after I had a chance to play with
it.

I'll clean it up and send it to jbarnes tomorrow.

Dave.

> 
> > diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
> > index e81c64a..b0feb79 100644
> > --- a/include/linux/vgaarb.h
> > +++ b/include/linux/vgaarb.h
> > @@ -41,7 +41,7 @@
> >   *     interrupts at any time.
> >   */
> >  extern void vga_set_legacy_decoding(struct pci_dev *pdev,
> > -									unsigned int decodes);
> > +				    unsigned int decodes);
> >  
> >  /**
> >   *     vga_get         - acquire & locks VGA resources
> > @@ -193,8 +193,17 @@ static inline int vga_conflicts(struct pci_dev *p1, struct pci_dev *p2)
> >   * They driver will get a callback when VGA arbitration is first used
> >   * by userspace since we some older X servers have issues.
> >   */
> > +#if defined(CONFIG_VGA_ARB)
> >  int vga_client_register(struct pci_dev *pdev, void *cookie,
> >  			void (*irq_set_state)(void *cookie, bool state),
> >  			unsigned int (*set_vga_decode)(void *cookie, bool state));
> > +#else
> > +static inline int vga_client_register(struct pci_dev *pdev, void *cookie,
> > +				      void (*irq_set_state)(void *cookie, bool state),
> > +				      unsigned int (*set_vga_decode)(void *cookie, bool state));
> > +{
> > +	return 0;
> > +}
> > +#endif
> 
> that ';' in the inline prototype is bogus, this wont build.
> 
> 	Ingo
> 
> ------------------------------------------------------------------------------
> Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
> is the only developer event you need to attend this year. Jumpstart your
> developing skills, take BlackBerry mobile applications to market and stay 
> ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
> http://p.sf.net/sfu/devconf
> --
> _______________________________________________
> Dri-devel mailing list
> Dri-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.sourceforge.net/lists/listinfo/dri-devel
> 
> 
--
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/