summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/radeon_dri.c5
-rw-r--r--src/radeon_driver.c7
2 files changed, 7 insertions, 5 deletions
diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index b1dae426..944fddd7 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 53a3d4a0..97019675 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");