Commit 4685a918 authored by Kevin Brace's avatar Kevin Brace

Deprecate R128EXAAccelInit

Signed-off-by: Kevin Brace's avatarKevin Brace <kevinbrace@gmx.com>
parent d9c7c830
......@@ -604,7 +604,6 @@ extern int R128CCEStop(ScrnInfoPtr pScrn);
extern void R128CopySwap(uint8_t *dst, uint8_t *src, unsigned int size, int swap);
#ifdef USE_EXA
extern Bool R128EXAAccelInit(ScreenPtr pScreen);
extern Bool R128EXAInit(ScreenPtr pScreen);
extern Bool R128GetDatatypeBpp(int bpp, uint32_t *type);
extern Bool R128GetPixmapOffsetPitch(PixmapPtr pPix, uint32_t *pitch_offset);
......
......@@ -1674,15 +1674,6 @@ R128AccelInit(Bool noAccel, ScreenPtr pScreen)
R128InfoPtr info = R128PTR(pScrn);
if (!noAccel) {
if (info->useEXA) {
#ifdef USE_EXA
if (R128EXAAccelInit(pScreen)) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"EXA acceleration enabled.\n");
}
#endif
}
if ((!info->useEXA) ||
((info->useEXA) && (!info->accelOn))) {
#ifdef HAVE_XAA_H
......@@ -1924,22 +1915,31 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DECL)
}
}
#ifdef USE_EXA
else {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Filling in EXA memory info\n");
else {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Filling in EXA memory info\n");
R128AccelInit(info->noAccel, pScreen);
info->ExaDriver->offScreenBase = pScrn->virtualY * width_bytes;
info->ExaDriver = exaDriverAlloc();
if (!info->ExaDriver) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Could not allocate EXA driver...\n");
info->accelOn = FALSE;
} else {
info->ExaDriver->offScreenBase = pScrn->virtualY * width_bytes;
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Filled in offs\n");
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Filled in offs\n");
/* Don't give EXA the true full memory size, because the
textureSize sized chunk on the end is handled by DRI */
info->ExaDriver->memorySize = total;
/*
* Don't give EXA the true full memory size, because
* the textureSize sized chunk on the end is handled
* by DRI.
*/
info->ExaDriver->memorySize = total;
R128VerboseInitEXA(pScreen);
}
R128VerboseInitEXA(pScreen);
}
}
#endif
#ifdef R128DRI
......
......@@ -393,25 +393,6 @@ R128CCESync(ScreenPtr pScreen, int marker)
#endif
Bool
R128EXAAccelInit(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
R128InfoPtr info = R128PTR(pScrn);
/* Don't init EXA here because it'll be taken care of in mm init */
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Allocating EXA driver...\n");
info->ExaDriver = exaDriverAlloc();
if (!info->ExaDriver) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Could not allocate EXA driver...\n");
info->accelOn = FALSE;
}
return TRUE;
}
Bool
R128EXAInit(ScreenPtr pScreen)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment