diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2010-11-24 12:18:04 -0500 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2011-01-06 20:17:57 -0500 |
| commit | 97322c00faf08461b941edf97efe86d8b082a0ce (patch) | |
| tree | 5ca4d6f714b279166cbca17860e67ca14a81168a | |
| parent | c678b79f99238473df6ff1bedbae840950cdf88c (diff) | |
Bail on NI cards with UMS
NI cards require KMS.
| -rw-r--r-- | src/radeon.h | 2 | ||||
| -rw-r--r-- | src/radeon_driver.c | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/radeon.h b/src/radeon.h index 9c961879..7f55feec 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -393,6 +393,8 @@ typedef enum { #define IS_DCE41_VARIANT ((info->ChipFamily >= CHIP_FAMILY_PALM)) +#define IS_DCE5_VARIANT ((info->ChipFamily >= CHIP_FAMILY_BARTS)) + #define IS_EVERGREEN_3D (info->ChipFamily >= CHIP_FAMILY_CEDAR) #define IS_R600_3D (info->ChipFamily >= CHIP_FAMILY_R600) diff --git a/src/radeon_driver.c b/src/radeon_driver.c index e2f605ce..20a81e69 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -1894,6 +1894,14 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn) } } + if (IS_DCE5_VARIANT) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Chipset: \"%s\" (ChipID = 0x%04x) requires KMS\n", + pScrn->chipset, + info->Chipset); + return FALSE; + } + switch (info->Chipset) { case PCI_CHIP_RN50_515E: /* RN50 is based on the RV100 but 3D isn't guaranteed to work. YMMV. */ case PCI_CHIP_RN50_5969: |