Import Mesa 11.2.2

1 files changed, 29 insertions, 11 deletions

diff --git a/lib/mesa/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c b/lib/mesa/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
index c6603e38a..598ffcbd0 100644
--- a/lib/mesa/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
+++ b/lib/mesa/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);
@@ -27,7 +30,7 @@ bool nouveau_drm_screen_unref(struct nouveau_screen *screen)
 	ret = --screen->refcount;
 	assert(ret >= 0);
 	if (ret == 0)
-		util_hash_table_remove(fd_tab, intptr_to_pointer(screen->device->fd));
+		util_hash_table_remove(fd_tab, intptr_to_pointer(screen->drm->fd));
 	pipe_mutex_unlock(nouveau_screen_mutex);
 	return ret == 0;
 }
@@ -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 pipe_screen *(*init)(struct nouveau_device *);
-	struct nouveau_screen *screen;
-	int ret, dupfd = -1;
+	struct nouveau_screen *(*init)(struct nouveau_device *);
+	struct nouveau_screen *screen = NULL;
+	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,15 @@ 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;
+
+	ret = nouveau_device_new(&drm->client, NV_DEVICE,
+				 &(struct nv_device_v0) {
+					.device = ~0ULL,
+				 }, sizeof(struct nv_device_v0), &dev);
 	if (ret)
 		goto err;
 
@@ -108,6 +122,7 @@ nouveau_drm_screen_create(int fd)
 	case 0xf0:
 	case 0x100:
 	case 0x110:
+	case 0x120:
 		init = nvc0_screen_create;
 		break;
 	default:
@@ -116,8 +131,8 @@ nouveau_drm_screen_create(int fd)
 		goto err;
 	}
 
-	screen = (struct nouveau_screen*)init(dev);
-	if (!screen)
+	screen = init(dev);
+	if (!screen || !screen->base.context_create)
 		goto err;
 
 	/* Use dupfd in hash table, to avoid errors if the original fd gets
@@ -130,10 +145,13 @@ nouveau_drm_screen_create(int fd)
 	return &screen->base;
 
 err:
-	if (dev)
+	if (screen) {
+		screen->base.destroy(&screen->base);
+	} else {
 		nouveau_device_del(&dev);
-	else if (dupfd >= 0)
+		nouveau_drm_del(&drm);
 		close(dupfd);
+	}
 	pipe_mutex_unlock(nouveau_screen_mutex);
 	return NULL;
 }