* Dave Airlie <[email protected]> wrote:
> >From 8a874578cbf8b07b988e666c15fa0ba767f3c1cb Mon Sep 17 00:00:00 2001
> From: Dave Airlie <[email protected]>
> Date: Tue, 22 Sep 2009 13:53:00 +1000
> 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 <[email protected]>
> ---
> 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:
> 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® 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-12, 2009. Register now!
http://p.sf.net/sfu/devconf
--
_______________________________________________
Dri-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-devel
