Move viaEXAOffscreenAlloc() to via_exa.c

All EXA related code should be inside via_exa.c.

Signed-off-by: Kevin Brace <kevinbrace@gmx.com>

3 files changed, 30 insertions, 26 deletions

diff --git a/src/via_driver.h b/src/via_driver.h
index c39d0aa..086c3d3 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -361,6 +361,10 @@ void viaSetupDefaultOptions(ScrnInfoPtr pScrn);
 void viaProcessOptions(ScrnInfoPtr pScrn);
 
 /* In via_exa.c. */
+int viaEXAOffscreenAlloc(ScrnInfoPtr pScrn,
+                            struct buffer_object *obj,
+                            unsigned long size,
+                            unsigned long alignment);
 Bool viaInitExa(ScreenPtr pScreen);
 Bool viaAccelSetMode(int bpp, ViaTwodContext * tdc);
 void viaSetClippingRectangle(ScrnInfoPtr pScrn,
diff --git a/src/via_exa.c b/src/via_exa.c
index 1cae321..7ef69d6 100644
--- a/src/via_exa.c
+++ b/src/via_exa.c
@@ -788,6 +788,32 @@ viaExaTexUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src,
 
 #endif /* HAVE_DRI */
 
+int
+viaEXAOffscreenAlloc(ScrnInfoPtr pScrn, struct buffer_object *obj,
+                        unsigned long size, unsigned long alignment)
+{
+    ExaOffscreenArea *pArea;
+    int newSize = size;
+    int newAlignment;
+    int ret = 0;
+
+    newAlignment = alignment;
+    pArea = exaOffscreenAlloc(pScrn->pScreen, newSize,
+                                newAlignment, TRUE, NULL, NULL);
+    if (!pArea) {
+        ret = -ENOMEM;
+        goto exit;
+    }
+
+    obj->offset = pArea->offset;
+    obj->handle = (unsigned long) pArea;
+    obj->domain = TTM_PL_FLAG_VRAM;
+    obj->size = newSize;
+
+exit:
+    return ret;
+}
+
 Bool
 viaInitExa(ScreenPtr pScreen)
 {
diff --git a/src/via_memmgr.c b/src/via_memmgr.c
index 264eca0..70cf6ad 100644
--- a/src/via_memmgr.c
+++ b/src/via_memmgr.c
@@ -70,32 +70,6 @@ exit:
     return ret;
 }
 
-static int
-viaEXAOffscreenAlloc(ScrnInfoPtr pScrn, struct buffer_object *obj,
-                        unsigned long size, unsigned long alignment)
-{
-    ExaOffscreenArea *pArea;
-    int newSize = size;
-    int newAlignment;
-    int ret = 0;
-
-    newAlignment = alignment;
-    pArea = exaOffscreenAlloc(pScrn->pScreen, newSize,
-                                newAlignment, TRUE, NULL, NULL);
-    if (!pArea) {
-        ret = -ENOMEM;
-        goto exit;
-    }
-
-    obj->offset = pArea->offset;
-    obj->handle = (unsigned long) pArea;
-    obj->domain = TTM_PL_FLAG_VRAM;
-    obj->size = newSize;
-
-exit:
-    return ret;
-}
-
 struct buffer_object *
 drm_bo_alloc(ScrnInfoPtr pScrn, unsigned long size,
                 unsigned long alignment, int domain)