summaryrefslogtreecommitdiff
path: root/shared-core/nouveau_fifo.c
diff options
context:
space:
mode:
authorMatthieu Castet <mat@mat-pc.(none)>2007-01-13 21:43:47 +0100
committerMatthieu Castet <mat@mat-pc.(none)>2007-01-13 21:44:50 +0100
commitcd5f543b2f3d6dd4c45f676c6fb9848b4d8a1c33 (patch)
tree632e955ea970d08a71ccd303bf953cfe5a76bc57 /shared-core/nouveau_fifo.c
parent4ae64a1b583be3ef13338e8029e7e9efe21f2c2f (diff)
nouveau: first step to make graph ctx works
It is still not working, but now we could use some 3D commands without needed to run nvidia blob before.
Diffstat (limited to 'shared-core/nouveau_fifo.c')
-rw-r--r--shared-core/nouveau_fifo.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/shared-core/nouveau_fifo.c b/shared-core/nouveau_fifo.c
index 98a1344e..cb94afc5 100644
--- a/shared-core/nouveau_fifo.c
+++ b/shared-core/nouveau_fifo.c
@@ -538,7 +538,6 @@ static int nouveau_fifo_alloc(drm_device_t* dev,drm_nouveau_fifo_alloc_t* init,
init->channel = i;
init->put_base = 0;
dev_priv->cur_fifo = init->channel;
- dev_priv->fifos[i].pgraph_ctx_user = i << 24;
nouveau_wait_for_idle(dev);
@@ -551,8 +550,9 @@ static int nouveau_fifo_alloc(drm_device_t* dev,drm_nouveau_fifo_alloc_t* init,
/* Construct inital RAMFC for new channel */
if (dev_priv->card_type < NV_10) {
nouveau_nv04_context_init(dev, init);
- } else if (dev_priv->card_type < NV_30) {
- nouveau_nv10_context_init(dev, init);
+ } else if (dev_priv->card_type < NV_30) {
+ nv10_graph_context_create(dev, init->channel);
+ nouveau_nv10_context_init(dev, init);
} else if (dev_priv->card_type < NV_40) {
ret = nv30_graph_context_create(dev, init->channel);
if (ret) {