Mark Vojkovich has committed the following fixes to the nv driver in XFree86 CVS since the trees were last sync'ed. Andy Ritger has confirmed these changes are all covered by the Nvidia license and not the XFree86 1.1 license and encouraged their integration into the Xorg tree. Support for new NVIDIA chips. Egbert has a laptop that needs some DPMS ordering reversed. New chip support and workaround for Toshiba M30 laptop issue. PCI-Xpress chip support. DPMS support for DVI. Cursor changes for NV11 so that alpha blended cursors will work in conjunction with dithering (laptop panels). It previously did not. HW support for alpha blended stretch blits on NV5 and higher, though nothing is using them at this point. Add support for VBlank syncing the Xv Blit adaptor on hardware that supports it (NV11 and higher). Make console restoration a little more robust. We were making an assumption that failed on a newer laptop. Workaround for some NV31 DVI artifacts.
Created attachment 1218 [details] [review] [FIXED_X11R68x] Patch to resync nv driver with XFree86 CVS These changes all look reasonable to me, though many of them are unintelligble without the Nvidia specs - but I neither have those, nor a wide range of nvidia cards to test with, nor enough experience to be comfortable committing these without someone else reviewing and/or testing them.
Accepting myself...
Fix committed to CVS head. CVSROOT: /cvs/xorg Module name: xc Changes by: alanc@gabe. 04/11/09 18:53:44 Log message: 2004-11-09 Alan Coopersmith <alan.coopersmith@sun.com> * xc/programs/Xserver/hw/xfree86/drivers/nv/nv.man: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_cursor.c: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dma.h: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_proto.h: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_video.c: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_xaa.c: (Bugzilla #1777) Import Mark Vojkovich's changes to NV driver since last sync with XFree86, including: Support for new NVIDIA chips. Egbert has a laptop that needs some DPMS ordering reversed. New chip support and workaround for Toshiba M30 laptop issue. PCI-Xpress chip support. DPMS support for DVI. Cursor changes for NV11 so that alpha blended cursors will work in conjunction with dithering (laptop panels). It previously did not. HW support for alpha blended stretch blits on NV5 and higher, though nothing is using them at this point. Add support for VBlank syncing the Xv Blit adaptor on hardware that supports it (NV11 and higher). Make console restoration a little more robust. We were making an assumption that failed on a newer laptop. Workaround for some NV31 DVI artifacts. Also add nVidia license statement to nv man page to comply with requirement that it appear in "user documentation" Modified files: ./: ChangeLog xc/programs/Xserver/hw/xfree86/drivers/nv/: nv.man nv_cursor.c nv_dac.c nv_dma.h nv_driver.c nv_hw.c nv_proto.h nv_setup.c nv_type.h nv_video.c nv_xaa.c Revision Changes Path 1.518 +36 -1 xc/ChangeLog 1.3 +41 -2 xc/programs/Xserver/hw/xfree86/drivers/nv/nv.man 1.3 +24 -17 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_cursor.c 1.4 +15 -18 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c 1.3 +7 -1 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dma.h 1.8 +183 -36 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c 1.3 +314 -91 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c 1.3 +2 -1 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_proto.h 1.3 +25 -11 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c 1.3 +7 -1 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h 1.3 +68 -18 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_video.c 1.3 +14 -1 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_xaa.c
Comment on attachment 1218 [details] [review] [FIXED_X11R68x] Patch to resync nv driver with XFree86 CVS Approved for checkin into X11R6.8.x in the 2004-11-12 release-wranglers call.
Committed to XORG-6_8-branch for 6.8.2 release as approved by release-wranglers CVSROOT: /cvs/xorg Module name: xc Changes by: alanc@gabe. 04/11/14 10:13:28 Log message: 2004-11-14 Alan Coopersmith <alan.coopersmith@sun.com> * xc/programs/Xserver/hw/xfree86/drivers/nv/nv.man: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_cursor.c: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dma.h: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_proto.h: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_video.c: * xc/programs/Xserver/hw/xfree86/drivers/nv/nv_xaa.c: (Bugzilla #1777) Import Mark Vojkovich's changes to NV driver since last sync with XFree86, including: Support for new NVIDIA chips. Egbert has a laptop that needs some DPMS ordering reversed. New chip support and workaround for Toshiba M30 laptop issue. PCI-Xpress chip support. DPMS support for DVI. Cursor changes for NV11 so that alpha blended cursors will work in conjunction with dithering (laptop panels). It previously did not. HW support for alpha blended stretch blits on NV5 and higher, though nothing is using them at this point. Add support for VBlank syncing the Xv Blit adaptor on hardware that supports it (NV11 and higher). Make console restoration a little more robust. We were making an assumption that failed on a newer laptop. Workaround for some NV31 DVI artifacts. Also add nVidia license statement to nv man page to comply with requirement that it appear in "user documentation" Modified files: ./: Tag: XORG-6_8-branch ChangeLog xc/programs/Xserver/hw/xfree86/drivers/nv/: Tag: XORG-6_8-branch nv.man nv_cursor.c nv_dac.c nv_dma.h nv_driver.c nv_hw.c nv_proto.h nv_setup.c nv_type.h nv_video.c nv_xaa.c Revision Changes Path 1.365.2.4 +38 -1 xc/ChangeLog 1.2.4.1 +41 -2 xc/programs/Xserver/hw/xfree86/drivers/nv/nv.man 1.2.4.1 +24 -17 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_cursor.c 1.2.4.1 +15 -20 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c 1.2.4.1 +7 -1 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dma.h 1.5.2.1 +190 -31 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c 1.2.4.1 +314 -91 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c 1.2.4.1 +2 -1 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_proto.h 1.2.4.1 +25 -11 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c 1.2.4.1 +7 -1 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h 1.2.4.1 +68 -18 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_video.c 1.2.4.1 +14 -1 xc/programs/Xserver/hw/xfree86/drivers/nv/nv_xaa.c
*** Bug 1938 has been marked as a duplicate of this bug. ***
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.