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>
This commit is contained in:
parent
0e46066efe
commit
8aeadbff08
|
@ -93,6 +93,8 @@ xf86VGAarbiterFini(void)
|
||||||
void
|
void
|
||||||
xf86VGAarbiterLock(ScrnInfoPtr pScrn)
|
xf86VGAarbiterLock(ScrnInfoPtr pScrn)
|
||||||
{
|
{
|
||||||
|
if (vga_no_arb)
|
||||||
|
return;
|
||||||
pci_device_vgaarb_set_target(pScrn->vgaDev);
|
pci_device_vgaarb_set_target(pScrn->vgaDev);
|
||||||
pci_device_vgaarb_lock();
|
pci_device_vgaarb_lock();
|
||||||
}
|
}
|
||||||
|
@ -100,6 +102,8 @@ xf86VGAarbiterLock(ScrnInfoPtr pScrn)
|
||||||
void
|
void
|
||||||
xf86VGAarbiterUnlock(ScrnInfoPtr pScrn)
|
xf86VGAarbiterUnlock(ScrnInfoPtr pScrn)
|
||||||
{
|
{
|
||||||
|
if (vga_no_arb)
|
||||||
|
return;
|
||||||
pci_device_vgaarb_unlock();
|
pci_device_vgaarb_unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user