diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-07 14:43:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-07 14:43:28 -0400 |
| commit | 78178c7d6e127fff6dba027315fd6914304b05cf (patch) | |
| tree | 9b207197911feb57753bd9f1a9371851c8ca0991 /include | |
| parent | 140236b4b1c749c9b795ea3d11558a0eb5a3a080 (diff) | |
| parent | 023eb571a1d0eae738326042dcffa974257eb8c8 (diff) | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: correctly update connector DPMS status in drm_fb_helper
drm/radeon/kms: fix shared ddc handling
drm/ttm: Allocate the page pool manager in the heap.
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/ttm/ttm_page_alloc.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h index 8bb4de567b2c..116821448c38 100644 --- a/include/drm/ttm/ttm_page_alloc.h +++ b/include/drm/ttm/ttm_page_alloc.h | |||
| @@ -56,10 +56,6 @@ void ttm_put_pages(struct list_head *pages, | |||
| 56 | enum ttm_caching_state cstate); | 56 | enum ttm_caching_state cstate); |
| 57 | /** | 57 | /** |
| 58 | * Initialize pool allocator. | 58 | * Initialize pool allocator. |
| 59 | * | ||
| 60 | * Pool allocator is internaly reference counted so it can be initialized | ||
| 61 | * multiple times but ttm_page_alloc_fini has to be called same number of | ||
| 62 | * times. | ||
| 63 | */ | 59 | */ |
| 64 | int ttm_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages); | 60 | int ttm_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages); |
| 65 | /** | 61 | /** |