diff options
| author | Adam Jackson <ajax@benzedrine.nwnk.net> | 2006-08-24 19:42:26 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@benzedrine.nwnk.net> | 2006-08-24 19:42:26 -0400 |
| commit | 1dcd9b1f75ba2307beb42556aa7f2f945171d5fb (patch) | |
| tree | 49316dfe391a6fa347ad1779cad963835c5f5453 | |
| parent | 64b18e246586b1043a12f381a9d4c834464ed9b5 (diff) | |
Disable DRI on RN50 in a more pleasant way.
Rather than publish a non-existant driver name for RN50, just don't bother
initializing it in the first place.
| -rw-r--r-- | src/radeon_dri.c | 5 | ||||
| -rw-r--r-- | src/radeon_driver.c | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/radeon_dri.c b/src/radeon_dri.c index b1dae42..944fddd 100644 --- a/src/radeon_dri.c +++ b/src/radeon_dri.c @@ -1380,11 +1380,6 @@ Bool RADEONDRIScreenInit(ScreenPtr pScreen) } else if ( info->ChipFamily >= CHIP_FAMILY_R200 ) pDRIInfo->clientDriverName = R200_DRIVER_NAME; - else if ((info->Chipset == PCI_CHIP_RN50_515E) || - (info->Chipset == PCI_CHIP_RN50_5969)) { - /* RN50 doesn't support 3D, so setting clientDriverName to an invalid name "RN50" */ - pDRIInfo->clientDriverName = "RN50"; - } else pDRIInfo->clientDriverName = RADEON_DRIVER_NAME; diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 53a3d4a..9701967 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -4468,6 +4468,13 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn) if (info->IsSecondary) return FALSE; + if (info->Chipset == PCI_CHIP_RN50_515E || + info->Chipset == PCI_CHIP_RN50_5969) { + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Direct rendering not supported on RN50\n"); + return FALSE; + } + if (xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "[dri] Acceleration disabled, not initializing the DRI\n"); |