diff options
| author | Alex Deucher <alex@botch2.com> | 2007-02-16 00:44:11 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.com> | 2007-02-16 00:45:45 -0500 |
| commit | 7a25512415bb40b772491bb4a773dfe02ac8b71a (patch) | |
| tree | f29ee9619a88aebf3a74ef339a79b3a49ee98815 /src | |
| parent | fa30ec6d5cd9bf4eb1a960592ca7311175219e4b (diff) | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/radeon.h | 2 | ||||
| -rw-r--r-- | src/radeon_driver.c | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/radeon.h b/src/radeon.h index 0f5dae06..37ca67d9 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 1d217aef..d1cd790b 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 pScrn) 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 pScrn) 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"); |