drm/nouveau: introduce new gart type, and name _SGDMA more appropriately

[mirror_ubuntu-bionic-kernel.git] / drivers / gpu / drm / nouveau / nouveau_sgdma.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
index a6002f456899f344bf8318ddb89e9153bde479da..fd2093c31e68d569ecc489653e2e59a1a485c6d6 100644 (file)
--- 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;
 }