summaryrefslogtreecommitdiffstats
path: root/include/drm/ttm
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2018-02-21 14:34:13 -0500
committerAlex Deucher <alexander.deucher@amd.com>2018-02-26 23:09:45 -0500
commit231cdafc75434015f3925d6662a1821fcfef16b7 (patch)
treee0dfc38a5e84d186138d4e053327c2ecd09e0602 /include/drm/ttm
parent3231a7696e22538529e9ee3500f2116a40a22734 (diff)
drm/ttm: drop ttm->dummy_read_page
Only used by the AGP backend and there it can be easily accessed using ttm->bdev->glob. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'include/drm/ttm')
-rw-r--r--include/drm/ttm/ttm_bo_driver.h17
1 files changed, 4 insertions, 13 deletions
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index 0e4ae26da093..b338dd0ea038 100644
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -100,7 +100,6 @@ enum ttm_caching_state {
100 * @bdev: Pointer to a struct ttm_bo_device. 100 * @bdev: Pointer to a struct ttm_bo_device.
101 * @func: Pointer to a struct ttm_backend_func that describes 101 * @func: Pointer to a struct ttm_backend_func that describes
102 * the backend methods. 102 * the backend methods.
103 * @dummy_read_page: Page to map where the ttm_tt page array contains a NULL
104 * pointer. 103 * pointer.
105 * @pages: Array of pages backing the data. 104 * @pages: Array of pages backing the data.
106 * @num_pages: Number of pages in the page array. 105 * @num_pages: Number of pages in the page array.
@@ -118,7 +117,6 @@ enum ttm_caching_state {
118struct ttm_tt { 117struct ttm_tt {
119 struct ttm_bo_device *bdev; 118 struct ttm_bo_device *bdev;
120 struct ttm_backend_func *func; 119 struct ttm_backend_func *func;
121 struct page *dummy_read_page;
122 struct page **pages; 120 struct page **pages;
123 uint32_t page_flags; 121 uint32_t page_flags;
124 unsigned long num_pages; 122 unsigned long num_pages;
@@ -331,7 +329,6 @@ struct ttm_bo_driver {
331 * @bdev: pointer to a struct ttm_bo_device: 329 * @bdev: pointer to a struct ttm_bo_device:
332 * @size: Size of the data needed backing. 330 * @size: Size of the data needed backing.
333 * @page_flags: Page flags as identified by TTM_PAGE_FLAG_XX flags. 331 * @page_flags: Page flags as identified by TTM_PAGE_FLAG_XX flags.
334 * @dummy_read_page: See struct ttm_bo_device.
335 * 332 *
336 * Create a struct ttm_tt to back data with system memory pages. 333 * Create a struct ttm_tt to back data with system memory pages.
337 * No pages are actually allocated. 334 * No pages are actually allocated.
@@ -340,8 +337,7 @@ struct ttm_bo_driver {
340 */ 337 */
341 struct ttm_tt *(*ttm_tt_create)(struct ttm_bo_device *bdev, 338 struct ttm_tt *(*ttm_tt_create)(struct ttm_bo_device *bdev,
342 unsigned long size, 339 unsigned long size,
343 uint32_t page_flags, 340 uint32_t page_flags);
344 struct page *dummy_read_page);
345 341
346 /** 342 /**
347 * ttm_tt_populate 343 * ttm_tt_populate
@@ -621,7 +617,6 @@ ttm_flag_masked(uint32_t *old, uint32_t new, uint32_t mask)
621 * @bdev: pointer to a struct ttm_bo_device: 617 * @bdev: pointer to a struct ttm_bo_device:
622 * @size: Size of the data needed backing. 618 * @size: Size of the data needed backing.
623 * @page_flags: Page flags as identified by TTM_PAGE_FLAG_XX flags. 619 * @page_flags: Page flags as identified by TTM_PAGE_FLAG_XX flags.
624 * @dummy_read_page: See struct ttm_bo_device.
625 * 620 *
626 * Create a struct ttm_tt to back data with system memory pages. 621 * Create a struct ttm_tt to back data with system memory pages.
627 * No pages are actually allocated. 622 * No pages are actually allocated.
@@ -629,11 +624,9 @@ ttm_flag_masked(uint32_t *old, uint32_t new, uint32_t mask)
629 * NULL: Out of memory. 624 * NULL: Out of memory.
630 */ 625 */
631int ttm_tt_init(struct ttm_tt *ttm, struct ttm_bo_device *bdev, 626int ttm_tt_init(struct ttm_tt *ttm, struct ttm_bo_device *bdev,
632 unsigned long size, uint32_t page_flags, 627 unsigned long size, uint32_t page_flags);
633 struct page *dummy_read_page);
634int ttm_dma_tt_init(struct ttm_dma_tt *ttm_dma, struct ttm_bo_device *bdev, 628int ttm_dma_tt_init(struct ttm_dma_tt *ttm_dma, struct ttm_bo_device *bdev,
635 unsigned long size, uint32_t page_flags, 629 unsigned long size, uint32_t page_flags);
636 struct page *dummy_read_page);
637 630
638/** 631/**
639 * ttm_tt_fini 632 * ttm_tt_fini
@@ -1080,7 +1073,6 @@ extern const struct ttm_mem_type_manager_func ttm_bo_manager_func;
1080 * @bridge: The agp bridge this device is sitting on. 1073 * @bridge: The agp bridge this device is sitting on.
1081 * @size: Size of the data needed backing. 1074 * @size: Size of the data needed backing.
1082 * @page_flags: Page flags as identified by TTM_PAGE_FLAG_XX flags. 1075 * @page_flags: Page flags as identified by TTM_PAGE_FLAG_XX flags.
1083 * @dummy_read_page: See struct ttm_bo_device.
1084 * 1076 *
1085 * 1077 *
1086 * Create a TTM backend that uses the indicated AGP bridge as an aperture 1078 * Create a TTM backend that uses the indicated AGP bridge as an aperture
@@ -1089,8 +1081,7 @@ extern const struct ttm_mem_type_manager_func ttm_bo_manager_func;
1089 */ 1081 */
1090struct ttm_tt *ttm_agp_tt_create(struct ttm_bo_device *bdev, 1082struct ttm_tt *ttm_agp_tt_create(struct ttm_bo_device *bdev,
1091 struct agp_bridge_data *bridge, 1083 struct agp_bridge_data *bridge,
1092 unsigned long size, uint32_t page_flags, 1084 unsigned long size, uint32_t page_flags);
1093 struct page *dummy_read_page);
1094int ttm_agp_tt_populate(struct ttm_tt *ttm, struct ttm_operation_ctx *ctx); 1085int ttm_agp_tt_populate(struct ttm_tt *ttm, struct ttm_operation_ctx *ctx);
1095void ttm_agp_tt_unpopulate(struct ttm_tt *ttm); 1086void ttm_agp_tt_unpopulate(struct ttm_tt *ttm);
1096#endif 1087#endif