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

[fedora-cvs-commits redhat com]

Author: mharris

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

Modified Files:
	xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch 
Log Message:
Update xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch to allow force-enable of DRI on Radeon 7000 by default

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

Index: xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch	16 Jun 2005 17:13:05 -0000	1.1
+++ xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch	12 Jul 2005 16:37:45 -0000	1.2
@@ -32,20 +32,29 @@
  #endif
      { OPTION_PANEL_OFF,      "PanelOff",         OPTV_BOOLEAN, {0}, FALSE },
      { OPTION_DDC_MODE,       "DDCMode",          OPTV_BOOLEAN, {0}, FALSE },
-@@ -4596,7 +4598,16 @@
+@@ -4596,7 +4598,25 @@
  	    }
  #endif
  	} else {
 -	    info->directRenderingEnabled = RADEONDRIScreenInit(pScreen);
-+	    /* RHEL4: DRI turned off by default on RV100 (Radeon VE/7000) */
++	    /* RHEL4/FC4/FC3/rawhide: DRI turned off by default on RV100 (Radeon VE/7000)
++	     * for bug #150174
++	     */
 +	    if (info->ChipFamily == CHIP_FAMILY_RV100) {
-+		info->directRenderingEnabled = FALSE;
-+		xf86DrvMsg(scrnIndex, X_WARNING,
-+                            "Direct Rendering is currently disabled on Radeon VE/7000\n\t"
++		if (xf86ReturnOptValBool(info->Options, OPTION_DRI, FALSE )) {
++		    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))
++		} else {
++		    xf86DrvMsg(scrnIndex, X_WARNING,
++				"Direct Rendering is disabled by default on Radeon VE/7000\n\t"
++				"hardware due to instability, but has been forced on with\n\t"
++				"\"Option \"dri\" in xorg.conf.  You may experience instability.\n");
 +		    info->directRenderingEnabled = RADEONDRIScreenInit(pScreen);
++		}
++	    } else {
++		info->directRenderingEnabled = RADEONDRIScreenInit(pScreen);
 +	    }
  	}
      }