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).

5 files changed, 30 insertions, 34 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);
diff --git a/src/radeon_accelfuncs.c b/src/radeon_accelfuncs.c
index 3d69b3f8..0fd9fa10 100644
--- a/src/radeon_accelfuncs.c
+++ b/src/radeon_accelfuncs.c
@@ -1349,10 +1349,8 @@ FUNC_NAME(RADEONAccelInit)(ScreenPtr pScreen, XAAInfoRecPtr a)
 #endif
 
 #if defined(RENDER)
-#if defined(XF86DRI)
-    if (info->RenderAccel && info->directRenderingEnabled &&
+    if (info->RenderAccel &&
 	info->xaaReq.minorversion >= 2) {
-	/* XXX: The non-CP vertex dispatch doesn't seem to work. */
 
 	a->CPUToScreenAlphaTextureFlags = XAA_RENDER_POWER_OF_2_TILE_ONLY;
 	a->CPUToScreenAlphaTextureFormats = RADEONTextureFormats;
@@ -1388,12 +1386,9 @@ FUNC_NAME(RADEONAccelInit)(ScreenPtr pScreen, XAAInfoRecPtr a)
 	    a->SubsequentCPUToScreenTexture =
 		FUNC_NAME(R100SubsequentCPUToScreenTexture);
 	}
-    } else
-#endif /* XF86DRI */
-    if (info->RenderAccel)
-    {
+    } else if (info->RenderAccel) {
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Render acceleration currently "
-		   "requires the DRI.\n");
+		   "requires XAA v1.2 or newer.\n");
     }
 
     if (!a->SetupForCPUToScreenAlphaTexture2 && !a->SetupForCPUToScreenTexture2)
diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 176adf8e..f585ca27 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -345,15 +345,7 @@ static void RADEONEnterServer(ScreenPtr pScreen)
     RADEONInfoPtr  info  = RADEONPTR(pScrn);
 
     if (info->accel) info->accel->NeedToSync = TRUE;
-#ifdef RENDER
-    if (info->RenderAccel) {
-	RADEONSAREAPrivPtr pSAREAPriv;
 
-	RADEONInit3DEngineForRender(pScrn);
-	pSAREAPriv = DRIGetSAREAPrivate(pScrn->pScreen);
-	pSAREAPriv->ctxOwner = DRIGetContext(pScrn->pScreen);
-    }
-#endif
 }
 
 /* Called when the X server goes to sleep to allow the X server's
diff --git a/src/radeon_reg.h b/src/radeon_reg.h
index f2c4d6de..8849cabd 100644
--- a/src/radeon_reg.h
+++ b/src/radeon_reg.h
@@ -2064,7 +2064,7 @@
 #       define RADEON_VF_PRIM_WALK_LIST               (2<<4)
 #       define RADEON_VF_PRIM_WALK_DATA               (3<<4)
 #       define RADEON_VF_COLOR_ORDER_RGBA             (1<<6)
-#       define RADEON_VF_RADEON_MODE                  (1<<7)
+#       define RADEON_VF_RADEON_MODE                  (1<<8)
 #       define RADEON_VF_TCL_OUTPUT_CTL_ENA           (1<<9)
 #       define RADEON_VF_PROG_STREAM_ENA              (1<<10)
 #       define RADEON_VF_INDEX_SIZE_SHIFT             11
diff --git a/src/radeon_render.c b/src/radeon_render.c
index 8b4f5da3..073ca665 100644
--- a/src/radeon_render.c
+++ b/src/radeon_render.c
@@ -230,7 +230,7 @@ void RADEONInit3DEngineForRender(ScrnInfoPtr pScrn)
 #ifdef XF86DRI
     RADEONInfoPtr info = RADEONPTR (pScrn);
 
-    if (info->directRenderingEnabled)
+    if (info->CPStarted)
 	RadeonInit3DEngineCP(pScrn);
     else
 #endif
@@ -321,8 +321,13 @@ static void FUNC_NAME(RadeonInit3DEngine)(ScrnInfoPtr pScrn)
 	       (info->ChipFamily == CHIP_FAMILY_RV280) || 
 	       (info->ChipFamily == CHIP_FAMILY_RS300) || 
 	       (info->ChipFamily == CHIP_FAMILY_R200)) {
+
 	BEGIN_ACCEL(7);
-	OUT_ACCEL_REG(R200_SE_VAP_CNTL_STATUS, 0);
+        if (info->ChipFamily == CHIP_FAMILY_RS300) {
+            OUT_ACCEL_REG(R200_SE_VAP_CNTL_STATUS, RADEON_TCL_BYPASS);
+        } else {
+            OUT_ACCEL_REG(R200_SE_VAP_CNTL_STATUS, 0);
+        }
 	OUT_ACCEL_REG(R200_PP_CNTL_X, 0);
 	OUT_ACCEL_REG(R200_PP_TXMULTI_CTL_0, 0);
 	OUT_ACCEL_REG(R200_SE_VTX_STATE_CNTL, 0);
@@ -334,7 +339,11 @@ static void FUNC_NAME(RadeonInit3DEngine)(ScrnInfoPtr pScrn)
 	FINISH_ACCEL();
     } else {
 	BEGIN_ACCEL(2);
-	OUT_ACCEL_REG(RADEON_SE_CNTL_STATUS, RADEON_TCL_BYPASS);
+        if ((info->ChipFamily == CHIP_FAMILY_RADEON) ||
+            (info->ChipFamily == CHIP_FAMILY_RV200))
+            OUT_ACCEL_REG(RADEON_SE_CNTL_STATUS, 0);
+        else
+            OUT_ACCEL_REG(RADEON_SE_CNTL_STATUS, RADEON_TCL_BYPASS);
 	OUT_ACCEL_REG(RADEON_SE_COORD_FMT,
 	    RADEON_VTX_XY_PRE_MULT_1_OVER_W0 |
 	    RADEON_VTX_ST0_NONPARAMETRIC |
@@ -423,8 +432,13 @@ static Bool FUNC_NAME(R100SetupTexture)(
     /* Upload texture to card.  Should use ImageWrite to avoid syncing. */
     i = height;
     dst = (CARD8*)(info->FB + offset);
-    if (info->accel->NeedToSync)
+
+    if (info->accel->NeedToSync) {
 	info->accel->Sync(pScrn);
+	if (info->CPStarted)
+	    RADEONInit3DEngineForRender(pScrn);
+    }
+
     while(i--) {
 	memcpy(dst, src, width * tex_bytepp);
 	src += src_pitch;
@@ -475,7 +489,7 @@ FUNC_NAME(R100SetupForCPUToScreenAlphaTexture) (
     blend_cntl = RadeonGetBlendCntl(op, dstFormat);
     if (blend_cntl == 0)
 	return FALSE;
-    
+
     if (!FUNC_NAME(R100SetupTexture)(pScrn, maskFormat, alphaPtr, alphaPitch,
 				     width, height, flags))
 	return FALSE;
@@ -727,8 +741,12 @@ static Bool FUNC_NAME(R200SetupTexture)(
     /* Upload texture to card.  Should use ImageWrite to avoid syncing. */
     i = height;
     dst = (CARD8*)(info->FB + offset);
-    if (info->accel->NeedToSync)
+    if (info->accel->NeedToSync) {
 	info->accel->Sync(pScrn);
+	if (info->CPStarted)
+	    RADEONInit3DEngineForRender(pScrn);
+    }
+
     while(i--) {
 	memcpy(dst, src, width * tex_bytepp);
 	src += src_pitch;