Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vgaarb: make client interface config invariant.

Browse source 
Fixes build when VGA_ARB is off.

Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Ingo Molnar 2009-09-23 09:52:18 +10:00 committed by Dave Airlie
parent 7fa07729e4
commit 7c329288d7
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/linux/vgaarb.h
View file

@ -41,7 +41,7 @@
* interrupts at any time. * interrupts at any time.
*/ */
extern void vga_set_legacy_decoding(struct pci_dev *pdev, extern void vga_set_legacy_decoding(struct pci_dev *pdev,
unsigned int decodes); unsigned int decodes);
/** /**
* vga_get - acquire & locks VGA resources * 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 * They driver will get a callback when VGA arbitration is first used
* by userspace since we some older X servers have issues. * 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, int vga_client_register(struct pci_dev *pdev, void *cookie,
void (*irq_set_state)(void *cookie, bool state), void (*irq_set_state)(void *cookie, bool state),
unsigned int (*set_vga_decode)(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
#endif /* LINUX_VGA_H */ #endif /* LINUX_VGA_H */