Bug 1985 - sync to 12/08/04 version of Nvidia driver from Mark Vojkovich
Summary: sync to 12/08/04 version of Nvidia driver from Mark Vojkovich
Status: RESOLVED FIXED
Alias: None
Product: xorg
Classification: Unclassified
Component: Driver/nVidia (open) (show other bugs)
Version: git
Hardware: x86 (IA32) All
: high normal
Assignee: Alan Coopersmith
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on: 1777
Blocks:
  Show dependency treegraph
 
Reported: 2004-12-01 14:32 UTC by Alan Coopersmith
Modified: 2004-12-14 22:42 UTC (History)
1 user (show)

See Also:
i915 platform:
i915 features:


Attachments
[FIXED_X11R68x] Patch to Xorg CVS head to apply the latest changes from Mark Vojkovich (13.99 KB, patch)
2004-12-09 17:47 UTC, Alan Coopersmith
roland.mainz: 6.8-branch+
Details | Splinter Review

Description Alan Coopersmith 2004-12-01 14:32:53 UTC
Mark Vojkovich committed fixes to the nv driver for this - they should be 
reviewed to see if they should be pulled into the Xorg tree version of the nv
driver as well:

Changes by:	mvojkovi@public.xfree86.org.	04/11/30 15:50:26

Log message:
    Fix some DAC/Graphics memory contention issues on newer NVIDIA
  chips (specifically, NV40).

Modified files:
      xc/programs/Xserver/hw/xfree86/drivers/nv/:
        nv_dac.c nv_hw.c nv_type.h 
  
  Revision      Changes    Path
  1.43          +4 -1      xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c
  1.12          +41 -17    xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c
  1.49          +2 -1      xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h
Comment 1 Roland Mainz 2004-12-04 20:03:14 UTC
Alan:
Can you attach a patch here (and commit it to Xorg trunk and request approval
for X11R6.8.x if you want :) , please ?
Comment 2 Alan Coopersmith 2004-12-09 17:27:25 UTC
More updates:

Changes by:	mvojkovi@public.xfree86.org.	04/12/08 16:21:05

Log message:
    More PCI IDs.
    Also, I've had trouble getting some panels to work automagically
  so I expose an FPTweak option to let the user adjust a troublesome
  register.

Modified files:
      xc/programs/Xserver/hw/xfree86/drivers/nv/:
        nv_dac.c nv_driver.c nv_hw.c nv_setup.c nv_type.h 
  
  Revision      Changes    Path
  1.44          +31 -1     xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c
  1.130         +23 -9     xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c
  1.13          +6 -18     xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c
  1.44          +4 -6      xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c
  1.50          +4 -1      xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h
Comment 3 Alan Coopersmith 2004-12-09 17:47:04 UTC
Created attachment 1504 [details] [review]
[FIXED_X11R68x] Patch to Xorg CVS head to apply the latest changes from Mark Vojkovich

Only contains changes from Mark, does not contain general XFree86 changes from
other contributors
Comment 4 Alan Coopersmith 2004-12-09 19:58:19 UTC
Committed to CVS head:

CVSROOT:	/cvs/xorg
Module name:	xc
Changes by:	alanc@gabe.freedesktop.org	04/12/09 19:56:42

Log message:
  2004-12-09  Alan Coopersmith  <alan.coopersmith@sun.com>
  
  	* programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c:
  	* programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c:
  	* programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c:
  	* programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c:
  	* programs/Xserver/hw/xfree86/drivers/nv/nv_type.h:
  	Bugzilla #1985 <https://bugs.freedesktop.org/show_bug.cgi?id=1985>
  	sync to 12/08/04 version of Nvidia driver from Mark Vojkovich,
  	including these fixes since last sync:
  	    Fix some DAC/Graphics memory contention issues on newer
  	    NVIDIA chips (specifically, NV40).
  	    More PCI IDs.
  	    Also, I've had trouble getting some panels to work
  	    automagically so I expose an FPTweak option to let the user
  	    adjust a troublesome register.

Modified files:
      ./:
        ChangeLog 
      xc/programs/Xserver/hw/xfree86/drivers/nv/:
        nv_dac.c nv_driver.c nv_hw.c nv_setup.c nv_type.h 
  
  Revision      Changes    Path
  1.588         +18 -1     xc/ChangeLog
  1.5           +34 -1     xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c
  1.9           +23 -10    xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c
  1.4           +46 -34    xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c
  1.4           +4 -6      xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c
  1.4           +5 -1      xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h

Comment 5 Roland Mainz 2004-12-14 11:45:00 UTC
Comment on attachment 1504 [details] [review]
[FIXED_X11R68x] Patch to Xorg CVS head to apply the latest changes from Mark Vojkovich

Approval for X11R6.8.x stable branch granted in the 2004-12-13
release-wranglers phone call.
Please don't commit yourself, I'll do that myself...
Comment 6 Roland Mainz 2004-12-15 17:42:59 UTC
Comment on attachment 1504 [details] [review]
[FIXED_X11R68x] Patch to Xorg CVS head to apply the latest changes from Mark Vojkovich

Patch checked-in into X11R6.8.x stable branch:

/cvs/xorg/xc/ChangeLog,v  <--  ChangeLog
new revision: 1.365.2.94; previous revision: 1.365.2.93
cvs commit: Using deprecated info format strings.  Convert your scripts to use
the new argument format and remove '1's from your info file format strings.
/cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c,v	<--  nv_dac.c
new revision: 1.2.4.2; previous revision: 1.2.4.1
/cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v  <-- 
nv_driver.c
new revision: 1.5.2.2; previous revision: 1.5.2.1
/cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c,v  <--  nv_hw.c
new revision: 1.2.4.2; previous revision: 1.2.4.1
/cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v  <-- 
nv_setup.c
new revision: 1.2.4.2; previous revision: 1.2.4.1
/cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h,v  <--  nv_type.h
new revision: 1.2.4.2; previous revision: 1.2.4.1
cvs commit: Using deprecated info format strings.  Convert your scripts to use
the new argument format and remove '1's from your info file format strings.
Mailing the commit message to xorg-commit@lists.freedesktop.org...


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.