Fix install problem on platforms not using xorg.cf/xfree86.cf (Bug #339,

    Harold L. Hunt II, Alexander Gottwald).
Fix crash when using X core font in zh_CN.UTF-8 locale (Bug #368, Yu Shao,
    David Dawes).
Fix glXMakeCurrent(Dpy, None, NULL) crash (Bug #719, Adam Jackson).
HP-PA build fix (Bug #828, Guy Martin, Paul Anderson).
Fix SDK build for GATOS and Wacom driver (Bug #829, Bryan Stine).
Fix attempt to read video ROM before enabling it (Bug #843, Ivan
    Kokshaysky, Mike A. Harris).
Fix detection of primary adapter (Bug #843, Ivan Kokshaysky, Mike A.
    Harris).
Clarify xset man page description of how to use the keyboard repeat rate
    settings (Bug #846, Mike A. Harris).
Fix problem where print-screen key would get remapped to sys-req in certain
    keymaps, which broke GNOME printscreen functionality (Bug #847, Owen
    Taylor).
Fix several render problems:
- MMIO mode support
- Hang on IGP chips
- VT switching hang
- 3D render corruption (Bug #922, Hui Yu).

1 files changed, 2 insertions, 11 deletions

diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index 43f7d469..0799033f 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -314,17 +314,8 @@ void RADEONEngineRestore(ScrnInfoPtr pScrn)
     OUTREG(RADEON_DP_WRITE_MASK,     0xffffffff);
 
 #ifdef RENDER
-    /* In the DRI case, it's initialized when the server grabs the lock.  We
-     * don't hold the lock here, so don't do it in that case.
-     */
-#ifdef XF86DRI
-    if (!info->directRenderingEnabled) {
-#endif
-	if (info->RenderAccel)
-	    RADEONInit3DEngineForRender(pScrn);
-#ifdef XF86DRI
-    }
-#endif
+    if (info->RenderAccel)
+        RADEONInit3DEngineForRender(pScrn);
 #endif
 
     RADEONWaitForIdleMMIO(pScrn);