diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2006-12-27 14:50:48 +0200 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2007-01-21 19:42:04 +0200 |
| commit | 0ba2703e621ef76f4402b75774813732e6d38e84 (patch) | |
| tree | 41f9c5db72a61f097e72e178844a49dba7451a4b /src/atipreinit.c | |
| parent | 8c189183bb7d4c129fc607c7d92009a8b23f70af (diff) | |
Drop probing for VGA, VGAWonder, 8514, Mach32.
- ChipHasSUBSYS_CNTL
- Coprocessor
- SharedAccelerator
- SharedVGA <=> (VGAAdapter != ATI_ADAPTER_NONE)
Diffstat (limited to 'src/atipreinit.c')
| -rw-r--r-- | src/atipreinit.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/src/atipreinit.c b/src/atipreinit.c index 047aeedd..ff5cc04c 100644 --- a/src/atipreinit.c +++ b/src/atipreinit.c @@ -465,8 +465,7 @@ ATIPreInit pResources = pEntity->resources; xfree(pEntity); if (!pResources) - pResources = xf86RegisterResources(pATI->iEntity, NULL, - pATI->SharedAccelerator ? ResShared : ResExclusive); + pResources = xf86RegisterResources(pATI->iEntity, NULL, ResShared); if (pResources) { xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR, @@ -1491,12 +1490,6 @@ ATIPreInit "VGA Wonder registers at I/O port 0x%04lX.\n", pATI->CPIO_VGAWonder); - if (pATI->Coprocessor != ATI_CHIP_NONE) - xf86DrvMsg(pScreenInfo->scrnIndex, X_PROBED, - "%s graphics accelerator detected,\n with %d kB of coprocessor" - " memory.\n", - ATIChipNames[pATI->Coprocessor], pATI->VideoRAM); - #endif /* AVOID_CPIO */ xf86DrvMsg(pScreenInfo->scrnIndex, X_PROBED, @@ -1710,15 +1703,6 @@ ATIPreInit ATIUnmapApertures(pScreenInfo->scrnIndex, pATI); return FALSE; } - - if (pATI->Coprocessor != ATI_CHIP_NONE) - { - /* Ignore any 8514/A or Mach8 accelerator from this point on */ - pATI->Adapter = pATI->VGAAdapter; - - /* Accelerator and VGA cannot share memory */ - pATI->VideoRAM = 0; - } } #endif /* AVOID_CPIO */ @@ -2856,12 +2840,6 @@ ATIPreInit else { pATIHW->crtc = ATI_CRTC_VGA; -#if 0 /* ___NOT_YET___ */ - if (pATI->ChipHasSUBSYS_CNTL) - { - } - else -#endif if ((pATI->Chip >= ATI_CHIP_88800GXC) && (pATI->LockData.crtc_gen_cntl & CRTC_EXT_DISP_EN)) { |