aboutsummaryrefslogtreecommitdiff
path: root/linux-core/nouveau_drv.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux-core/nouveau_drv.c')
-rw-r--r--linux-core/nouveau_drv.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/linux-core/nouveau_drv.c b/linux-core/nouveau_drv.c
index 9e6c8f41..1bd8d977 100644
--- a/linux-core/nouveau_drv.c
+++ b/linux-core/nouveau_drv.c
@@ -41,9 +41,18 @@ static struct pci_device_id pciidlist[] = {
}
};
-#ifdef NOUVEAU_HAVE_BUFFER
-static uint32_t nouveau_mem_prios[] = { DRM_BO_MEM_VRAM, DRM_BO_MEM_TT, DRM_BO_MEM_LOCAL };
-static uint32_t nouveau_busy_prios[] = { DRM_BO_MEM_TT, DRM_BO_MEM_LOCAL };
+static uint32_t nouveau_mem_prios[] = {
+ DRM_BO_MEM_PRIV0,
+ DRM_BO_MEM_VRAM,
+ DRM_BO_MEM_TT,
+ DRM_BO_MEM_LOCAL
+};
+static uint32_t nouveau_busy_prios[] = {
+ DRM_BO_MEM_TT,
+ DRM_BO_MEM_PRIV0,
+ DRM_BO_MEM_VRAM,
+ DRM_BO_MEM_LOCAL
+};
static struct drm_bo_driver nouveau_bo_driver = {
.mem_type_prio = nouveau_mem_prios,
@@ -58,7 +67,6 @@ static struct drm_bo_driver nouveau_bo_driver = {
.move = nouveau_move,
.ttm_cache_flush= nouveau_flush_ttm
};
-#endif
extern struct drm_ioctl_desc nouveau_ioctls[];
extern int nouveau_max_ioctl;
@@ -99,9 +107,8 @@ static struct drm_driver driver = {
.probe = probe,
.remove = __devexit_p(drm_cleanup_pci),
},
-#ifdef NOUVEAU_HAVE_BUFFER
- .bo_driver = &nouveau_bo_driver,
-#endif
+
+ .bo_driver = &nouveau_bo_driver,
.name = DRIVER_NAME,
.desc = DRIVER_DESC,