From 78a4f5c1bc37cbc581191f47b8b19250bfb86c1e Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Wed, 17 Jan 2007 08:46:59 -0500 Subject: nouveau: Try to get nv35 pgraph switching working. Doesn't quite yet. Hook into nv20 pgraph switching functions (they're identical for nv3x). Actually call nv30_pgraph_context_init so the ctx_table is allocated. Thanks to Carlos Martin for the help. --- shared-core/nouveau_fifo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shared-core/nouveau_fifo.c') diff --git a/shared-core/nouveau_fifo.c b/shared-core/nouveau_fifo.c index 1e2870f1..8ea0564d 100644 --- a/shared-core/nouveau_fifo.c +++ b/shared-core/nouveau_fifo.c @@ -373,7 +373,7 @@ static void nouveau_nv30_context_init(drm_device_t *dev, /* * TODO: We need to put this somewhere... */ - /* INSTANCE_WR(dev_priv->ctx_table, init->channel, grctx_inst); */ + /*INSTANCE_WR(dev_priv->ctx_table, init->channel, grctx_inst);*/ RAMFC_WR(DMA_SUBROUTINE, init->put_base); } -- cgit v1.2.3 From ab72a7714e4e9b87cc93887d1978f1c533255566 Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Thu, 18 Jan 2007 21:39:09 -0500 Subject: nouveau: Remove write to CTX_SIZE. This gives us proper nv3x PGRAPH switching. --- shared-core/nouveau_fifo.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'shared-core/nouveau_fifo.c') diff --git a/shared-core/nouveau_fifo.c b/shared-core/nouveau_fifo.c index 8ea0564d..e80ba766 100644 --- a/shared-core/nouveau_fifo.c +++ b/shared-core/nouveau_fifo.c @@ -368,12 +368,7 @@ static void nouveau_nv30_context_init(drm_device_t *dev, RAMFC_WR(ACQUIRE_TIMESTAMP, NV_READ(NV_PFIFO_CACH1_ACQUIRE_TIMESTAMP)); RAMFC_WR(ACQUIRE_TIMEOUT, NV_READ(NV_PFIFO_CACH1_ACQUIRE_TIMEOUT)); RAMFC_WR(SEMAPHORE, NV_READ(NV_PFIFO_CACH1_SEMAPHORE)); - NV_WRITE(NV_PGRAPH_CHANNEL_CTX_SIZE, grctx_inst); /* Misnomer. Really a ptr to the grctx */ - /* - * TODO: We need to put this somewhere... - */ - /*INSTANCE_WR(dev_priv->ctx_table, init->channel, grctx_inst);*/ RAMFC_WR(DMA_SUBROUTINE, init->put_base); } -- cgit v1.2.3