summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAapo Tahkola <[email protected]>2006-08-27 13:24:36 +0000
committerAapo Tahkola <[email protected]>2006-08-27 13:24:36 +0000
commit9cb82f7917b11288169146035700b992b86a7ec2 (patch)
tree5d4689bc453ac0653a15ddf5f9f0b845a262b0cd
parenta38aef93ab2a5006c3b8cfa50aaf48fafc0eb8d4 (diff)
close #6318
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_screen.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index 154b40300fa..c58c0a57973 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -635,13 +635,10 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
dri_priv->deviceID);
return NULL;
}
- if (screen->chip_family == CHIP_FAMILY_R350 ||
- screen->chip_family == CHIP_FAMILY_R300) {
- if (getenv("R300_FORCE_R300") == NULL) {
- fprintf(stderr, "Radeon 9500/9700/9800 cards are not currently stable.\n");
- fprintf(stderr, "More details can be found at https://bugs.freedesktop.org/show_bug.cgi?id=6318\n");
- return NULL;
- }
+ if ((screen->chip_family == CHIP_FAMILY_R350 || screen->chip_family == CHIP_FAMILY_R300) &&
+ sPriv->ddxMinor < 2) {
+ fprintf(stderr, "xf86-video-ati-6.6.2 or newer needed for Radeon 9500/9700/9800 cards.\n");
+ return NULL;
}
if (screen->chip_family <= CHIP_FAMILY_RS200)