1 files changed, 21 insertions, 10 deletions

diff --git a/src/gallium/winsys/dri/nouveau/nouveau_winsys.c b/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
index 2ca05d84c6..87619bdcfb 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
@@ -11,7 +11,7 @@ nouveau_pipe_notifier_alloc(struct nouveau_winsys *nvws, int count,
 {
 	struct nouveau_context *nv = nvws->nv;
 
-	return nouveau_notifier_alloc(nv->channel, nv->next_handle++,
+	return nouveau_notifier_alloc(nv->nvc->channel, nv->nvc->next_handle++,
 				      count, notify);
 }
 
@@ -20,17 +20,16 @@ nouveau_pipe_grobj_alloc(struct nouveau_winsys *nvws, int grclass,
 			 struct nouveau_grobj **grobj)
 {
 	struct nouveau_context *nv = nvws->nv;
+	struct nouveau_channel *chan = nv->nvc->channel;
 	int ret;
 
-	ret = nouveau_grobj_alloc(nv->channel, nv->next_handle++,
+	ret = nouveau_grobj_alloc(chan, nv->nvc->next_handle++,
 				  grclass, grobj);
 	if (ret)
 		return ret;
 
-	(*grobj)->subc = nv->next_subchannel++;
-	assert((*grobj)->subc <= 7);
-	BEGIN_RING_GR(*grobj, 0x0000, 1);
-	OUT_RING     ((*grobj)->handle);
+	assert(nv->nvc->next_subchannel < 7);
+	BIND_RING(chan, *grobj, nv->nvc->next_subchannel++);
 	return 0;
 }
 
@@ -71,24 +70,31 @@ nouveau_pipe_emit_reloc(struct nouveau_channel *chan, void *ptr,
 struct pipe_context *
 nouveau_pipe_create(struct nouveau_context *nv)
 {
+	struct nouveau_channel_context *nvc = nv->nvc;
 	struct nouveau_winsys *nvws = CALLOC_STRUCT(nouveau_winsys);
-	struct pipe_context *(*hw_create)(struct pipe_winsys *,
+	struct pipe_screen *(*hws_create)(struct pipe_winsys *,
 					  struct nouveau_winsys *,
-					  unsigned);
+					  unsigned chipset);
+	struct pipe_context *(*hw_create)(struct pipe_screen *, unsigned);
+	struct pipe_winsys *ws;
+	struct pipe_screen *pscreen;
 
 	if (!nvws)
 		return NULL;
 
 	switch (nv->chipset & 0xf0) {
 	case 0x30:
+		hws_create = nv30_screen_create;
 		hw_create = nv30_create;
 		break;
 	case 0x40:
 	case 0x60:
+		hws_create = nv40_screen_create;
 		hw_create = nv40_create;
 		break;
 	case 0x50:
 	case 0x80:
+		hws_create = nv50_screen_create;
 		hw_create = nv50_create;
 		break;
 	default:
@@ -97,7 +103,7 @@ nouveau_pipe_create(struct nouveau_context *nv)
 	}
 
 	nvws->nv		= nv;
-	nvws->channel		= nv->channel;
+	nvws->channel		= nv->nvc->channel;
 
 	nvws->res_init		= nouveau_resource_init;
 	nvws->res_alloc		= nouveau_resource_alloc;
@@ -119,6 +125,11 @@ nouveau_pipe_create(struct nouveau_context *nv)
 	nvws->surface_copy	= nouveau_pipe_surface_copy;
 	nvws->surface_fill	= nouveau_pipe_surface_fill;
 
-	return hw_create(nouveau_create_pipe_winsys(nv), nvws, nv->chipset);
+	ws = nouveau_create_pipe_winsys(nv);
+
+	if (!nvc->pscreen)
+		nvc->pscreen = hws_create(ws, nvws, nv->chipset);
+	nvc->pctx[nv->pctx_id] = hw_create(nvc->pscreen, nv->pctx_id);
+	return nvc->pctx[nv->pctx_id];
 }