rpms/xorg-x11-drv-ati/F-11 radeon-modeset-still-more-fixes.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.189, 1.190

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12360

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-modeset-still-more-fixes.patch 
Log Message:
* Thu May 14 2009 Kyle McMartin <kyle at redhat.com> 6.12.2-14
- radeon-modeset-still-more-fixes.patch: Bump the GEM interface version to
  31 so we don't activate it... (#500801)


radeon-modeset-still-more-fixes.patch:

--- NEW FILE radeon-modeset-still-more-fixes.patch ---
Index: xf86-video-ati-6.12.2/src/radeon_dri.c
===================================================================
--- xf86-video-ati-6.12.2.orig/src/radeon_dri.c
+++ xf86-video-ati-6.12.2/src/radeon_dri.c
@@ -1607,7 +1607,7 @@ Bool RADEONDRIGetVersion(ScrnInfoPtr pSc
 	goto fail;
     }
 
-    if (info->dri->pKernelDRMVersion->version_minor >= 30) {
+    if (info->dri->pKernelDRMVersion->version_minor >= 31) {
 	    struct drm_radeon_gem_info mminfo;
 
 	    if (!drmCommandWriteRead(fd, DRM_RADEON_GEM_INFO, &mminfo, sizeof(mminfo)))


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/xorg-x11-drv-ati.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -p -r1.189 -r1.190
--- xorg-x11-drv-ati.spec	7 May 2009 18:52:07 -0000	1.189
+++ xorg-x11-drv-ati.spec	15 May 2009 04:02:00 -0000	1.190
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   13%{?dist}
+Release:   14%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -16,6 +16,7 @@ Source1:   radeon.xinf
 
 Patch1:     radeon-modeset.patch
 Patch2:     radeon-modeset-fixes.patch
+Patch3:	    radeon-modeset-still-more-fixes.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch7:	    radeon-6.12.1-r600-fb-size.patch
 Patch8:     radeon-src-readback-cpu.patch
@@ -44,6 +45,7 @@ X.Org X11 ati video driver.
 %setup -q -n %{tarball}-%{version}
 %patch1 -p1 -b .modeset
 %patch2 -p1 -b .modeset-fixes
+%patch3 -p1 -b .modeset-still-more-fixes
 %patch6 -p1 -b .bgnr
 %patch7 -p1 -b .r600-fb-size
 %patch8 -p1 -b .srcrb
@@ -80,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu May 14 2009 Kyle McMartin <kyle at redhat.com> 6.12.2-14
+- radeon-modeset-still-more-fixes.patch: Bump the GEM interface version to
+  31 so we don't activate it... (#500801)
+
 * Thu May 07 2009 Adam Jackson <ajax at redhat.com> 6.12.2-13
 - radeon-6.12.2-lvds-default-modes.patch: Add default modes to the LVDS mode
   list if we got no EDID from the kernel.