diff options
| author | Alex Deucher <alex@botch2.(none)> | 2007-11-20 23:52:29 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.(none)> | 2007-11-20 23:52:29 -0500 |
| commit | 3975da2ea8cb628f7f66c3f26c5dfa181cd1c532 (patch) | |
| tree | 6dcc2d7a701279ebfc1877bd59bd5dc25fac9f97 | |
| parent | e283aa332adf0134243a4fa3d14263719cd8a3fd (diff) | |
| parent | 295ce277bb0a44b9539b3dba575e7aff279dc2d0 (diff) | |
Merge branch 'atombios-support' of git://git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/radeon_driver.c | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 938c5fd0..fd870c4b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -215,4 +215,5 @@ EXTRA_DIST = \ radeon_chipset_gen.h \ radeon_pci_chipset_gen.h \ pcidb/ati_pciids.csv \ - pcidb/parse_pci_ids.pl + pcidb/parse_pci_ids.pl \ + radeon_atombios.h diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 8a798319..b8da9892 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -1683,11 +1683,21 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn) if (info->ChipFamily >= CHIP_FAMILY_R600) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "R600 support is mostly incomplete and very experimental\n"); + if (info->IsMobility) { + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "R600 mobility support is incomplete. You need to force enable it in the code for testing until developers are sure about it.\n"); + return FALSE; + } } if ((info->ChipFamily >= CHIP_FAMILY_RV515) && (info->ChipFamily < CHIP_FAMILY_R600)) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "R500 support is under development. Please report any issues to xorg-driver-ati@lists.x.org\n"); + if (info->IsMobility) { + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "R500 mobility support is incomplete. You need to force enable it in the code for testing until developers are sure about it.\n"); + return FALSE; + } } from = X_PROBED; |