diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/drm/ttm/ttm_bo_api.h | 3 | ||||
-rw-r--r-- | include/drm/ttm/ttm_bo_driver.h | 6 | ||||
-rw-r--r-- | include/drm/ttm/ttm_memory.h | 2 | ||||
-rw-r--r-- | include/drm/ttm/ttm_object.h | 4 | ||||
-rw-r--r-- | include/drm/ttm/ttm_page_alloc.h | 2 |
5 files changed, 7 insertions, 10 deletions
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h index 62a0e4c4ceee..42e346985186 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h | |||
@@ -662,9 +662,6 @@ extern int ttm_bo_kmap(struct ttm_buffer_object *bo, unsigned long start_page, | |||
662 | 662 | ||
663 | extern void ttm_bo_kunmap(struct ttm_bo_kmap_obj *map); | 663 | extern void ttm_bo_kunmap(struct ttm_bo_kmap_obj *map); |
664 | 664 | ||
665 | #if 0 | ||
666 | #endif | ||
667 | |||
668 | /** | 665 | /** |
669 | * ttm_fbdev_mmap - mmap fbdev memory backed by a ttm buffer object. | 666 | * ttm_fbdev_mmap - mmap fbdev memory backed by a ttm buffer object. |
670 | * | 667 | * |
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 09af2d746d1c..94eb1434316e 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h | |||
@@ -78,7 +78,7 @@ struct ttm_backend_func { | |||
78 | * | 78 | * |
79 | * Bind the backend pages into the aperture in the location | 79 | * Bind the backend pages into the aperture in the location |
80 | * indicated by @bo_mem. This function should be able to handle | 80 | * indicated by @bo_mem. This function should be able to handle |
81 | * differences between aperture- and system page sizes. | 81 | * differences between aperture and system page sizes. |
82 | */ | 82 | */ |
83 | int (*bind) (struct ttm_backend *backend, struct ttm_mem_reg *bo_mem); | 83 | int (*bind) (struct ttm_backend *backend, struct ttm_mem_reg *bo_mem); |
84 | 84 | ||
@@ -88,7 +88,7 @@ struct ttm_backend_func { | |||
88 | * @backend: Pointer to a struct ttm_backend. | 88 | * @backend: Pointer to a struct ttm_backend. |
89 | * | 89 | * |
90 | * Unbind previously bound backend pages. This function should be | 90 | * Unbind previously bound backend pages. This function should be |
91 | * able to handle differences between aperture- and system page sizes. | 91 | * able to handle differences between aperture and system page sizes. |
92 | */ | 92 | */ |
93 | int (*unbind) (struct ttm_backend *backend); | 93 | int (*unbind) (struct ttm_backend *backend); |
94 | 94 | ||
@@ -786,7 +786,7 @@ extern int ttm_bo_device_release(struct ttm_bo_device *bdev); | |||
786 | * ttm_bo_device_init | 786 | * ttm_bo_device_init |
787 | * | 787 | * |
788 | * @bdev: A pointer to a struct ttm_bo_device to initialize. | 788 | * @bdev: A pointer to a struct ttm_bo_device to initialize. |
789 | * @mem_global: A pointer to an initialized struct ttm_mem_global. | 789 | * @glob: A pointer to an initialized struct ttm_bo_global. |
790 | * @driver: A pointer to a struct ttm_bo_driver set up by the caller. | 790 | * @driver: A pointer to a struct ttm_bo_driver set up by the caller. |
791 | * @file_page_offset: Offset into the device address space that is available | 791 | * @file_page_offset: Offset into the device address space that is available |
792 | * for buffer data. This ensures compatibility with other users of the | 792 | * for buffer data. This ensures compatibility with other users of the |
diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h index b199170b3c2c..26c1f78d136f 100644 --- a/include/drm/ttm/ttm_memory.h +++ b/include/drm/ttm/ttm_memory.h | |||
@@ -41,7 +41,7 @@ | |||
41 | * @do_shrink: The callback function. | 41 | * @do_shrink: The callback function. |
42 | * | 42 | * |
43 | * Arguments to the do_shrink functions are intended to be passed using | 43 | * Arguments to the do_shrink functions are intended to be passed using |
44 | * inheritance. That is, the argument class derives from struct ttm_mem_srink, | 44 | * inheritance. That is, the argument class derives from struct ttm_mem_shrink, |
45 | * and can be accessed using container_of(). | 45 | * and can be accessed using container_of(). |
46 | */ | 46 | */ |
47 | 47 | ||
diff --git a/include/drm/ttm/ttm_object.h b/include/drm/ttm/ttm_object.h index 0d9db099978b..e46054e5255b 100644 --- a/include/drm/ttm/ttm_object.h +++ b/include/drm/ttm/ttm_object.h | |||
@@ -111,7 +111,7 @@ struct ttm_object_device; | |||
111 | * | 111 | * |
112 | * @ref_obj_release: A function to be called when a reference object | 112 | * @ref_obj_release: A function to be called when a reference object |
113 | * with another ttm_ref_type than TTM_REF_USAGE is deleted. | 113 | * with another ttm_ref_type than TTM_REF_USAGE is deleted. |
114 | * this function may, for example, release a lock held by a user-space | 114 | * This function may, for example, release a lock held by a user-space |
115 | * process. | 115 | * process. |
116 | * | 116 | * |
117 | * This struct is intended to be used as a base struct for objects that | 117 | * This struct is intended to be used as a base struct for objects that |
@@ -172,7 +172,7 @@ extern struct ttm_base_object *ttm_base_object_lookup(struct ttm_object_file | |||
172 | /** | 172 | /** |
173 | * ttm_base_object_unref | 173 | * ttm_base_object_unref |
174 | * | 174 | * |
175 | * @p_base: Pointer to a pointer referncing a struct ttm_base_object. | 175 | * @p_base: Pointer to a pointer referencing a struct ttm_base_object. |
176 | * | 176 | * |
177 | * Decrements the base object refcount and clears the pointer pointed to by | 177 | * Decrements the base object refcount and clears the pointer pointed to by |
178 | * p_base. | 178 | * p_base. |
diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h index 8062890f725e..129de12353f1 100644 --- a/include/drm/ttm/ttm_page_alloc.h +++ b/include/drm/ttm/ttm_page_alloc.h | |||
@@ -32,7 +32,7 @@ | |||
32 | /** | 32 | /** |
33 | * Get count number of pages from pool to pages list. | 33 | * Get count number of pages from pool to pages list. |
34 | * | 34 | * |
35 | * @pages: heado of empty linked list where pages are filled. | 35 | * @pages: head of empty linked list where pages are filled. |
36 | * @flags: ttm flags for page allocation. | 36 | * @flags: ttm flags for page allocation. |
37 | * @cstate: ttm caching state for the page. | 37 | * @cstate: ttm caching state for the page. |
38 | * @count: number of pages to allocate. | 38 | * @count: number of pages to allocate. |