rpms/xorg-x11-drv-nouveau/devel nouveau-eedid.patch, NONE, 1.1 xorg-x11-drv-nouveau.spec, 1.17, 1.18

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-drv-nouveau.spec 
Added Files:
	nouveau-eedid.patch 
Log Message:
* Fri Feb 27 2009 Adam Jackson <ajax at redhat.com> 0.0.12-6.20090224gitd91fc78
- nouveau-eedid.patch: Do EEDID.


nouveau-eedid.patch:

--- NEW FILE nouveau-eedid.patch ---
diff -up xf86-video-nouveau-0.0.12/src/nv50_connector.c.jx xf86-video-nouveau-0.0.12/src/nv50_connector.c
--- xf86-video-nouveau-0.0.12/src/nv50_connector.c.jx	2009-02-23 18:50:48.000000000 -0500
+++ xf86-video-nouveau-0.0.12/src/nv50_connector.c	2009-02-27 15:17:44.000000000 -0500
@@ -30,7 +30,11 @@ NV50ConnectorGetEDID(nouveauConnectorPtr
 {
 	ScrnInfoPtr pScrn = connector->scrn;
 
+#ifdef EDID_COMPLETE_RAWDATA
+	return xf86DoEEDID(pScrn->scrnIndex, connector->pDDCBus);
+#else
 	return xf86DoEDID_DDC2(pScrn->scrnIndex, connector->pDDCBus);
+#endif
 }
 
 static xf86MonPtr
diff -up xf86-video-nouveau-0.0.12/src/nv_setup.c.jx xf86-video-nouveau-0.0.12/src/nv_setup.c
--- xf86-video-nouveau-0.0.12/src/nv_setup.c.jx	2009-02-23 18:50:48.000000000 -0500
+++ xf86-video-nouveau-0.0.12/src/nv_setup.c	2009-02-27 15:17:06.000000000 -0500
@@ -223,7 +223,13 @@ 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);
+#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");


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-drv-nouveau.spec	24 Feb 2009 00:32:57 -0000	1.17
+++ xorg-x11-drv-nouveau.spec	27 Feb 2009 20:19:07 -0000	1.18
@@ -19,7 +19,7 @@
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   %{nouveau_version}
-Release:   5.%{snapshot}%{?dist}
+Release:   6.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -42,6 +42,7 @@
 Requires:  kernel-drm-nouveau = 12
 
 Patch0: nouveau-fedora.patch
+Patch1: nouveau-eedid.patch
 
 %description 
 X.Org X11 nouveau video driver.
@@ -50,6 +51,7 @@
 %setup -q -n %{tarball}-%{version}
 
 %patch0 -p1 -b .fedora
+%patch1 -p1 -b .eedid
 
 %build
 autoreconf -v --install
@@ -73,6 +75,9 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Fri Feb 27 2009 Adam Jackson <ajax at redhat.com> 0.0.12-6.20090224gitd91fc78
+- nouveau-eedid.patch: Do EEDID.
+
 * Tue Feb 24 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-5.20090224gitd91fc78
 - improve edescription of package