rpms/xorg-x11-drv-intel/devel intel-2.8.0-lvds-first.patch, NONE, 1.1 xorg-x11-drv-intel.spec, 1.20, 1.21

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-drv-intel.spec 
Added Files:
	intel-2.8.0-lvds-first.patch 
Log Message:
* Mon Aug 10 2009 Adam Jackson <ajax at redhat.com> 2.8.0-5
- intel-2.8.0-lvds-first.patch: Put LVDS outputs first in the list in KMS to
  match old UMS behaviour.


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

--- NEW FILE intel-2.8.0-lvds-first.patch ---
diff -up xf86-video-intel-2.8.0/src/drmmode_display.c.jx xf86-video-intel-2.8.0/src/drmmode_display.c
--- xf86-video-intel-2.8.0/src/drmmode_display.c.jx	2009-07-28 14:10:36.000000000 -0400
+++ xf86-video-intel-2.8.0/src/drmmode_display.c	2009-07-28 14:20:10.000000000 -0400
@@ -1131,7 +1131,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn,
 {
 	xf86CrtcConfigPtr   xf86_config;
 	drmmode_ptr drmmode;
-	int i;
+	int i, lvds = -1;
 
 	drmmode = xnfalloc(sizeof *drmmode);
 	drmmode->fd = fd;
@@ -1153,8 +1153,21 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn,
 	for (i = 0; i < drmmode->mode_res->count_crtcs; i++)
 		drmmode_crtc_init(pScrn, 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(pScrn, drmmode, i);
+                        lvds = i;
+                }
+                drmModeFreeConnector(koutput);
+        }
+
 	for (i = 0; i < drmmode->mode_res->count_connectors; i++)
-		drmmode_output_init(pScrn, drmmode, i);
+                if (i != lvds)
+		        drmmode_output_init(pScrn, drmmode, i);
 
 	xf86InitialConfiguration(pScrn, TRUE);
 


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- xorg-x11-drv-intel.spec	9 Aug 2009 00:53:25 -0000	1.20
+++ xorg-x11-drv-intel.spec	10 Aug 2009 17:55:49 -0000	1.21
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.8.0
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -28,6 +28,7 @@ Patch4: intel-abi-fix.patch
 
 # needs to be upstreamed
 Patch20: intel-2.8.0-kms-get-crtc.patch
+Patch21: intel-2.8.0-lvds-first.patch
 
 Patch30: intel-chip-names.patch
 Patch40: dri2-page-flip.patch
@@ -82,6 +83,7 @@ Debugging tools for Intel graphics chips
 %patch3 -p1 -b .xext
 %patch4 -p1 -b .abi
 %patch20 -p1 -b .get-crtc
+%patch21 -p1 -b .lvds-first
 %patch30 -p1 -b .names
 %patch40 -p1 -b .flip
 
@@ -139,6 +141,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Mon Aug 10 2009 Adam Jackson <ajax at redhat.com> 2.8.0-5
+- intel-2.8.0-lvds-first.patch: Put LVDS outputs first in the list in KMS to
+  match old UMS behaviour.
+
 * Fri Aug 7 2009 Kristian Høgsberg <krh at redhat.com> - 2.8.0-4
 - Add dri2-page-flip.patch to enable full screen pageflipping.
   Fixes XKCD #619.