diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-07-09 16:51:58 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-07-09 16:51:58 +0000 |
| commit | 80ac36ec4fbbd9a4aae1bde01fe6ebc1088fa8cb (patch) | |
| tree | ef4fb3b3e269a4e040e1acac85e731522cf74abc /src/nv_dac.c | |
| parent | 6b75bc13462f1cfb735fe1de359ed9e45b5f4415 (diff) | |
Bug #3740 <https://bugs.freedesktop.org/show_bug.cgi?id=3740> Patch #3058
<https://bugs.freedesktop.org/attachment.cgi?id=3058>
08-Jul-2005 nv driver updates from Mark Vojkovich:
Change some console restore code for NV11. Hopefully, we can more reliably
restore the console for desktop systems using DVI. This may correct a
recent regression on NV11.
Also, new PCI IDs.
Add new nVidia PCI ids to match nv_driver.c changes.
Diffstat (limited to 'src/nv_dac.c')
| -rw-r--r-- | src/nv_dac.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nv_dac.c b/src/nv_dac.c index f62db58..463fde5 100644 --- a/src/nv_dac.c +++ b/src/nv_dac.c @@ -37,7 +37,7 @@ |* *| \***************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c,v 1.44 2004/12/09 00:21:04 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c,v 1.45 2005/07/09 00:53:00 mvojkovi Exp $ */ #include "nv_include.h" @@ -92,7 +92,9 @@ NVDACInit(ScrnInfoPtr pScrn, DisplayModePtr mode) vgaRegPtr pVga; /* - * This will initialize all of the generic VGA registers. + * Initialize all of the generic VGA registers. Don't bother with + * VGA_FIX_SYNC_PULSES, given the relevant CRTC settings are overridden + * below. Ditto for the KGA workaround. */ if (!vgaHWInit(pScrn, mode)) return(FALSE); @@ -310,7 +312,7 @@ NVDACSave(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, NVRegPtr nvReg, /* can't read this reliably on NV11 */ if((pNv->Chipset & 0x0ff0) == 0x0110) - nvReg->crtcOwner = ((pNv->Chipset & 0x0fff) == 0x0112) ? 3 : 0; + nvReg->crtcOwner = pNv->CRTCnumber; } #define DEPTH_SHIFT(val, w) ((val << (8 - w)) | (val >> ((w << 1) - 8))) |