rpms/xorg-x11-drv-ati/devel radeon-modeset-fix-legacy-vt.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.147, 1.148

[Dave Airlie]

Author: airlied

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

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-modeset-fix-legacy-vt.patch 
Log Message:
* Tue Feb 17 2009 Dave Airlie <airlied at redhat.com> 6.10.0-3
- fix VT switch on non-kms on rawhide


radeon-modeset-fix-legacy-vt.patch:

--- NEW FILE radeon-modeset-fix-legacy-vt.patch ---
diff -up xf86-video-ati-6.9.0/src/radeon_dri.c.dma xf86-video-ati-6.9.0/src/radeon_dri.c
--- xf86-video-ati-6.9.0/src/radeon_dri.c.dma	2009-01-25 09:50:13.000000000 +1000
+++ xf86-video-ati-6.9.0/src/radeon_dri.c	2009-01-25 09:51:26.000000000 +1000
@@ -478,6 +478,9 @@ Bool radeon_update_dri_buffers(ScreenPtr
     if (info->ChipFamily >= CHIP_FAMILY_R600)
 	return TRUE;
 
+    if (!info->drm_mm)
+	return TRUE;
+
     success = radeon_update_dri_mappings(pScrn, sarea);
 
     if (!success)
@@ -1289,7 +1292,7 @@ static Bool RADEONDRIMapInit(RADEONInfoP
 {
 
     if (info->drm_mm)
-    return TRUE;
+    	return TRUE;
 				/* Map registers */
     info->dri->registerSize = info->MMIOSize;
     if (drmAddMap(info->dri->drmFD, info->MMIOAddr, info->dri->registerSize,
diff -up xf86-video-ati-6.9.0/src/radeon_driver.c.dma xf86-video-ati-6.9.0/src/radeon_driver.c


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- xorg-x11-drv-ati.spec	29 Jan 2009 23:13:38 -0000	1.147
+++ xorg-x11-drv-ati.spec	17 Feb 2009 05:49:36 -0000	1.148
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.10.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -15,7 +15,8 @@
 Source1:   radeon.xinf
 
 Patch1:     radeon-modeset.patch
-Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
+Patch2:     radeon-modeset-fix-legacy-vt.patch
+#Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch7:     radeon-mode-fix-rotate.patch
@@ -42,7 +43,8 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch1 -p1 -b .modeset
-%patch4 -p1 -b .remove-limit-heuristics
+%patch2 -p1 -b .modeset-fix-vt
+#patch4 -p1 -b .remove-limit-heuristics
 %patch5 -p1 -b .panel-size
 %patch6 -p1 -b .bgnr
 %patch7 -p1 -b .fix-rotate
@@ -78,6 +80,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Feb 17 2009 Dave Airlie <airlied at redhat.com> 6.10.0-3
+- fix VT switch on non-kms on rawhide
+
 * Fri Jan 30 2009 Dave Airlie <airlied at redhat.com> 6.10.0-2
 - Fix corruption on rs780 hopefully