diff options
| author | Dave Airlie <airlied@linux.ie> | 2009-09-02 19:07:40 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2009-09-02 19:09:14 +1000 |
| commit | 8aeadbff0840efc0c9a073e60d6fec0dba313060 (patch) | |
| tree | 6ae6af4c50d48431270a25d288092b6c1c357f83 | |
| parent | 0e46066efea4e385b2874d4a62a786957e572fe5 (diff) | |
vgaarb: if arb init fails, make sure locking doesn't occur.
pointed out by Martin Jansa on irc.
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | hw/xfree86/common/xf86VGAarbiter.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c index f8a288234..f02ccf50d 100644 --- a/hw/xfree86/common/xf86VGAarbiter.c +++ b/hw/xfree86/common/xf86VGAarbiter.c @@ -93,6 +93,8 @@ xf86VGAarbiterFini(void) void xf86VGAarbiterLock(ScrnInfoPtr pScrn) { + if (vga_no_arb) + return; pci_device_vgaarb_set_target(pScrn->vgaDev); pci_device_vgaarb_lock(); } @@ -100,6 +102,8 @@ xf86VGAarbiterLock(ScrnInfoPtr pScrn) void xf86VGAarbiterUnlock(ScrnInfoPtr pScrn) { + if (vga_no_arb) + return; pci_device_vgaarb_unlock(); } |