diff options
author | Jeremy Kolb <jkolb@brandeis.edu> | 2007-11-02 19:44:30 -0400 |
---|---|---|
committer | Jeremy Kolb <jkolb@brandeis.edu> | 2007-11-02 19:47:48 -0400 |
commit | 2dc2ee7a5aed18b82a1125d8e56a7ef92be18532 (patch) | |
tree | 1b1b3a1f5695f9fa20195b6f1cab9bbdc57bf95f /linux-core/nouveau_drv.c | |
parent | c1aa08106e0a7190c7a303ec8a9b6b5339251137 (diff) |
nouveau: put it all together.
Diffstat (limited to 'linux-core/nouveau_drv.c')
-rw-r--r-- | linux-core/nouveau_drv.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/linux-core/nouveau_drv.c b/linux-core/nouveau_drv.c index 1bd8d977..ac70d7ae 100644 --- a/linux-core/nouveau_drv.c +++ b/linux-core/nouveau_drv.c @@ -41,33 +41,6 @@ static struct pci_device_id pciidlist[] = { } }; -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, - .mem_busy_prio = nouveau_busy_prios, - .num_mem_type_prio = sizeof(nouveau_mem_prios)/sizeof(uint32_t), - .num_mem_busy_prio = sizeof(nouveau_busy_prios)/sizeof(uint32_t), - .create_ttm_backend_entry = nouveau_create_ttm_backend_entry, - .fence_type = nouveau_fence_types, - .invalidate_caches = nouveau_invalidate_caches, - .init_mem_type = nouveau_init_mem_type, - .evict_mask = nouveau_evict_mask, - .move = nouveau_move, - .ttm_cache_flush= nouveau_flush_ttm -}; - extern struct drm_ioctl_desc nouveau_ioctls[]; extern int nouveau_max_ioctl; @@ -109,6 +82,7 @@ static struct drm_driver driver = { }, .bo_driver = &nouveau_bo_driver, + .fence_driver = &nouveau_fence_driver, .name = DRIVER_NAME, .desc = DRIVER_DESC, |