diff options
| -rw-r--r-- | man/radeon.man | 12 | ||||
| -rw-r--r-- | src/radeon.h | 2 | ||||
| -rw-r--r-- | src/radeon_driver.c | 10 |
3 files changed, 16 insertions, 8 deletions
diff --git a/man/radeon.man b/man/radeon.man index db090d5b..447dcbee 100644 --- a/man/radeon.man +++ b/man/radeon.man @@ -625,11 +625,13 @@ case. This is only useful for LVDS panels (laptop internal panels). 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 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"); |