rpms/xorg-x11-drv-nv/devel nv-2.1.6-panel-fix.patch, NONE, 1.1 xorg-x11-drv-nv.spec, 1.64, 1.65

[Adam Jackson (ajax)]

Author: ajax

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

Modified Files:
	xorg-x11-drv-nv.spec 
Added Files:
	nv-2.1.6-panel-fix.patch 
Log Message:
* Tue Feb 12 2008 Adam Jackson <ajax at redhat.com> 2.1.6-8
- nv-2.1.6-panel-fix.patch: Don't discard EDID blocks just because their
  input type bit disagrees with the hardware connection sensing; this
  usually just means the block is lying. (#294861)


nv-2.1.6-panel-fix.patch:

--- NEW FILE nv-2.1.6-panel-fix.patch ---
diff -up xf86-video-nv-2.1.6/src/nv_setup.c.jx xf86-video-nv-2.1.6/src/nv_setup.c
--- xf86-video-nv-2.1.6/src/nv_setup.c.jx	2007-09-17 17:17:51.000000000 -0400
+++ xf86-video-nv-2.1.6/src/nv_setup.c	2008-02-12 10:19:54.000000000 -0500
@@ -668,27 +668,14 @@ NVCommonSetup(ScrnInfoPtr pScrn)
        }
      
        if(monitorA) {
-           if((monitorA->features.input_type && pNv->FlatPanel) ||
-              (!monitorA->features.input_type && !pNv->FlatPanel))
-           {
-               if(monitorB) { 
-                  xfree(monitorB);
-                  monitorB = NULL;
-               }
-           } else {
-              xfree(monitorA);
-              monitorA = NULL;
-           }
+	   if(monitorB) { 
+	       xfree(monitorB);
+	       monitorB = NULL;
+	   }
        }
 
        if(monitorB) {
-           if((monitorB->features.input_type && !pNv->FlatPanel) ||
-              (!monitorB->features.input_type && pNv->FlatPanel)) 
-           {
-              xfree(monitorB);
-           } else {
-              monitorA = monitorB;
-           }
+           monitorA = monitorB;
            monitorB = NULL;
        }
 


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.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- xorg-x11-drv-nv.spec	23 Jan 2008 18:26:52 -0000	1.64
+++ xorg-x11-drv-nv.spec	12 Feb 2008 15:27:41 -0000	1.65
@@ -9,7 +9,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.6
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -36,6 +36,7 @@
 Patch3:     nouveau-alloca.patch
 Patch4:     nv-reserve-fbarea.patch
 Patch5:	    nv-2.1.6-starvation.patch
+Patch6:	    nv-2.1.6-panel-fix.patch
 
 %description 
 X.Org X11 nv video driver.
@@ -56,6 +57,7 @@
 %patch2 -p1 -b .alloca
 %patch4 -p1 -b .reserve-fbarea
 %patch5 -p1 -b .starve
+%patch6 -p1 -b .panel
 
 pushd ..
 tar jxf %{SOURCE1}
@@ -103,6 +105,11 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Tue Feb 12 2008 Adam Jackson <ajax at redhat.com> 2.1.6-8
+- nv-2.1.6-panel-fix.patch: Don't discard EDID blocks just because their
+  input type bit disagrees with the hardware connection sensing; this
+  usually just means the block is lying. (#294861)
+
 * Wed Jan 23 2008 Adam Jackson <ajax at redhat.com> 2.1.6-7
 - nv-2.1.6-starvation.patch: Typo fix.