rpms/xorg-x11/devel xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch, NONE, 1.1

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3240

Added Files:
	xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch 
Log Message:
Added xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch

xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch:
 radeon.man      |    7 +++++++
 radeon_driver.c |   13 ++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

--- NEW FILE xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch ---
--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.man.ati-radeon-7000-disable-dri	2005-06-14 11:57:16.000000000 -0400
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.man	2005-06-14 12:01:54.000000000 -0400
@@ -105,6 +105,13 @@
 .B Options
 are supported:
 .TP
+.BI "Option \*qDRU\*q \*q" boolean \*q
+Enables DRI (Direct Rendering Infrastructure) support.  The default is
+.B disabled
+for Radeon VE/7000 hardware due to instabilities, but
+.B enabled
+by default for all other Radeon hardware supported by the DRI.
+.TP
 .BI "Option \*qSWcursor\*q \*q" boolean \*q
 Selects software cursor.  The default is
 .B off.
--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.ati-radeon-7000-disable-dri	2005-06-14 11:18:37.000000000 -0400
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c	2005-06-14 11:56:27.000000000 -0400
@@ -141,6 +141,7 @@
     OPTION_DEPTH_MOVE,
     OPTION_PAGE_FLIP,
     OPTION_NO_BACKBUFFER,
+    OPTION_DRI,
 #endif
     OPTION_PANEL_OFF,
     OPTION_DDC_MODE,
@@ -185,6 +186,7 @@
     { OPTION_DEPTH_MOVE,     "EnableDepthMoves", OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_PAGE_FLIP,      "EnablePageFlip",   OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_NO_BACKBUFFER,  "NoBackBuffer",     OPTV_BOOLEAN, {0}, FALSE },
+    { OPTION_DRI,            "DRI",              OPTV_BOOLEAN, {0}, TRUE  },
 #endif
     { OPTION_PANEL_OFF,      "PanelOff",         OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_DDC_MODE,       "DDCMode",          OPTV_BOOLEAN, {0}, FALSE },
@@ -4596,7 +4598,16 @@
 	    }
 #endif
 	} else {
-	    info->directRenderingEnabled = RADEONDRIScreenInit(pScreen);
+	    /* RHEL4: DRI turned off by default on RV100 (Radeon VE/7000) */
+	    if (info->ChipFamily == CHIP_FAMILY_RV100) {
+		info->directRenderingEnabled = FALSE;
+		xf86DrvMsg(scrnIndex, X_WARNING,
+                            "Direct Rendering is currently disabled on Radeon VE/7000\n\t"
+			    "hardware due to instability.\n");
+	    } else {
+	        if (!xf86ReturnOptValBool(info->Options, OPTION_DRI, FALSE))
+		    info->directRenderingEnabled = RADEONDRIScreenInit(pScreen);
+	    }
 	}
     }
 #endif