diff options
Diffstat (limited to 'src/atiscreen.c')
| -rw-r--r-- | src/atiscreen.c | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/src/atiscreen.c b/src/atiscreen.c index ca41ff1a..e8499415 100644 --- a/src/atiscreen.c +++ b/src/atiscreen.c @@ -61,12 +61,8 @@ #include "shadowfb.h" #include "xf86cmap.h" -#include "xf1bpp.h" -#include "xf4bpp.h" - #include "fb.h" -#include "mibank.h" #include "micmap.h" #include "mipointer.h" @@ -139,11 +135,6 @@ ATIMach64SetupMemXAA_NoDRI int maxScanlines = ATIMach64MaxY; int maxPixelArea, PixelArea; -#ifndef AVOID_CPIO - - if (!pATI->BankInfo.BankSize) - -#endif /* AVOID_CPIO */ { /* * Note: If PixelArea exceeds the engine's maximum, the excess is @@ -457,23 +448,6 @@ ATIScreenInit /* Initialise framebuffer layer */ switch (pATI->bitsPerPixel) { - -#ifndef AVOID_CPIO - - case 1: - pATI->Closeable = xf1bppScreenInit(pScreen, pFB, - pScreenInfo->virtualX, pScreenInfo->virtualY, - pScreenInfo->xDpi, pScreenInfo->yDpi, pATI->displayWidth); - break; - - case 4: - pATI->Closeable = xf4bppScreenInit(pScreen, pFB, - pScreenInfo->virtualX, pScreenInfo->virtualY, - pScreenInfo->xDpi, pScreenInfo->yDpi, pATI->displayWidth); - break; - -#endif /* AVOID_CPIO */ - case 8: case 16: case 24: @@ -512,7 +486,6 @@ ATIScreenInit } /* If applicable, initialise RENDER extension */ - if (pATI->bitsPerPixel > 4) { if (pATI->OptionShadowFB) { @@ -521,19 +494,6 @@ ATIScreenInit "RENDER extension not supported with a shadowed" " framebuffer.\n"); } - -#ifndef AVOID_CPIO - - else if (pATI->BankInfo.BankSize) - { - if (serverGeneration == 1) - xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, - "RENDER extension not supported with a banked" - " framebuffer.\n"); - } - -#endif /* AVOID_CPIO */ - else if (!fbPictureInit(pScreen, NULL, 0) && (serverGeneration == 1)) { @@ -544,16 +504,6 @@ ATIScreenInit xf86SetBlackWhitePixels(pScreen); -#ifndef AVOID_CPIO - - /* Initialise banking if needed */ - if (!miInitializeBanking(pScreen, - pScreenInfo->virtualX, pScreenInfo->virtualY, - pATI->displayWidth, &pATI->BankInfo)) - return FALSE; - -#endif /* AVOID_CPIO */ - #ifdef USE_XAA if (!pATI->useEXA) { @@ -612,24 +562,11 @@ ATIScreenInit if (!miCreateDefColormap(pScreen)) return FALSE; -#ifdef AVOID_CPIO - if (!xf86HandleColormaps(pScreen, 256, pATI->rgbBits, ATILoadPalette, NULL, CMAP_PALETTED_TRUECOLOR | CMAP_LOAD_EVEN_IF_OFFSCREEN)) return FALSE; -#else /* AVOID_CPIO */ - - if (pATI->depth > 1) - if (!xf86HandleColormaps(pScreen, (pATI->depth == 4) ? 16 : 256, - pATI->rgbBits, ATILoadPalette, NULL, - CMAP_PALETTED_TRUECOLOR | - CMAP_LOAD_EVEN_IF_OFFSCREEN)) - return FALSE; - -#endif /* AVOID_CPIO */ - /* Initialise shadow framebuffer */ if (pATI->OptionShadowFB && !ShadowFBInit(pScreen, ATIRefreshArea)) |