From 9ae22c87743c624bda593a1ef4bd4eca01c65655 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 5 Jun 2009 09:32:10 +1000 Subject: vgaarb: fixup api and decode rsrc. This fixes up the API and stores the vga arb fd in the sys_pci structure, instead of hiding it in a random dev struct. It also reads back after setting the target and works out the decodes. Signed-off-by: Dave Airlie --- include/pciaccess.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/pciaccess.h b/include/pciaccess.h index fa6787f..2230b27 100644 --- a/include/pciaccess.h +++ b/include/pciaccess.h @@ -380,7 +380,6 @@ struct pci_device { * Used by the VGA arbiter. Type of resource decoded by the device and * the file descriptor (/dev/vga_arbiter). */ int vgaarb_rsrc; - int vgaarb_fd; }; @@ -493,8 +492,8 @@ struct pci_pcmcia_bridge_info { #define VGA_ARB_RSRC_NORMAL_IO 0x04 #define VGA_ARB_RSRC_NORMAL_MEM 0x08 -int pci_device_vgaarb_init (struct pci_device *dev); -void pci_device_vgaarb_fini (struct pci_device *dev); +int pci_device_vgaarb_init (void); +void pci_device_vgaarb_fini (void); int pci_device_vgaarb_set_target (struct pci_device *dev); int pci_device_vgaarb_decodes (struct pci_device *dev); int pci_device_vgaarb_lock (struct pci_device *dev); -- cgit v1.2.3