rpms/xorg-x11-drv-ati/F-10 radeon-modeset.patch, 1.41, 1.42 xorg-x11-drv-ati.spec, 1.154, 1.155

[Dave Airlie]

Author: airlied

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

Modified Files:
	radeon-modeset.patch xorg-x11-drv-ati.spec 
Log Message:
- radeon attempt to fix suspend/resume


radeon-modeset.patch:

Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10/radeon-modeset.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- radeon-modeset.patch	19 Nov 2008 01:12:59 -0000	1.41
+++ radeon-modeset.patch	19 Nov 2008 04:58:20 -0000	1.42
@@ -1,3 +1,9 @@
+commit 69cbdf394f20eeb7882184eb78a306e9d9c5fe9e
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Nov 19 14:49:44 2008 +1000
+
+    radeon: scrap state on LeaveVT not EnterVT
+
 commit 88a99cdd0faa4d9748987a90b9b1cfd3939be564
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Nov 19 11:08:34 2008 +1000
@@ -4342,7 +4348,7 @@
 +
 +#endif
 diff --git a/src/radeon_driver.c b/src/radeon_driver.c
-index c759bd6..2f4b73a 100644
+index c759bd6..382d0db 100644
 --- a/src/radeon_driver.c
 +++ b/src/radeon_driver.c
 @@ -67,7 +67,7 @@
@@ -5476,10 +5482,10 @@
 +
 +    if (info->drm_mode_setting) {
 +      if (!drmmode_set_desired_modes(pScrn, &info->drmmode))
- 	return FALSE;
++	return FALSE;
 +    } else {
 +      if (!xf86SetDesiredModes(pScrn))
-+	return FALSE;
+ 	return FALSE;
 +    }
  
 -    if (info->ChipFamily < CHIP_FAMILY_R600)
@@ -5567,13 +5573,16 @@
      }
  #endif
  
-@@ -5551,10 +5766,15 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5551,10 +5766,18 @@ void RADEONLeaveVT(int scrnIndex, int flags)
  
      xf86_hide_cursors (pScrn);
  
 -    RADEONRestore(pScrn);
-+    if (info->drm_mm)
++    if (info->drm_mm) {
++	info->accel_state->XInited3D = FALSE;
++	info->accel_state->engineMode = EXA_ENGINEMODE_UNKNOWN;
 +	radeon_unbind_all_memory(pScrn);
++    }
 +
 +    if (!info->drm_mode_setting) {
 +	RADEONRestore(pScrn);
@@ -5586,7 +5595,7 @@
  
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "Ok, leaving now...\n");
-@@ -5599,7 +5819,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
+@@ -5599,7 +5822,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
  #endif /* USE_XAA */
  
      if (pScrn->vtSema) {
@@ -5596,7 +5605,7 @@
      }
  
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
-@@ -5634,6 +5855,12 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
+@@ -5634,6 +5858,12 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
      info->DGAModes = NULL;
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "Unmapping memory\n");


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.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- xorg-x11-drv-ati.spec	19 Nov 2008 01:12:59 -0000	1.154
+++ xorg-x11-drv-ati.spec	19 Nov 2008 04:58:21 -0000	1.155
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   53%{?dist}
+Release:   54%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -82,6 +82,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Nov 18 2008 Dave Airlie <airlied at redhat.com> 6.9.0-54
+- radeon attempt to fix suspend/resume
+
 * Tue Nov 18 2008 Dave Airlie <airlied at redhat.com> 6.9.0-53
 - radeon - more issues in space check