diff options
author | Christian König <christian.koenig@amd.com> | 2018-02-22 09:52:31 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-02-26 23:09:45 -0500 |
commit | 724daa4fd65d927e406f2cc0661c9a329876267b (patch) | |
tree | 07643dc0fc9b4bb5bebea1d07eb4e5a24523a681 /include/drm/ttm | |
parent | 231cdafc75434015f3925d6662a1821fcfef16b7 (diff) |
drm/ttm: drop persistent_swap_storage from ttm_bo_init and co
Never used as parameter, the only driver actually using this is nouveau
and there it is initialized after the BO is initialized.
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_api.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h index a9e0640849d8..8e2fb1ac4e0c 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h | |||
@@ -467,11 +467,6 @@ size_t ttm_bo_dma_acc_size(struct ttm_bo_device *bdev, | |||
467 | * @flags: Initial placement flags. | 467 | * @flags: Initial placement flags. |
468 | * @page_alignment: Data alignment in pages. | 468 | * @page_alignment: Data alignment in pages. |
469 | * @ctx: TTM operation context for memory allocation. | 469 | * @ctx: TTM operation context for memory allocation. |
470 | * @persistent_swap_storage: Usually the swap storage is deleted for buffers | ||
471 | * pinned in physical memory. If this behaviour is not desired, this member | ||
472 | * holds a pointer to a persistent shmem object. Typically, this would | ||
473 | * point to the shmem object backing a GEM object if TTM is used to back a | ||
474 | * GEM user interface. | ||
475 | * @acc_size: Accounted size for this object. | 470 | * @acc_size: Accounted size for this object. |
476 | * @resv: Pointer to a reservation_object, or NULL to let ttm allocate one. | 471 | * @resv: Pointer to a reservation_object, or NULL to let ttm allocate one. |
477 | * @destroy: Destroy function. Use NULL for kfree(). | 472 | * @destroy: Destroy function. Use NULL for kfree(). |
@@ -504,7 +499,6 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev, | |||
504 | struct ttm_placement *placement, | 499 | struct ttm_placement *placement, |
505 | uint32_t page_alignment, | 500 | uint32_t page_alignment, |
506 | struct ttm_operation_ctx *ctx, | 501 | struct ttm_operation_ctx *ctx, |
507 | struct file *persistent_swap_storage, | ||
508 | size_t acc_size, | 502 | size_t acc_size, |
509 | struct sg_table *sg, | 503 | struct sg_table *sg, |
510 | struct reservation_object *resv, | 504 | struct reservation_object *resv, |
@@ -521,7 +515,6 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev, | |||
521 | * @page_alignment: Data alignment in pages. | 515 | * @page_alignment: Data alignment in pages. |
522 | * @interruptible: If needing to sleep to wait for GPU resources, | 516 | * @interruptible: If needing to sleep to wait for GPU resources, |
523 | * sleep interruptible. | 517 | * sleep interruptible. |
524 | * @persistent_swap_storage: Usually the swap storage is deleted for buffers | ||
525 | * pinned in physical memory. If this behaviour is not desired, this member | 518 | * pinned in physical memory. If this behaviour is not desired, this member |
526 | * holds a pointer to a persistent shmem object. Typically, this would | 519 | * holds a pointer to a persistent shmem object. Typically, this would |
527 | * point to the shmem object backing a GEM object if TTM is used to back a | 520 | * point to the shmem object backing a GEM object if TTM is used to back a |
@@ -551,8 +544,7 @@ int ttm_bo_init_reserved(struct ttm_bo_device *bdev, | |||
551 | int ttm_bo_init(struct ttm_bo_device *bdev, struct ttm_buffer_object *bo, | 544 | int ttm_bo_init(struct ttm_bo_device *bdev, struct ttm_buffer_object *bo, |
552 | unsigned long size, enum ttm_bo_type type, | 545 | unsigned long size, enum ttm_bo_type type, |
553 | struct ttm_placement *placement, | 546 | struct ttm_placement *placement, |
554 | uint32_t page_alignment, bool interrubtible, | 547 | uint32_t page_alignment, bool interrubtible, size_t acc_size, |
555 | struct file *persistent_swap_storage, size_t acc_size, | ||
556 | struct sg_table *sg, struct reservation_object *resv, | 548 | struct sg_table *sg, struct reservation_object *resv, |
557 | void (*destroy) (struct ttm_buffer_object *)); | 549 | void (*destroy) (struct ttm_buffer_object *)); |
558 | 550 | ||
@@ -566,11 +558,6 @@ int ttm_bo_init(struct ttm_bo_device *bdev, struct ttm_buffer_object *bo, | |||
566 | * @page_alignment: Data alignment in pages. | 558 | * @page_alignment: Data alignment in pages. |
567 | * @interruptible: If needing to sleep while waiting for GPU resources, | 559 | * @interruptible: If needing to sleep while waiting for GPU resources, |
568 | * sleep interruptible. | 560 | * sleep interruptible. |
569 | * @persistent_swap_storage: Usually the swap storage is deleted for buffers | ||
570 | * pinned in physical memory. If this behaviour is not desired, this member | ||
571 | * holds a pointer to a persistent shmem object. Typically, this would | ||
572 | * point to the shmem object backing a GEM object if TTM is used to back a | ||
573 | * GEM user interface. | ||
574 | * @p_bo: On successful completion *p_bo points to the created object. | 561 | * @p_bo: On successful completion *p_bo points to the created object. |
575 | * | 562 | * |
576 | * This function allocates a ttm_buffer_object, and then calls ttm_bo_init | 563 | * This function allocates a ttm_buffer_object, and then calls ttm_bo_init |
@@ -583,7 +570,6 @@ int ttm_bo_init(struct ttm_bo_device *bdev, struct ttm_buffer_object *bo, | |||
583 | int ttm_bo_create(struct ttm_bo_device *bdev, unsigned long size, | 570 | int ttm_bo_create(struct ttm_bo_device *bdev, unsigned long size, |
584 | enum ttm_bo_type type, struct ttm_placement *placement, | 571 | enum ttm_bo_type type, struct ttm_placement *placement, |
585 | uint32_t page_alignment, bool interruptible, | 572 | uint32_t page_alignment, bool interruptible, |
586 | struct file *persistent_swap_storage, | ||
587 | struct ttm_buffer_object **p_bo); | 573 | struct ttm_buffer_object **p_bo); |
588 | 574 | ||
589 | /** | 575 | /** |