aboutsummaryrefslogtreecommitdiff
path: root/shared-core/nouveau_drv.h
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2007-11-05 00:01:38 +1100
committerBen Skeggs <skeggsb@gmail.com>2007-11-05 01:20:32 +1100
commit9a999e57af4a3f5a863c21154dd3b9618888c1f7 (patch)
tree8d420e1c482edc344d87f4851cae08be683c65e7 /shared-core/nouveau_drv.h
parenta2e8e294d8e5d7cf179cb562745c1b613ff60e52 (diff)
nouveau: crappy ttm mm init, disabled for now.
Diffstat (limited to 'shared-core/nouveau_drv.h')
-rw-r--r--shared-core/nouveau_drv.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/shared-core/nouveau_drv.h b/shared-core/nouveau_drv.h
index 83836270..d35d670d 100644
--- a/shared-core/nouveau_drv.h
+++ b/shared-core/nouveau_drv.h
@@ -42,7 +42,6 @@
#include "nouveau_drm.h"
#include "nouveau_reg.h"
-
struct mem_block {
struct mem_block *next;
struct mem_block *prev;
@@ -229,6 +228,8 @@ struct drm_nouveau_private {
NOUVEAU_CARD_INIT_FAILED
} init_state;
+ int ttm;
+
/* the card type, takes NV_* as values */
int card_type;
/* exact chipset, derived from NV_PMC_BOOT_0 */
@@ -348,6 +349,7 @@ extern struct mem_block* nouveau_mem_alloc(struct drm_device *,
int flags, struct drm_file *);
extern void nouveau_mem_free(struct drm_device *dev, struct mem_block*);
extern int nouveau_mem_init(struct drm_device *);
+extern int nouveau_mem_init_ttm(struct drm_device *);
extern void nouveau_mem_close(struct drm_device *);
/* nouveau_notifier.c */