xf86-video-ati: Branch 'master'

[Alex Deucher]

 man/radeon.man      |   12 +++++++-----
 src/radeon.h        |    2 +-
 src/radeon_driver.c |   10 ++++++++--
 3 files changed, 16 insertions(+), 8 deletions(-)

New commits:
diff-tree 7a25512415bb40b772491bb4a773dfe02ac8b71a (from fa30ec6d5cd9bf4eb1a960592ca7311175219e4b)
Author: Alex Deucher <alex at botch2.com>
Date:   Fri Feb 16 00:44:11 2007 -0500

    Add "DRI" option
    
    This option allows you to disable the DRI per card.  It also
    removes the "RN50Force3D" option as it is now covered by this
    option. RN50 users should set this to TRUE if they want to force
    the DRI on.

diff --git a/man/radeon.man b/man/radeon.man
index db090d5..447dcbe 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -625,11 +625,13 @@ case.  This is only useful for LVDS pane
 The default is
 .B on.
 .TP
-.BI "Option \*qRN50Force3D\*q \*q" boolean \*q
-Enable DRI support for RN50/ES1000 chips.  The 3D engine on these chips has
-not been validated at the hardware level and is not likely to work in most 
-cases. If it does, you got lucky.  The default is
-.B off.
+.BI "Option \*qDRI\*q \*q" boolean \*q
+Enable DRI support.  This option allows you to enable to disable the DRI.  
+The default is
+.B off 
+for RN50/ES1000 and
+.B on 
+for others.
 .TP
 
 .SH SEE ALSO
diff --git a/src/radeon.h b/src/radeon.h
index 0f5dae0..37ca67d 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -157,7 +157,7 @@ typedef enum {
     OPTION_ACCELMETHOD,
     OPTION_CONSTANTDPI,
     OPTION_REVERSE_DISPLAY,
-    OPTION_RN50_3D
+    OPTION_DRI
 } RADEONOpts;
 
 /* ------- mergedfb support ------------- */
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 1d217ae..d1cd790 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -198,7 +198,7 @@ static const OptionInfoRec RADEONOptions
     { OPTION_ACCELMETHOD,    "AccelMethod",      OPTV_STRING,  {0}, FALSE },
     { OPTION_CONSTANTDPI,    "ConstantDPI",	 OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_REVERSE_DISPLAY,"ReverseDisplay",   OPTV_BOOLEAN, {0}, FALSE },
-    { OPTION_RN50_3D,        "RN50Force3D",      OPTV_BOOLEAN, {0}, FALSE },
+    { OPTION_DRI,            "DRI",       	 OPTV_BOOLEAN, {0}, FALSE },
     { -1,                    NULL,               OPTV_NONE,    {0}, FALSE }
 };
 
@@ -2512,7 +2512,7 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr
 
     if (info->Chipset == PCI_CHIP_RN50_515E ||
 	info->Chipset == PCI_CHIP_RN50_5969) {
-    	if (xf86ReturnOptValBool(info->Options, OPTION_RN50_3D, FALSE)) {
+    	if (xf86ReturnOptValBool(info->Options, OPTION_DRI, FALSE)) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
 		"Direct rendering for RN50 forced on -- "
 		"This is NOT officially supported at the hardware level "
@@ -2537,6 +2537,12 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr
 	return FALSE;
     }
 
+    if (!xf86ReturnOptValBool(info->Options, OPTION_DRI, TRUE)) {
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+		"Direct rendering forced off\n");
+	return FALSE;
+    }
+
     if (xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
 		   "[dri] Acceleration disabled, not initializing the DRI\n");