rpms/xorg-x11-drv-intel/F-13 intel-2.11-lvds-first.patch, NONE, 1.1 xorg-x11-drv-intel.spec, 1.45, 1.46 intel-2.8.0-lvds-first.patch, 1.2, NONE

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19670

Modified Files:
	xorg-x11-drv-intel.spec 
Added Files:
	intel-2.11-lvds-first.patch 
Removed Files:
	intel-2.8.0-lvds-first.patch 
Log Message:
* Fri Mar 26 2010 Adam Jackson <ajax at redhat.com> 2.10.0-5
- New driver snapshot (2.10.92ish).
- New GPU tools snapshot.


intel-2.11-lvds-first.patch:
 drmmode_display.c |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

--- NEW FILE intel-2.11-lvds-first.patch ---
diff -up xf86-video-intel-20100319/src/drmmode_display.c.jx xf86-video-intel-20100319/src/drmmode_display.c
--- xf86-video-intel-20100319/src/drmmode_display.c.jx	2010-03-22 13:24:13.483183499 -0400
+++ xf86-video-intel-20100319/src/drmmode_display.c	2010-03-22 13:25:59.810184060 -0400
@@ -1452,7 +1452,7 @@ Bool drmmode_pre_init(ScrnInfoPtr scrn, 
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	struct drm_i915_getparam gp;
 	drmmode_ptr drmmode;
-	unsigned int i;
+	unsigned int i, lvds = -1;
 	int has_flipping = 0;
 
 	drmmode = xnfalloc(sizeof *drmmode);
@@ -1473,9 +1473,22 @@ Bool drmmode_pre_init(ScrnInfoPtr scrn, 
 			     drmmode->mode_res->max_height);
 	for (i = 0; i < drmmode->mode_res->count_crtcs; i++)
 		drmmode_crtc_init(scrn, drmmode, i);
+ 
+        /* do LVDS first */
+        for (i = 0; i < drmmode->mode_res->count_connectors; i++) {
+                drmModeConnectorPtr koutput =
+                    drmModeGetConnector(drmmode->fd,
+                                        drmmode->mode_res->connectors[i]);
+                if (koutput->connector_type == DRM_MODE_CONNECTOR_LVDS) {
+                        drmmode_output_init(scrn, drmmode, i);
+                        lvds = i;
+                }
+                drmModeFreeConnector(koutput);
+        }
 
 	for (i = 0; i < drmmode->mode_res->count_connectors; i++)
-		drmmode_output_init(scrn, drmmode, i);
+                if (i != lvds)
+		        drmmode_output_init(scrn, drmmode, i);
 
 	xf86InitialConfiguration(scrn, TRUE);
 


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-13/xorg-x11-drv-intel.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- xorg-x11-drv-intel.spec	26 Mar 2010 19:24:43 -0000	1.45
+++ xorg-x11-drv-intel.spec	26 Mar 2010 20:41:54 -0000	1.46
@@ -3,6 +3,7 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 %define gputoolsdate 20100326
+%define gitdate 20100326
 
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
@@ -13,7 +14,8 @@ License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:    http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 
+#Source0:    http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 
+Source0:    xf86-video-intel-%{gitdate}.tar.bz2
 Source1:    make-intel-gpu-tools-snapshot.sh
 Source2:    intel.xinf
 Source3:    intel-gpu-tools-%{gputoolsdate}.tar.bz2
@@ -24,10 +26,9 @@ Patch2: copy-fb.patch
 
 # needs to be upstreamed
 Patch20: intel-2.8.0-kms-get-crtc.patch
-Patch21: intel-2.8.0-lvds-first.patch
+Patch21: intel-2.11-lvds-first.patch
 
 Patch60: uevent.patch
-Patch70: lvds-modes.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -80,11 +81,10 @@ Debugging tools for Intel graphics chips
 %prep
 %setup -q -n xf86-video-intel-%{dirsuffix} -b3
 %patch1 -p1 -b .svideo
-%patch2 -p1 -b .copy-fb
+#patch2 -p1 -b .copy-fb
 %patch20 -p1 -b .get-crtc
 %patch21 -p1 -b .lvds-first
 %patch60 -p1 -b .uevent
-%patch70 -p1 -b .lvds-modes
 
 %build
  
@@ -136,6 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Fri Mar 26 2010 Adam Jackson <ajax at redhat.com> 2.10.0-5
+- New driver snapshot (2.10.92ish).
 - New GPU tools snapshot.
 
 * Wed Feb 10 2010 Adam Jackson <ajax at redhat.com> 2.10.0-4


--- intel-2.8.0-lvds-first.patch DELETED ---