Import the xf8_16bpp implementation

This is trivial, just do it directly.

Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson
2010-11-22 16:37:29 -05:00
parent 02b3264149
commit 5830fed3eb

View File

@@ -111,8 +111,7 @@
#include "micmap.h"
#include "fb.h"
#include "cfb8_16.h"
#include "fboverlay.h"
/* Needed for the 1 and 4 bpp framebuffers */
#ifdef HAVE_XF1BPP
@@ -1332,16 +1331,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
}
break;
#endif
case 16:
if (cPtr->Flags & ChipsOverlay8plus16) {
if (xf86LoadSubModule(pScrn, "xf8_16bpp") == NULL) {
vbeFree(cPtr->pVbe);
cPtr->pVbe = NULL;
CHIPSFreeRec(pScrn);
return FALSE;
}
break;
}
default:
if (xf86LoadSubModule(pScrn, "fb") == NULL) {
vbeFree(cPtr->pVbe);
@@ -3904,6 +3893,18 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices,
hwp->disablePalette(hwp);
}
static Bool
cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
int xsize, int ysize, int dpix, int dpiy,
int width16, int width8)
{
return
(fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize,
dpix, dpiy, width16, width8, 16, 8) &&
fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize,
dpix, dpiy, width16, width8, 16, 8, 16, 8));
}
/* Mandatory */
static Bool
CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)