diff options
Diffstat (limited to 'include/drm/ttm')
-rw-r--r-- | include/drm/ttm/ttm_bo_driver.h | 7 | ||||
-rw-r--r-- | include/drm/ttm/ttm_module.h | 20 |
2 files changed, 4 insertions, 23 deletions
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 0ea602da43e7..b87504235f18 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h | |||
@@ -34,6 +34,7 @@ | |||
34 | #include "ttm/ttm_memory.h" | 34 | #include "ttm/ttm_memory.h" |
35 | #include "ttm/ttm_module.h" | 35 | #include "ttm/ttm_module.h" |
36 | #include "drm_mm.h" | 36 | #include "drm_mm.h" |
37 | #include "drm_global.h" | ||
37 | #include "linux/workqueue.h" | 38 | #include "linux/workqueue.h" |
38 | #include "linux/fs.h" | 39 | #include "linux/fs.h" |
39 | #include "linux/spinlock.h" | 40 | #include "linux/spinlock.h" |
@@ -362,7 +363,7 @@ struct ttm_bo_driver { | |||
362 | */ | 363 | */ |
363 | 364 | ||
364 | struct ttm_bo_global_ref { | 365 | struct ttm_bo_global_ref { |
365 | struct ttm_global_reference ref; | 366 | struct drm_global_reference ref; |
366 | struct ttm_mem_global *mem_glob; | 367 | struct ttm_mem_global *mem_glob; |
367 | }; | 368 | }; |
368 | 369 | ||
@@ -687,8 +688,8 @@ extern int ttm_mem_io_reserve(struct ttm_bo_device *bdev, | |||
687 | extern void ttm_mem_io_free(struct ttm_bo_device *bdev, | 688 | extern void ttm_mem_io_free(struct ttm_bo_device *bdev, |
688 | struct ttm_mem_reg *mem); | 689 | struct ttm_mem_reg *mem); |
689 | 690 | ||
690 | extern void ttm_bo_global_release(struct ttm_global_reference *ref); | 691 | extern void ttm_bo_global_release(struct drm_global_reference *ref); |
691 | extern int ttm_bo_global_init(struct ttm_global_reference *ref); | 692 | extern int ttm_bo_global_init(struct drm_global_reference *ref); |
692 | 693 | ||
693 | extern int ttm_bo_device_release(struct ttm_bo_device *bdev); | 694 | extern int ttm_bo_device_release(struct ttm_bo_device *bdev); |
694 | 695 | ||
diff --git a/include/drm/ttm/ttm_module.h b/include/drm/ttm/ttm_module.h index cf416aee19af..45fa318c1585 100644 --- a/include/drm/ttm/ttm_module.h +++ b/include/drm/ttm/ttm_module.h | |||
@@ -35,26 +35,6 @@ | |||
35 | struct kobject; | 35 | struct kobject; |
36 | 36 | ||
37 | #define TTM_PFX "[TTM] " | 37 | #define TTM_PFX "[TTM] " |
38 | |||
39 | enum ttm_global_types { | ||
40 | TTM_GLOBAL_TTM_MEM = 0, | ||
41 | TTM_GLOBAL_TTM_BO, | ||
42 | TTM_GLOBAL_TTM_OBJECT, | ||
43 | TTM_GLOBAL_NUM | ||
44 | }; | ||
45 | |||
46 | struct ttm_global_reference { | ||
47 | enum ttm_global_types global_type; | ||
48 | size_t size; | ||
49 | void *object; | ||
50 | int (*init) (struct ttm_global_reference *); | ||
51 | void (*release) (struct ttm_global_reference *); | ||
52 | }; | ||
53 | |||
54 | extern void ttm_global_init(void); | ||
55 | extern void ttm_global_release(void); | ||
56 | extern int ttm_global_item_ref(struct ttm_global_reference *ref); | ||
57 | extern void ttm_global_item_unref(struct ttm_global_reference *ref); | ||
58 | extern struct kobject *ttm_get_kobj(void); | 38 | extern struct kobject *ttm_get_kobj(void); |
59 | 39 | ||
60 | #endif /* _TTM_MODULE_H_ */ | 40 | #endif /* _TTM_MODULE_H_ */ |