nouveau: create linear gart/vram mman in common screen init

[mesa.git] / src / gallium / drivers / nouveau / nouveau_screen.c

diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
index 233a91a2ffd9106f09d878c0752a7b46da00e5e9..e6cd3064c9a6c729c2d287402cf5da98f0a6d033 100644 (file)
--- a/src/gallium/drivers/nouveau/nouveau_screen.c
+++ b/src/gallium/drivers/nouveau/nouveau_screen.c
@@ -5,6 +5,8 @@
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
 #include "util/u_format.h"
+#include "util/u_format_s3tc.h"
+#include "util/u_string.h"
 
 #include <stdio.h>
 #include <errno.h>
@@ -12,9 +14,10 @@
 #include "nouveau/nouveau_bo.h"
 #include "nouveau_winsys.h"
 #include "nouveau_screen.h"
+#include "nouveau_fence.h"
 
 /* XXX this should go away */
-#include "state_tracker/drm_api.h"
+#include "state_tracker/drm_driver.h"
 #include "util/u_simple_screen.h"
 
 static const char *
@@ -23,7 +26,7 @@ nouveau_screen_get_name(struct pipe_screen *pscreen)
        struct nouveau_device *dev = nouveau_screen(pscreen)->device;
        static char buffer[128];
 
-       snprintf(buffer, sizeof(buffer), "NV%02X", dev->chipset);
+       util_snprintf(buffer, sizeof(buffer), "NV%02X", dev->chipset);
        return buffer;
 }
 
@@ -51,8 +54,6 @@ nouveau_screen_bo_new(struct pipe_screen *pscreen, unsigned alignment,
 
        if (bind & (PIPE_BIND_RENDER_TARGET |
                        PIPE_BIND_DEPTH_STENCIL |
-                       PIPE_BIND_BLIT_SOURCE |
-                       PIPE_BIND_BLIT_DESTINATION |
                        PIPE_BIND_SCANOUT |
                        PIPE_BIND_DISPLAY_TARGET |
                        PIPE_BIND_SAMPLER_VIEW))
@@ -150,7 +151,7 @@ nouveau_screen_fence_ref(struct pipe_screen *pscreen,
                         struct pipe_fence_handle **ptr,
                         struct pipe_fence_handle *pfence)
 {
-       *ptr = pfence;
+       nouveau_fence_ref(nouveau_fence(pfence), (struct nouveau_fence **)ptr);
 }
 
 static int
@@ -158,7 +159,7 @@ nouveau_screen_fence_signalled(struct pipe_screen *screen,
                               struct pipe_fence_handle *pfence,
                               unsigned flags)
 {
-       return 0;
+       return !nouveau_fence_signalled(nouveau_fence(pfence));
 }
 
 static int
@@ -166,7 +167,7 @@ nouveau_screen_fence_finish(struct pipe_screen *screen,
                            struct pipe_fence_handle *pfence,
                            unsigned flags)
 {
-       return 0;
+       return !nouveau_fence_wait(nouveau_fence(pfence));
 }
 
 
@@ -182,7 +183,7 @@ nouveau_screen_bo_from_handle(struct pipe_screen *pscreen,
        ret = nouveau_bo_handle_ref(dev, whandle->handle, &bo);
        if (ret) {
                debug_printf("%s: ref name 0x%08x failed with %d\n",
-                            __func__, whandle->handle, ret);
+                            __FUNCTION__, whandle->handle, ret);
                return NULL;
        }
 
@@ -236,7 +237,7 @@ nouveau_screen_init(struct nouveau_screen *screen, struct nouveau_device *dev)
        int ret;
 
        ret = nouveau_channel_alloc(dev, 0xbeef0201, 0xbeef0202,
-                                   &screen->channel);
+                                   512*1024, &screen->channel);
        if (ret)
                return ret;
        screen->device = dev;
@@ -248,6 +249,12 @@ nouveau_screen_init(struct nouveau_screen *screen, struct nouveau_device *dev)
        pscreen->fence_signalled = nouveau_screen_fence_signalled;
        pscreen->fence_finish = nouveau_screen_fence_finish;
 
+       util_format_s3tc_init();
+
+       screen->mm_GART = nouveau_mm_create(dev,
+                                           NOUVEAU_BO_GART | NOUVEAU_BO_MAP,
+                                           0x000);
+       screen->mm_VRAM = nouveau_mm_create(dev, NOUVEAU_BO_VRAM, 0x000);
        return 0;
 }
 
@@ -255,7 +262,13 @@ void
 nouveau_screen_fini(struct nouveau_screen *screen)
 {
        struct pipe_winsys *ws = screen->base.winsys;
+
+       nouveau_mm_destroy(screen->mm_GART);
+       nouveau_mm_destroy(screen->mm_VRAM);
+
        nouveau_channel_free(&screen->channel);
-       ws->destroy(ws);
+
+       if (ws)
+               ws->destroy(ws);
 }