diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-07-26 08:38:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-07-26 08:38:59 +1000 |
| commit | fb05c4d621084d7a3fb3dd52d7d9c888eac852d0 (patch) | |
| tree | bca43a3c777984e0eb962d55817541801377d3c4 /shared-core/nouveau_object.c | |
| parent | 2556341f8baf0e0b7b5f7843135e43e662751af0 (diff) | |
| parent | 53428453758621da70d9608c9baec58b4b9383ec (diff) | |
Merge remote branch 'origin/modesetting-101' into modesetting-gem
Diffstat (limited to 'shared-core/nouveau_object.c')
| -rw-r--r-- | shared-core/nouveau_object.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/shared-core/nouveau_object.c b/shared-core/nouveau_object.c index 5664bfc8..894e7336 100644 --- a/shared-core/nouveau_object.c +++ b/shared-core/nouveau_object.c @@ -1036,8 +1036,7 @@ nouveau_gpuobj_channel_init(struct nouveau_channel *chan, /* VRAM ctxdma */ if (dev_priv->card_type >= NV_50) { ret = nouveau_gpuobj_dma_new(chan, NV_CLASS_DMA_IN_MEMORY, - 512*1024*1024, - dev_priv->fb_available_size, + 0, 0x100000000ULL, NV_DMA_ACCESS_RW, NV_DMA_TARGET_AGP, &vram); if (ret) { @@ -1059,6 +1058,9 @@ nouveau_gpuobj_channel_init(struct nouveau_channel *chan, } /* TT memory ctxdma */ + if (dev_priv->card_type >= NV_50) { + tt = vram; + } else if (dev_priv->gart_info.type != NOUVEAU_GART_NONE) { ret = nouveau_gpuobj_gart_dma_new(chan, 0, dev_priv->gart_info.aper_size, |