diff options
| author | Eric Anholt <eric@anholt.net> | 2007-08-16 09:23:09 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-08-16 09:23:09 -0700 |
| commit | 0055fd5c35306a6363b0414f7f2220b3d1c27ecc (patch) | |
| tree | 40178e87d98efeb4bd9e0030b989a31e2090b9c9 /shared-core/nv04_instmem.c | |
| parent | 3a0bc518e35c62bb9c64c9105f836584d949653f (diff) | |
| parent | 02c4e0e757b69cd6ae38b8ab2c078b3f06fea661 (diff) | |
Merge branch 'master' into bo-set-pin
Diffstat (limited to 'shared-core/nv04_instmem.c')
| -rw-r--r-- | shared-core/nv04_instmem.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/shared-core/nv04_instmem.c b/shared-core/nv04_instmem.c index 35b20abd..5e0f6f4e 100644 --- a/shared-core/nv04_instmem.c +++ b/shared-core/nv04_instmem.c @@ -93,13 +93,6 @@ int nv04_instmem_init(struct drm_device *dev) nv04_instmem_determine_amount(dev); nv04_instmem_configure_fixed_tables(dev); - if ((ret = nouveau_gpuobj_new_fake(dev, dev_priv->ramht_offset, - dev_priv->ramht_size, - NVOBJ_FLAG_ZERO_ALLOC | - NVOBJ_FLAG_ALLOW_NO_REFS, - &dev_priv->ramht, NULL))) - return ret; - /* Create a heap to manage RAMIN allocations, we don't allocate * the space that was reserved for RAMHT/FC/RO. */ @@ -117,9 +110,6 @@ int nv04_instmem_init(struct drm_device *dev) void nv04_instmem_takedown(struct drm_device *dev) { - struct drm_nouveau_private *dev_priv = dev->dev_private; - - nouveau_gpuobj_del(dev, &dev_priv->ramht); } int @@ -139,7 +129,6 @@ nv04_instmem_clear(struct drm_device *dev, struct nouveau_gpuobj *gpuobj) if (gpuobj && gpuobj->im_backing) { if (gpuobj->im_bound) dev_priv->Engine.instmem.unbind(dev, gpuobj); - nouveau_mem_free(dev, gpuobj->im_backing); gpuobj->im_backing = NULL; } } |