nouveau: remove use of deprecated nouveau_device_wrap()

Switching to the newer libdrm entry-points tells libdrm that it's OK to
make use of newer kernel interfaces.

We want to be able to isolate any bugs to either the interfaces changes,
or the use of NVIF itself.  As such, this commit has a slight hack which
forces libdrm to continue using the older kernel interfaces.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Tested-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>

diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
index 3cdcc2066a4fafec6661aaae44d211ca1df4a1a6..4ca9e5c06cde9c2913b4b36c313fbb783f8182cc 100644 (file)
--- a/src/gallium/drivers/nouveau/nouveau_screen.c
+++ b/src/gallium/drivers/nouveau/nouveau_screen.c
@@ -234,6 +234,8 @@ nouveau_screen_init(struct nouveau_screen *screen, struct nouveau_device *dev)
 void
 nouveau_screen_fini(struct nouveau_screen *screen)
 {
+   int fd = screen->drm->fd;
+
    nouveau_mm_destroy(screen->mm_GART);
    nouveau_mm_destroy(screen->mm_VRAM);
 
@@ -243,6 +245,8 @@ nouveau_screen_fini(struct nouveau_screen *screen)
    nouveau_object_del(&screen->channel);
 
    nouveau_device_del(&screen->device);
+   nouveau_drm_del(&screen->drm);
+   close(fd);
 }
 
 static void

diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
index 3a686bd8f6c411d3386fc9679d0a2767b2cffb3e..f13988ea5265c29daa64e6cdd93bbbe024989ddd 100644 (file)
--- a/src/gallium/drivers/nouveau/nouveau_winsys.h
+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
@@ -6,6 +6,7 @@
 
 #include "pipe/p_defines.h"
 
+#include <drm.h>
 #include <nouveau.h>
 
 #ifndef NV04_PFIFO_MAX_PACKET_LEN

diff --git a/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c b/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
index 456530d7427159726a6345deb46b82a1d8bd3ed6..ff017e45386128516411438604ece0c96f8f5a94 100644 (file)
--- a/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
+++ b/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
@@ -13,6 +13,9 @@
 #include "nouveau/nouveau_winsys.h"
 #include "nouveau/nouveau_screen.h"
 
+#include <nvif/class.h>
+#include <nvif/cl0080.h>
+
 static struct util_hash_table *fd_tab = NULL;
 
 pipe_static_mutex(nouveau_screen_mutex);
@@ -57,16 +60,19 @@ static int compare_fd(void *key1, void *key2)
 PUBLIC struct pipe_screen *
 nouveau_drm_screen_create(int fd)
 {
+       struct nouveau_drm *drm = NULL;
        struct nouveau_device *dev = NULL;
        struct nouveau_screen *(*init)(struct nouveau_device *);
        struct nouveau_screen *screen = NULL;
-       int ret, dupfd = -1;
+       int ret, dupfd;
 
        pipe_mutex_lock(nouveau_screen_mutex);
        if (!fd_tab) {
                fd_tab = util_hash_table_create(hash_fd, compare_fd);
-               if (!fd_tab)
-                       goto err;
+               if (!fd_tab) {
+                       pipe_mutex_unlock(nouveau_screen_mutex);
+                       return NULL;
+               }
        }
 
        screen = util_hash_table_get(fd_tab, intptr_to_pointer(fd));
@@ -86,7 +92,17 @@ nouveau_drm_screen_create(int fd)
         * creation error.
         */
        dupfd = dup(fd);
-       ret = nouveau_device_wrap(dupfd, 1, &dev);
+
+       ret = nouveau_drm_new(dupfd, &drm);
+       if (ret)
+               goto err;
+
+       drm->nvif = false;
+
+       ret = nouveau_device_new(&drm->client, NV_DEVICE,
+                                &(struct nv_device_v0) {
+                                       .device = ~0ULL,
+                                }, sizeof(struct nv_device_v0), &dev);
        if (ret)
                goto err;
 
@@ -133,10 +149,9 @@ err:
        if (screen) {
                screen->base.destroy(&screen->base);
        } else {
-               if (dev)
-                       nouveau_device_del(&dev);
-               else if (dupfd >= 0)
-                       close(dupfd);
+               nouveau_device_del(&dev);
+               nouveau_drm_del(&drm);
+               close(dupfd);
        }
        pipe_mutex_unlock(nouveau_screen_mutex);
        return NULL;

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
index 153f18e4a34845a1274da0f01a176542e8d18c1e..1a74ae2c53d571ae64b1bd3205f98017b95cb3f7 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
@@ -40,6 +40,9 @@
 #include "main/renderbuffer.h"
 #include "swrast/s_renderbuffer.h"
 
+#include <nvif/class.h>
+#include <nvif/cl0080.h>
+
 static const __DRIextension *nouveau_screen_extensions[];
 
 static void
@@ -99,12 +102,24 @@ nouveau_init_screen2(__DRIscreen *dri_screen)
        dri_screen->driverPrivate = screen;
 
        /* Open the DRM device. */
-       ret = nouveau_device_wrap(dri_screen->fd, 0, &screen->device);
+       ret = nouveau_drm_new(dri_screen->fd, &screen->drm);
        if (ret) {
                nouveau_error("Error opening the DRM device.\n");
                goto fail;
        }
 
+       screen->drm->nvif = false;
+
+       ret = nouveau_device_new(&screen->drm->client, NV_DEVICE,
+                                &(struct nv_device_v0) {
+                                       .device = ~0ULL,
+                                }, sizeof(struct nv_device_v0),
+                                &screen->device);
+       if (ret) {
+               nouveau_error("Error creating device object.\n");
+               goto fail;
+       }
+
        /* Choose the card specific function pointers. */
        switch (screen->device->chipset & 0xf0) {
        case 0x00:
@@ -213,6 +228,7 @@ nouveau_destroy_screen(__DRIscreen *dri_screen)
                return;
 
        nouveau_device_del(&screen->device);
+       nouveau_drm_del(&screen->drm);
 
        free(screen);
        dri_screen->driverPrivate = NULL;

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.h b/src/mesa/drivers/dri/nouveau/nouveau_screen.h
index 45b1ee928d6e1f41d70a24625f52e9309e908d8f..e3c192802d49b9dba0427e5cbeca13a5c0c92f54 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.h
@@ -33,6 +33,7 @@ struct nouveau_context;
 
 struct nouveau_screen {
        __DRIscreen *dri_screen;
+       struct nouveau_drm *drm;
        struct nouveau_device *device;
        const struct nouveau_driver *driver;
 };