diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-11-14 05:09:07 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-11-14 05:09:07 +1100 |
| commit | eb5487b9ca1d7ce60d5ddc784089d91cf176f439 (patch) | |
| tree | 55309717d95b69223a6c1c815286196c47ccd70c /shared-core/nv04_instmem.c | |
| parent | 2370ded79b4176d76cda1ec5f495fd33c2d566ed (diff) | |
| parent | 7c1e59fb0c5043d3d369f5feb8e195a6a3da3457 (diff) | |
Merge branch 'fifo-cleanup' into upstream-master
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, |