rpms/xorg-x11-drv-nv/devel nv-2.1.12-eedid.patch, NONE, 1.1 xorg-x11-drv-nv.spec, 1.83, 1.84

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20660

Modified Files:
	xorg-x11-drv-nv.spec 
Added Files:
	nv-2.1.12-eedid.patch 
Log Message:
* Fri Feb 27 2009 Adam Jackson <ajax at redhat.com> 2.1.12-11
- nv-2.1.12-eedid.patch: Do E-EDID.


nv-2.1.12-eedid.patch:

--- NEW FILE nv-2.1.12-eedid.patch ---
commit 52c034f5a41195f2b3193ec8c18b3f4ed7a763a3
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Nov 3 15:01:58 2008 -0500

    Do E-EDID if built against a server that supports it.

diff --git a/src/g80_output.c b/src/g80_output.c
index e906fbb..420a73e 100644
--- a/src/g80_output.c
+++ b/src/g80_output.c
@@ -307,7 +307,11 @@ ProbeDDC(I2CBusPtr i2c)
             "Probing for EDID on I2C bus %i...\n", bus);
     pNv->reg[addr/4] = 7;
     /* Should probably use xf86OutputGetEDID here */
+#ifdef EDID_COMPLETE_RAWDATA
+    monInfo = xf86DoEEDID(pScrn->scrnIndex, i2c, TRUE);
+#else
     monInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, i2c);
+#endif
     pNv->reg[addr/4] = 3;
 
     if(monInfo) {
diff --git a/src/nv_setup.c b/src/nv_setup.c
index bea0050..132a96b 100644
--- a/src/nv_setup.c
+++ b/src/nv_setup.c
@@ -229,7 +229,12 @@ NVProbeDDC (ScrnInfoPtr pScrn, int bus)
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
                "Probing for EDID on I2C bus %s...\n", bus ? "B" : "A");
 
-    if ((MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, pNv->I2C))) {
+#ifdef EDID_COMPLETE_RAWDATA
+    MonInfo = xf86DoEEDID(pScrn->scrnIndex, pNv->I2C, TRUE);
+#else
+    MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, pNv->I2C);
+#endif
+    if (MonInfo) {
        xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
                   "DDC detected a %s:\n", MonInfo->features.input_type ?
                   "DFP" : "CRT");
diff --git a/src/riva_setup.c b/src/riva_setup.c
index b7352b6..b616798 100644
--- a/src/riva_setup.c
+++ b/src/riva_setup.c
@@ -167,7 +167,12 @@ RivaProbeDDC (ScrnInfoPtr pScrn)
 
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Probing for EDID...\n");
 
-    if ((MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, pRiva->I2C))) {
+#ifdef EDID_COMPLETE_RAWDATA
+    MonInfo = xf86DoEEDID(pScrn->scrnIndex, pRiva->I2C, TRUE);
+#else
+    MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, pRiva->I2C);
+#endif
+    if (MonInfo) {
        xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                   "  ... found one\n");
        xf86PrintEDID( MonInfo );


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- xorg-x11-drv-nv.spec	26 Feb 2009 10:59:31 -0000	1.83
+++ xorg-x11-drv-nv.spec	27 Feb 2009 19:52:47 -0000	1.84
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.12
-Release:   10%{?dist}
+Release:   11%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -31,6 +31,7 @@
 Patch7:	    nv-save-rom.patch
 Patch9:	    nv-2.1.8-g80-no-doublescan.patch
 Patch10:    nv-2.1.12-gf7025-gf7050.patch
+Patch11:    nv-2.1.12-eedid.patch
 
 %description 
 X.Org X11 nv video driver.
@@ -45,6 +46,7 @@
 %patch7 -p1 -b .save-rom
 %patch9 -p1 -b .doublescan
 %patch10 -p1 -b .nv6x
+%patch11 -p1 -b .eedid
 
 %build
 %configure --disable-static
@@ -71,6 +73,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Fri Feb 27 2009 Adam Jackson <ajax at redhat.com> 2.1.12-11
+- nv-2.1.12-eedid.patch: Do E-EDID.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.12-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild