diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-03 12:12:18 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-03 12:12:18 +0000 |
| commit | 5f179e796d1cd310790d06eebb474ad67114ec84 (patch) | |
| tree | c641c75b0634ce78b68e308cabfc89192536bf0a /src/atilock.c | |
| parent | 493c44580191beff63575c4032f772fbbf1b06eb (diff) | |
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004xf86-4_4_0STSF-CURRENT
Diffstat (limited to 'src/atilock.c')
| -rw-r--r-- | src/atilock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/atilock.c b/src/atilock.c index 031d514..a6d5cda 100644 --- a/src/atilock.c +++ b/src/atilock.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atilock.c,v 1.20 2004/01/05 16:42:02 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atilock.c,v 1.20tsi Exp $ */ /* * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * @@ -143,7 +143,7 @@ ATIUnlock /* * Prevent BIOS initiated display switches on dual-CRT controllers. */ - if (pATI->Chip != ATI_CHIP_264XL) + if (!pATI->OptionBIOSDisplay && (pATI->Chip != ATI_CHIP_264XL)) { pATI->LockData.scratch_reg3 = inr(SCRATCH_REG3); outr(SCRATCH_REG3, @@ -566,7 +566,7 @@ ATILock if ((pATI->LCDPanelID >= 0) && (pATI->Chip != ATI_CHIP_264LT)) { outr(LCD_INDEX, pATI->LockData.lcd_index); - if (pATI->Chip != ATI_CHIP_264XL) + if (!pATI->OptionBIOSDisplay && (pATI->Chip != ATI_CHIP_264XL)) outr(SCRATCH_REG3, pATI->LockData.scratch_reg3); } if (pATI->Chip >= ATI_CHIP_264VTB) |