diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2011-01-10 23:10:09 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2011-02-24 15:30:15 -0500 |
commit | 58e6c7a9183071b89b0ac94862f369ed55775a7a (patch) | |
tree | f72e90154cb8663230d2ea7f12dcb3257118ecc0 /drivers/gpu/drm/nouveau/nouveau_sgdma.c | |
parent | efa58db3de82ab0fdc0774aef69e2dd8a27cc98f (diff) |
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 a6002f456899..fd2093c31e68 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) | |||
237 | 237 | ||
238 | dev_priv->gart_info.aper_base = dev_priv->gart_info.vma.offset; | 238 | dev_priv->gart_info.aper_base = dev_priv->gart_info.vma.offset; |
239 | dev_priv->gart_info.aper_size = 512 * 1024 * 1024; | 239 | dev_priv->gart_info.aper_size = 512 * 1024 * 1024; |
240 | dev_priv->gart_info.type = NOUVEAU_GART_HW; | ||
240 | } else { | 241 | } else { |
241 | if(dev_priv->ramin_rsvd_vram < 2 * 1024 * 1024) | 242 | if(dev_priv->ramin_rsvd_vram < 2 * 1024 * 1024) |
242 | aper_size = 64 * 1024 * 1024; | 243 | aper_size = 64 * 1024 * 1024; |
@@ -266,9 +267,9 @@ nouveau_sgdma_init(struct drm_device *dev) | |||
266 | dev_priv->gart_info.sg_ctxdma = gpuobj; | 267 | dev_priv->gart_info.sg_ctxdma = gpuobj; |
267 | dev_priv->gart_info.aper_base = 0; | 268 | dev_priv->gart_info.aper_base = 0; |
268 | dev_priv->gart_info.aper_size = aper_size; | 269 | dev_priv->gart_info.aper_size = aper_size; |
270 | dev_priv->gart_info.type = NOUVEAU_GART_PDMA; | ||
269 | } | 271 | } |
270 | 272 | ||
271 | dev_priv->gart_info.type = NOUVEAU_GART_SGDMA; | ||
272 | return 0; | 273 | return 0; |
273 | } | 274 | } |
274 | 275 | ||