diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-11-14 03:27:37 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-11-14 03:27:37 +1100 |
| commit | d0904f0f2b87c725d3e67060419c445259bd4a5e (patch) | |
| tree | 0f8721dffc886a1777f0749aed1309bd6bda98fa /shared-core/nv04_instmem.c | |
| parent | 793cd1dad5e248509a1b09dce7126f236efadb3e (diff) | |
nouveau: funcs to determine active channel on PFIFO.
Diffstat (limited to 'shared-core/nv04_instmem.c')
| -rw-r--r-- | shared-core/nv04_instmem.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/shared-core/nv04_instmem.c b/shared-core/nv04_instmem.c index 56968181..804f9a75 100644 --- a/shared-core/nv04_instmem.c +++ b/shared-core/nv04_instmem.c @@ -33,6 +33,7 @@ static void nv04_instmem_configure_fixed_tables(struct drm_device *dev) { struct drm_nouveau_private *dev_priv = dev->dev_private; + struct nouveau_engine *engine = &dev_priv->Engine; /* FIFO hash table (RAMHT) * use 4k hash table at RAMIN+0x10000 @@ -61,8 +62,8 @@ nv04_instmem_configure_fixed_tables(struct drm_device *dev) case NV_40: case NV_44: dev_priv->ramfc_offset = 0x20000; - dev_priv->ramfc_size = nouveau_fifo_number(dev) * - nouveau_fifo_ctx_size(dev); + dev_priv->ramfc_size = engine->fifo.channels * + nouveau_fifo_ctx_size(dev); break; case NV_30: case NV_20: @@ -72,8 +73,8 @@ nv04_instmem_configure_fixed_tables(struct drm_device *dev) case NV_04: default: dev_priv->ramfc_offset = 0x11400; - dev_priv->ramfc_size = nouveau_fifo_number(dev) * - nouveau_fifo_ctx_size(dev); + dev_priv->ramfc_size = engine->fifo.channels * + nouveau_fifo_ctx_size(dev); break; } DRM_DEBUG("RAMFC offset=0x%x, size=%d\n", dev_priv->ramfc_offset, |