From 8aeadbff0840efc0c9a073e60d6fec0dba313060 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 2 Sep 2009 19:07:40 +1000 Subject: vgaarb: if arb init fails, make sure locking doesn't occur. pointed out by Martin Jansa on irc. Signed-off-by: Dave Airlie --- hw/xfree86/common/xf86VGAarbiter.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'hw/xfree86') 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(); } -- cgit v1.2.3