|
@@ -93,8 +93,11 @@ extern void vga_set_legacy_decoding(struct pci_dev *pdev,
|
|
|
* Nested calls are supported (a per-resource counter is maintained)
|
|
|
*/
|
|
|
|
|
|
-extern int vga_get(struct pci_dev *pdev, unsigned int rsrc,
|
|
|
- int interruptible);
|
|
|
+#if defined(CONFIG_VGA_ARB)
|
|
|
+extern int vga_get(struct pci_dev *pdev, unsigned int rsrc, int interruptible);
|
|
|
+#else
|
|
|
+static inline int vga_get(struct pci_dev *pdev, unsigned int rsrc, int interruptible) { return 0; }
|
|
|
+#endif
|
|
|
|
|
|
/**
|
|
|
* vga_get_interruptible
|
|
@@ -131,7 +134,11 @@ static inline int vga_get_uninterruptible(struct pci_dev *pdev,
|
|
|
* are already locked by another card. It can be called in any context
|
|
|
*/
|
|
|
|
|
|
+#if defined(CONFIG_VGA_ARB)
|
|
|
extern int vga_tryget(struct pci_dev *pdev, unsigned int rsrc);
|
|
|
+#else
|
|
|
+static inline int vga_tryget(struct pci_dev *pdev, unsigned int rsrc) { return 0; }
|
|
|
+#endif
|
|
|
|
|
|
/**
|
|
|
* vga_put - release lock on legacy VGA resources
|
|
@@ -146,7 +153,11 @@ extern int vga_tryget(struct pci_dev *pdev, unsigned int rsrc);
|
|
|
* released if the counter reaches 0.
|
|
|
*/
|
|
|
|
|
|
+#if defined(CONFIG_VGA_ARB)
|
|
|
extern void vga_put(struct pci_dev *pdev, unsigned int rsrc);
|
|
|
+#else
|
|
|
+#define vga_put(pdev, rsrc)
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
/**
|