diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-01-11 14:10:09 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-02-25 06:30:15 +1000 |
| commit | 58e6c7a9183071b89b0ac94862f369ed55775a7a (patch) | |
| tree | f72e90154cb8663230d2ea7f12dcb3257118ecc0 /drivers/gpu/drm/nouveau/nouveau_sgdma.c | |
| parent | efa58db3de82ab0fdc0774aef69e2dd8a27cc98f (diff) | |
| download | op-kernel-dev-58e6c7a9183071b89b0ac94862f369ed55775a7a.zip op-kernel-dev-58e6c7a9183071b89b0ac94862f369ed55775a7a.tar.gz | |
drm/nouveau: introduce new gart type, and name _SGDMA more appropriately
In preparation for the addition of a new nv40 backend, we'll need to be
able to distinguish between a paged dma object and the on-chip GART.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_sgdma.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_sgdma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c index a6002f4..fd2093c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c +++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c @@ -237,6 +237,7 @@ nouveau_sgdma_init(struct drm_device *dev) dev_priv->gart_info.aper_base = dev_priv->gart_info.vma.offset; dev_priv->gart_info.aper_size = 512 * 1024 * 1024; + dev_priv->gart_info.type = NOUVEAU_GART_HW; } else { if(dev_priv->ramin_rsvd_vram < 2 * 1024 * 1024) aper_size = 64 * 1024 * 1024; @@ -266,9 +267,9 @@ nouveau_sgdma_init(struct drm_device *dev) dev_priv->gart_info.sg_ctxdma = gpuobj; dev_priv->gart_info.aper_base = 0; dev_priv->gart_info.aper_size = aper_size; + dev_priv->gart_info.type = NOUVEAU_GART_PDMA; } - dev_priv->gart_info.type = NOUVEAU_GART_SGDMA; return 0; } |
