rpms/xorg-x11-drv-intel/devel lvds-modes.patch, 1.1, 1.2 xorg-x11-drv-intel.spec, 1.31, 1.32

[Adam Jackson]

Author: ajax

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

Modified Files:
	lvds-modes.patch xorg-x11-drv-intel.spec 
Log Message:
* Fri Sep 18 2009 Adam Jackson <ajax at redhat.com> 2.8.0-15.20090909
- lvds-modes.patch: Fix to work in more cases.


lvds-modes.patch:
 drmmode_display.c |  138 +++++++++++++++---------------------------------------
 1 file changed, 40 insertions(+), 98 deletions(-)

Index: lvds-modes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/lvds-modes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lvds-modes.patch	8 Sep 2009 20:56:56 -0000	1.1
+++ lvds-modes.patch	18 Sep 2009 19:19:28 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up xf86-video-intel-20090908/src/drmmode_display.c.jx xf86-video-intel-20090908/src/drmmode_display.c
---- xf86-video-intel-20090908/src/drmmode_display.c.jx	2009-09-08 15:26:36.311361982 -0400
-+++ xf86-video-intel-20090908/src/drmmode_display.c	2009-09-08 15:57:06.526491988 -0400
+diff -up xf86-video-intel-20090909/src/drmmode_display.c.lvds-modes xf86-video-intel-20090909/src/drmmode_display.c
+--- xf86-video-intel-20090909/src/drmmode_display.c.lvds-modes	2009-09-18 14:45:51.000000000 -0400
++++ xf86-video-intel-20090909/src/drmmode_display.c	2009-09-18 14:55:06.000000000 -0400
 @@ -701,107 +701,46 @@ static void fill_detailed_lvds_block(str
  		timing->misc |= 0x01;
  }
@@ -145,12 +145,16 @@ diff -up xf86-video-intel-20090908/src/d
  }
  
  static DisplayModePtr
-@@ -869,7 +808,7 @@ drmmode_output_get_modes(xf86OutputPtr o
+@@ -869,8 +808,11 @@ drmmode_output_get_modes(xf86OutputPtr o
  		if (!p_lvds->hdisplay || !p_lvds->vdisplay)
  			xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
  				"Incorrect KMS mode.\n");
 -		drmmode_output_lvds_edid(output, p_lvds);
-+		Modes = drmmode_output_lvds_edid(output, Modes);
  	}
++
++	if (koutput->connector_type ==  DRM_MODE_CONNECTOR_LVDS)
++		Modes = drmmode_output_lvds_edid(output, Modes);
++
  	return Modes;
  }
+ 


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.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- xorg-x11-drv-intel.spec	17 Sep 2009 18:02:00 -0000	1.31
+++ xorg-x11-drv-intel.spec	18 Sep 2009 19:19:28 -0000	1.32
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.8.0
-Release:   14.%{gitdate}%{?dist}
+Release:   15.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Fri Sep 18 2009 Adam Jackson <ajax at redhat.com> 2.8.0-15.20090909
+- lvds-modes.patch: Fix to work in more cases.
+
 * Thu Sep 17 2009 Kristian Høgsberg <krh at redhat.com> - 2.8.0-14.20090909
 - Drop page flip patch.