diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-01-25 13:30:46 -0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-01-25 13:30:46 -0800 |
| commit | 3886b7e62925a6eb7ca05e3ab23f3d4781439d06 (patch) | |
| tree | 529c661c969dbaf23f2dcd75c940a892a3f37d0e /shared-core/nouveau_fifo.c | |
| parent | 9f5cda44dbf5b8f3c7cc00b8a58eee2690a864e6 (diff) | |
| parent | 90ae39d2f07058dd128d2fb19ffad712ee75c9a0 (diff) | |
Merge branch 'master' into crestline
Diffstat (limited to 'shared-core/nouveau_fifo.c')
| -rw-r--r-- | shared-core/nouveau_fifo.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/shared-core/nouveau_fifo.c b/shared-core/nouveau_fifo.c index 1e2870f1..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); } |