diff --git a/hw/xfree86/common/xf86fbman.c b/hw/xfree86/common/xf86fbman.c index b2e2e1b2f..6b800cec4 100644 --- a/hw/xfree86/common/xf86fbman.c +++ b/hw/xfree86/common/xf86fbman.c @@ -1283,51 +1283,3 @@ xf86InitFBManagerLinear(ScreenPtr pScreen, int offset, int size) return TRUE; } - -/* This is an implementation specific function and should - disappear after the next release. People should use the - real linear functions instead */ - -FBAreaPtr -xf86AllocateLinearOffscreenArea(ScreenPtr pScreen, - int length, - int gran, - MoveAreaCallbackProcPtr moveCB, - RemoveAreaCallbackProcPtr removeCB, - void *privData) -{ - FBManagerFuncsPtr funcs; - FBManagerPtr offman; - BoxPtr extents; - int w, h; - - if (xf86FBManagerKey == NULL) - return NULL; - if (!(funcs = (FBManagerFuncsPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86FBManagerKey))) - return NULL; - - offman = (FBManagerPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86FBScreenKey); - extents = RegionExtents(offman->InitialBoxes); - w = extents->x2 - extents->x1; - - if (gran > 1) { - if (gran > w) - return NULL; - - if (w % gran) - length += gran - 1; - } - - if (length <= w) { /* special case */ - h = 1; - w = length; - } - else { - h = (length + w - 1) / w; - } - - return (*funcs->AllocateOffscreenArea) (pScreen, w, h, gran, moveCB, - removeCB, privData); -} diff --git a/hw/xfree86/common/xf86fbman.h b/hw/xfree86/common/xf86fbman.h index 4ba3a888b..c75a281bf 100644 --- a/hw/xfree86/common/xf86fbman.h +++ b/hw/xfree86/common/xf86fbman.h @@ -117,14 +117,6 @@ xf86AllocateOffscreenArea(ScreenPtr pScreen, MoveAreaCallbackProcPtr moveCB, RemoveAreaCallbackProcPtr removeCB, void *privData); -extern _X_EXPORT FBAreaPtr -xf86AllocateLinearOffscreenArea(ScreenPtr pScreen, - int length, - int granularity, - MoveAreaCallbackProcPtr moveCB, - RemoveAreaCallbackProcPtr removeCB, - void *privData); - extern _X_EXPORT FBLinearPtr xf86AllocateOffscreenLinear(ScreenPtr pScreen, int length,