Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 04cbe1de6fbda9649a6f25666194e6955d3e717e

Authored by Chris Wilson
Committed by Dave Airlie
1 parent 30f4437202
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

vgaarb: Wrap vga_(get|put) in CONFIG_VGA_ARB 

Fix link failure without the vga arbitrator.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

Showing 1 changed file with 13 additions and 2 deletions Side-by-side Diff

include/linux/vgaarb.h
Diff comments   View file @ 04cbe1d
... ... @@ -93,8 +93,11 @@
93 93 * Nested calls are supported (a per-resource counter is maintained)
94 94 */
95 95  
96   -extern int vga_get(struct pci_dev *pdev, unsigned int rsrc,
97   - int interruptible);
  96 +#if defined(CONFIG_VGA_ARB)
  97 +extern int vga_get(struct pci_dev *pdev, unsigned int rsrc, int interruptible);
  98 +#else
  99 +static inline int vga_get(struct pci_dev *pdev, unsigned int rsrc, int interruptible) { return 0; }
  100 +#endif
98 101  
99 102 /**
100 103 * vga_get_interruptible
101 104  
... ... @@ -131,7 +134,11 @@
131 134 * are already locked by another card. It can be called in any context
132 135 */
133 136  
  137 +#if defined(CONFIG_VGA_ARB)
134 138 extern int vga_tryget(struct pci_dev *pdev, unsigned int rsrc);
  139 +#else
  140 +static inline int vga_tryget(struct pci_dev *pdev, unsigned int rsrc) { return 0; }
  141 +#endif
135 142  
136 143 /**
137 144 * vga_put - release lock on legacy VGA resources
138 145  
... ... @@ -146,7 +153,11 @@
146 153 * released if the counter reaches 0.
147 154 */
148 155  
  156 +#if defined(CONFIG_VGA_ARB)
149 157 extern void vga_put(struct pci_dev *pdev, unsigned int rsrc);
  158 +#else
  159 +#define vga_put(pdev, rsrc)
  160 +#endif
150 161  
151 162  
152 163 /**