rpms/xorg-x11-drv-ati/F-10 radeon-modeset-fix-legacy-vt.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.164, 1.165

[Dave Airlie]

Author: airlied

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

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-modeset-fix-legacy-vt.patch 
Log Message:
* Sun Jan 25 2009 Dave Airlie <airlied at redhat.com> 6.9.0-64
- hopefully fix post-resume DRI (#475193)


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/F-10/xorg-x11-drv-ati.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- xorg-x11-drv-ati.spec	21 Dec 2008 23:33:09 -0000	1.164
+++ xorg-x11-drv-ati.spec	24 Jan 2009 23:54:06 -0000	1.165
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   63%{?dist}
+Release:   64%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -24,6 +24,7 @@
 Patch9:	    radeon-6.9.0-dig1-hdmi.patch
 Patch10:    radeon-6.9.0-exa-dst-a8-r100-r200.patch
 Patch11:    radeon-6.9.0-posting-fix.patch
+Patch12:    radeon-modeset-fix-legacy-vt.patch
 
 ExcludeArch: s390 s390x
 
@@ -55,6 +56,7 @@
 %patch9 -p1 -b .hdmi
 %patch10 -p1 -b .dsta8
 %patch11 -p1 -b .posting
+%patch12 -p1 -b .vtswitch
 
 %build
 autoreconf
@@ -86,6 +88,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Sun Jan 25 2009 Dave Airlie <airlied at redhat.com> 6.9.0-64
+- hopefully fix post-resume DRI (#475193)
+
 * Mon Dec 22 2008 Dave Airlie <airlied at redhat.com> 6.9.0-63
 - radeon-modeset.patch: fix EXA with DRI disabled